Changeset 4264 in orxonox.OLD for orxonox/trunk/src/lib/graphics

Timestamp:

May 22, 2005, 7:39:44 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: gui is now a lib build and stored in lib

Location:

orxonox/trunk/src/lib/graphics

Files:

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

orxonox/trunk/src/lib/graphics/Makefile.in

@@ -177 +177 @@
           esac; \
         done; \
-        echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/lib/graphics/Makefile'; \
+        echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/lib/graphics/Makefile'; \
         cd $(top_srcdir) && \
-          $(AUTOMAKE) --foreign  src/lib/graphics/Makefile
+          $(AUTOMAKE) --gnu  src/lib/graphics/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status

orxonox/trunk/src/lib/graphics/importer/Makefile.am

@@ -1 +1 @@
 MAINSRCDIR=../../..
-AM_CXXFLAGS=-I$(MAINSRCDIR)
-AM_CXXFLAGS+=-I$(MAINSRCDIR)/world_entities
-AM_CXXFLAGS+=-I$(MAINSRCDIR)/story_entities
-AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib
-AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib/coord
-AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib/data
-AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib/graphics
-AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib/graphics/importer
-AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib/gui
-AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib/lang
-AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib/util
-AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib/math
-AM_CXXFLAGS+=-I$(MAINSRCDIR)/defs
-AM_CXXFLAGS+=-I$(MAINSRCDIR)/font
-AM_CXXFLAGS+=-I$(MAINSRCDIR)/network
-AM_CXXFLAGS+=-I$(MAINSRCDIR)/glmenu
-AM_CXXFLAGS+=-I$(MAINSRCDIR)/ai
-AM_CXXFLAGS+=-I$(MAINSRCDIR)/util
-AM_CXXFLAGS+=-I$(MAINSRCDIR)/util/animation
-AM_CXXFLAGS+=-I$(MAINSRCDIR)/util/common
-
 
 AM_LDFLAGS=$(MWINDOWS)
 
-#"-O3 -pedantic -fPIC -ffast-math -I/usr/X11R6/include"
 
-noinst_HEADERS= framework.h \
-                windowHandler.h \
-                model.h \
+
+noinst_HEADERS= model.h \
                 objModel.h \
                 primitive_model.h \
@@ -34 +11 @@
                 material.h \
                 texture.h
-
-
-
-#  uncomment the following if orxonox requires the math library
-#orxonox_LDADD=-lm
-
-#EXTRA_DIST=orxonox.lsm.in orxonox.spec.in orxonox.texinfo
-
-#  if you write a self-test script named `chk', uncomment the
-#  following and add `chk' to the EXTRA_DIST list
-#TESTS=chk
-
-#  build and install the .info pages
-#info_TEXINFOS = orxonox.texinfo
-#orxonox_TEXINFOS = gpl.texinfo
-
-#  install the man pages
-#man_MANS=orxonox.1

orxonox/trunk/src/lib/graphics/importer/Makefile.in

@@ -161 +161 @@
 target_vendor = @target_vendor@
 MAINSRCDIR = ../../..
-AM_CXXFLAGS = -I$(MAINSRCDIR) -I$(MAINSRCDIR)/world_entities -I$(MAINSRCDIR)/story_entities -I$(MAINSRCDIR)/lib -I$(MAINSRCDIR)/lib/coord -I$(MAINSRCDIR)/lib/data -I$(MAINSRCDIR)/lib/graphics -I$(MAINSRCDIR)/lib/graphics/importer -I$(MAINSRCDIR)/lib/gui -I$(MAINSRCDIR)/lib/lang -I$(MAINSRCDIR)/lib/util -I$(MAINSRCDIR)/lib/math -I$(MAINSRCDIR)/defs -I$(MAINSRCDIR)/font -I$(MAINSRCDIR)/network -I$(MAINSRCDIR)/glmenu -I$(MAINSRCDIR)/ai -I$(MAINSRCDIR)/util -I$(MAINSRCDIR)/util/animation -I$(MAINSRCDIR)/util/common
 AM_LDFLAGS = $(MWINDOWS)
-
-#"-O3 -pedantic -fPIC -ffast-math -I/usr/X11R6/include"
-noinst_HEADERS = framework.h \
-                windowHandler.h \
-                model.h \
+noinst_HEADERS = model.h \
                 objModel.h \
                 primitive_model.h \
@@ -186 +181 @@
           esac; \
         done; \
-        echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/lib/graphics/importer/Makefile'; \
+        echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/lib/graphics/importer/Makefile'; \
         cd $(top_srcdir) && \
-          $(AUTOMAKE) --foreign  src/lib/graphics/importer/Makefile
+          $(AUTOMAKE) --gnu  src/lib/graphics/importer/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@@ -366 +361 @@
         pdf-am ps ps-am tags uninstall uninstall-am uninstall-info-am
 
-
-#  uncomment the following if orxonox requires the math library
-#orxonox_LDADD=-lm
-
-#EXTRA_DIST=orxonox.lsm.in orxonox.spec.in orxonox.texinfo
-
-#  if you write a self-test script named `chk', uncomment the
-#  following and add `chk' to the EXTRA_DIST list
-#TESTS=chk
-
-#  build and install the .info pages
-#info_TEXINFOS = orxonox.texinfo
-#orxonox_TEXINFOS = gpl.texinfo
-
-#  install the man pages
-#man_MANS=orxonox.1
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.