Changeset 2589 in orxonox.OLD for orxonox/trunk/console

Timestamp:

Oct 17, 2004, 9:18:28 PM (20 years ago)

Author:

bensch

Message:

orxonox/trunk: Makefile.am's updated. They now include header files as they should

Location:

orxonox/trunk/console

Files:

• Makefile.am (modified) (1 diff)
• Makefile.in (modified) (3 diffs)

orxonox/trunk/console/Makefile.am

@@ -3 +3 @@
 
 bin_PROGRAMS=console
-console_SOURCES=orxonox_console.cc orxonox_console.h \
-                orxonox_console_entry.cc orxonox_console_entry.h \
-                orxonox_console_log.cc orxonox_console_log.h
+console_SOURCES=orxonox_console.cc orxonox_console_entry.cc orxonox_console_log.cc
+noinst_HEADERS=orxonox_console.h orxonox_console_entry.h orxonox_console_log.h
 
 #  uncomment the following if bencoder requires the math library

orxonox/trunk/console/Makefile.in

@@ -115 +115 @@
 #AM_LDFLAGS=`pkg-config --libs  gtk+-2.0`
 bin_PROGRAMS = console
-console_SOURCES = orxonox_console.cc orxonox_console.h \
-                orxonox_console_entry.cc orxonox_console_entry.h \
-                orxonox_console_log.cc orxonox_console_log.h
-
+console_SOURCES = orxonox_console.cc orxonox_console_entry.cc orxonox_console_log.cc
+noinst_HEADERS = orxonox_console.h orxonox_console_entry.h orxonox_console_log.h
 subdir = console
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -145 +143 @@
 CXXLINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) \
         -o $@
-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-        $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-CCLD = $(CC)
-LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
 DIST_SOURCES = $(console_SOURCES)
-DIST_COMMON = $(srcdir)/Makefile.in Makefile.am
+HEADERS = $(noinst_HEADERS)
+
+DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.in Makefile.am
 SOURCES = $(console_SOURCES)
 
@@ -310 +306 @@
 check-am: all-am
 check: check-am
-all-am: Makefile $(PROGRAMS)
+all-am: Makefile $(PROGRAMS) $(HEADERS)
 
 installdirs: