Changeset 3605 in orxonox.OLD for orxonox/branches/levelloader/src/lib/gui/Makefile.in

Timestamp:

Mar 18, 2005, 11:52:15 AM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: merged trunk back to levelloader
merged with command:
svn merge -r 3499:HEAD trunk branches/levelloader

Conflicts in
C track_manager.h
C world_entities/player.cc
C world_entities/player.h
C world_entities/environment.h
C lib/coord/p_node.cc
C defs/debug.h
C track_manager.cc
C story_entities/campaign.h

solved in merge-favouring. It was quite easy because Chris only worked on the headers, and he didi it quite clean. Thats the spirit

Conflits in world.cc are a MESS: fix it

File:

• orxonox/branches/levelloader/src/lib/gui/Makefile.in (modified) (5 diffs)

orxonox/branches/levelloader/src/lib/gui/Makefile.in

@@ -1 @@
-# Makefile.in generated by automake 1.8.2 from Makefile.am.
+# Makefile.in generated by automake 1.8.5 from Makefile.am.
 # @configure_input@
 
@@ -78 +78 @@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DOCUMENTATION_FALSE = @DOCUMENTATION_FALSE@
+DOCUMENTATION_TRUE = @DOCUMENTATION_TRUE@
 DOXYGEN = @DOXYGEN@
 DOXYGEN_FALSE = @DOXYGEN_FALSE@
@@ -177 +179 @@
           esac; \
         done; \
-        echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/lib/gui/Makefile'; \
+        echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/lib/gui/Makefile'; \
         cd $(top_srcdir) && \
-          $(AUTOMAKE) --gnu  src/lib/gui/Makefile
+          $(AUTOMAKE) --foreign  src/lib/gui/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@@ -272 +274 @@
         tags=; \
         here=`pwd`; \
-        if (etags --etags-include --version) >/dev/null 2>&1; then \
+        if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
           include_option=--etags-include; \
+          empty_fix=.; \
         else \
           include_option=--include; \
+          empty_fix=; \
         fi; \
         list='$(SUBDIRS)'; for subdir in $$list; do \
           if test "$$subdir" = .; then :; else \
-            test -f $$subdir/TAGS && \
+            test ! -f $$subdir/TAGS || \
               tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
           fi; \
@@ -289 +293 @@
           $(AWK) '    { files[$$0] = 1; } \
                END { for (i in files) print i; }'`; \
-        test -z "$(ETAGS_ARGS)$$tags$$unique" \
-          || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-             $$tags $$unique
+        if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+          test -n "$$unique" || unique=$$empty_fix; \
+          $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+            $$tags $$unique; \
+        fi
 ctags: CTAGS
 CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \