Changeset 2977 in orxonox.OLD for orxonox/branches/osX/importer/Makefile.in

Timestamp:

Nov 24, 2004, 12:50:55 PM (20 years ago)

Author:

bensch

Message:

orxonox/branches/importer: merged back from the trunk again: command: svn merge trunk/ branches/osX -r 2887:HEAD

File:

• orxonox/branches/osX/importer/Makefile.in (modified) (4 diffs)

orxonox/branches/osX/importer/Makefile.in

@@ -53 +53 @@
 PROGRAMS = $(bin_PROGRAMS)
 am_importer_OBJECTS = framework.$(OBJEXT) windowHandler.$(OBJEXT) \
-        object.$(OBJEXT) array.$(OBJEXT) material.$(OBJEXT)
+        vector.$(OBJEXT) object.$(OBJEXT) array.$(OBJEXT) \
+        material.$(OBJEXT)
 importer_OBJECTS = $(am_importer_OBJECTS)
 importer_LDADD = $(LDADD)
@@ -61 +62 @@
 @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/array.Po ./$(DEPDIR)/framework.Po \
 @AMDEP_TRUE@    ./$(DEPDIR)/material.Po ./$(DEPDIR)/object.Po \
-@AMDEP_TRUE@    ./$(DEPDIR)/windowHandler.Po
+@AMDEP_TRUE@    ./$(DEPDIR)/vector.Po ./$(DEPDIR)/windowHandler.Po
 CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
         $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
@@ -151 +152 @@
 AM_CXXFLAGS = "-I/usr/X11R6/include"
 AM_LDFLAGS = "-L/usr/Mesa-6.0.1/lib  -L/usr/X11R6/lib -lXt -lX11" $(MWINDOWS)
-importer_SOURCES = framework.cc windowHandler.cc object.cc array.cc material.cc
-noinst_HEADERS = windowHandler.h object.h array.h material.h
+importer_SOURCES = framework.cc windowHandler.cc vector.cc object.cc array.cc material.cc
+noinst_HEADERS = framework.h windowHandler.h  vector.h object.h array.h material.h
 all: all-am
 
@@ -223 +224 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/material.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/object.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vector.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/windowHandler.Po@am__quote@