Changeset 4338 in orxonox.OLD for orxonox/trunk/src/subprojects/Makefile.in

Timestamp:

May 27, 2005, 9:16:53 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: merged branches/physics back to the trunk
merged with command
svn merge -r 3866:HEAD . ../../trunk/
many conflict that i tried to resolv
@patrick: i hope i did not interfere with your stuff :/

File:

• orxonox/trunk/src/subprojects/Makefile.in (modified) (5 diffs)

orxonox/trunk/src/subprojects/Makefile.in

@@ -14 +14 @@
 
 @SET_MAKE@
+
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
@@ -36 +37 @@
 host_triplet = @host@
 subdir = src/subprojects
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \
+        $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/configure.ac
@@ -52 +54 @@
         pdf-recursive ps-recursive uninstall-info-recursive \
         uninstall-recursive
+HEADERS = $(noinst_HEADERS)
 ETAGS = etags
 CTAGS = ctags
@@ -165 +168 @@
 target_vendor = @target_vendor@
 SUBDIRS = importer \
+          particles \
           gui \
           testmain
 
+noinst_HEADERS = framework.h
+EXTRA_DIST = framework.cc
 all: all-recursive
 
@@ -364 +370 @@
 check-am: all-am
 check: check-recursive
-all-am: Makefile
+all-am: Makefile $(HEADERS)
 installdirs: installdirs-recursive
 installdirs-am: