Changeset 4335 in orxonox.OLD

Timestamp:

May 27, 2005, 7:57:52 PM (19 years ago)

Author:

bensch

Message:

orxonox/branches/physics: now the modular it is

Location:

orxonox/branches/physics/src/subprojects

Files:

• Makefile.am (modified) (1 diff)
• Makefile.in (modified) (5 diffs)
• framework.cc (moved) (moved from orxonox/branches/physics/src/subprojects/particles/framework.cc)
• framework.h (moved) (moved from orxonox/branches/physics/src/subprojects/particles/framework.h)
• particles/Makefile.am (modified) (2 diffs)
• particles/Makefile.in (modified) (7 diffs)
• particles/particle_fun.cc (modified) (1 diff)

orxonox/branches/physics/src/subprojects/Makefile.am

@@ -3 +3 @@
           gui \
           testmain
+
+noinst_HEADERS = framework.h
+
+
+EXTRA_DIST = framework.cc

orxonox/branches/physics/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
@@ -169 +172 @@
           testmain
 
+noinst_HEADERS = framework.h
+EXTRA_DIST = framework.cc
 all: all-recursive
 
@@ -365 +370 @@
 check-am: all-am
 check: check-recursive
-all-am: Makefile
+all-am: Makefile $(HEADERS)
 installdirs: installdirs-recursive
 installdirs-am:

orxonox/branches/physics/src/subprojects/particles/Makefile.am

@@ -38 +38 @@
 particles_CPPFLAGS = $(GTK2_CFLAGS) $(GTHREAD_CFLAGS) $(CURL_CFLAGS) $(MSBITFIELDS)
 
-particles_SOURCES= framework.cc \
+particles_SOURCES= ../framework.cc \
                    particle_fun.cc \
                   $(MAINSRCDIR)/lib/graphics/particles/particle_engine.cc \
@@ -60 +60 @@
                   $(MAINSRCDIR)/lib/coord/null_parent.cc \
                   $(MAINSRCDIR)/lib/gui/gui/gui_gtk.cc
-
-noinst_HEADERS = framework.h

orxonox/branches/physics/src/subprojects/particles/Makefile.in

@@ -14 +14 @@
 
 @SET_MAKE@
-
 
 SOURCES = $(particles_SOURCES)
@@ -41 +40 @@
 bin_PROGRAMS = particles$(EXEEXT)
 subdir = src/subprojects/particles
-DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \
-        $(srcdir)/Makefile.in
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/configure.ac
@@ -103 +101 @@
 SOURCES = $(particles_SOURCES)
 DIST_SOURCES = $(particles_SOURCES)
-HEADERS = $(noinst_HEADERS)
 ETAGS = etags
 CTAGS = ctags
@@ -222 +219 @@
 
 particles_CPPFLAGS = $(GTK2_CFLAGS) $(GTHREAD_CFLAGS) $(CURL_CFLAGS) $(MSBITFIELDS)
-particles_SOURCES = framework.cc \
+particles_SOURCES = ../framework.cc \
                    particle_fun.cc \
                   $(MAINSRCDIR)/lib/graphics/particles/particle_engine.cc \
@@ -245 +242 @@
                   $(MAINSRCDIR)/lib/gui/gui/gui_gtk.cc
 
-noinst_HEADERS = framework.h
 all: all-am
 
@@ -351 +347 @@
 @am__fastdepCXX_FALSE@  $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
-particles-framework.o: framework.cc
-@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(particles_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT particles-framework.o -MD -MP -MF "$(DEPDIR)/particles-framework.Tpo" -c -o particles-framework.o `test -f 'framework.cc' || echo '$(srcdir)/'`framework.cc; \
+particles-framework.o: ../framework.cc
+@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(particles_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT particles-framework.o -MD -MP -MF "$(DEPDIR)/particles-framework.Tpo" -c -o particles-framework.o `test -f '../framework.cc' || echo '$(srcdir)/'`../framework.cc; \
 @am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/particles-framework.Tpo" "$(DEPDIR)/particles-framework.Po"; else rm -f "$(DEPDIR)/particles-framework.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='framework.cc' object='particles-framework.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='../framework.cc' object='particles-framework.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/particles-framework.Po' tmpdepfile='$(DEPDIR)/particles-framework.TPo' @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(particles_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o particles-framework.o `test -f 'framework.cc' || echo '$(srcdir)/'`framework.cc
-
-particles-framework.obj: framework.cc
-@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(particles_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT particles-framework.obj -MD -MP -MF "$(DEPDIR)/particles-framework.Tpo" -c -o particles-framework.obj `if test -f 'framework.cc'; then $(CYGPATH_W) 'framework.cc'; else $(CYGPATH_W) '$(srcdir)/framework.cc'; fi`; \
+@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(particles_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o particles-framework.o `test -f '../framework.cc' || echo '$(srcdir)/'`../framework.cc
+
+particles-framework.obj: ../framework.cc
+@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(particles_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT particles-framework.obj -MD -MP -MF "$(DEPDIR)/particles-framework.Tpo" -c -o particles-framework.obj `if test -f '../framework.cc'; then $(CYGPATH_W) '../framework.cc'; else $(CYGPATH_W) '$(srcdir)/../framework.cc'; fi`; \
 @am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/particles-framework.Tpo" "$(DEPDIR)/particles-framework.Po"; else rm -f "$(DEPDIR)/particles-framework.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='framework.cc' object='particles-framework.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='../framework.cc' object='particles-framework.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/particles-framework.Po' tmpdepfile='$(DEPDIR)/particles-framework.TPo' @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(particles_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o particles-framework.obj `if test -f 'framework.cc'; then $(CYGPATH_W) 'framework.cc'; else $(CYGPATH_W) '$(srcdir)/framework.cc'; fi`
+@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(particles_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o particles-framework.obj `if test -f '../framework.cc'; then $(CYGPATH_W) '../framework.cc'; else $(CYGPATH_W) '$(srcdir)/../framework.cc'; fi`
 
 particles-particle_fun.o: particle_fun.cc
@@ -781 +777 @@
 check-am: all-am
 check: check-am
-all-am: Makefile $(PROGRAMS) $(HEADERS)
+all-am: Makefile $(PROGRAMS)
 installdirs:
         for dir in "$(DESTDIR)$(bindir)"; do \

orxonox/branches/physics/src/subprojects/particles/particle_fun.cc

@@ -66 +66 @@
 
 }
-
-
-
-
-
-
 
 int emitterChange(GtkWidget* nonInterest, void* widget)