Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 5463 in orxonox.OLD for trunk/src/world_entities


Ignore:
Timestamp:
Nov 1, 2005, 11:09:15 AM (19 years ago)
Author:
bensch
Message:

orxonox/trunk: removed LIBTOOL again

Location:
trunk/src/world_entities
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/world_entities/Makefile.am

    r5458 r5463  
    22include $(MAINSRCDIR)/defs/include_paths.am
    33
    4 pkglib_LTLIBRARIES = libORXworld_entities.la
     4noinst_LIBRARIES = libORXworld_entities.a
    55
    6 libORXworld_entities_la_SOURCES = \
     6libORXworld_entities_a_SOURCES = \
    77                  world_entity.cc \
    88                  camera.cc \

  • trunk/src/world_entities/Makefile.in

    r5458 r5463  
    1616
    1717
    18 SOURCES = $(libORXworld_entities_la_SOURCES)
     18SOURCES = $(libORXworld_entities_a_SOURCES)
    1919
    2020srcdir = @srcdir@
    … …  
    4949CONFIG_HEADER = $(top_builddir)/config.h
    5050CONFIG_CLEAN_FILES =
     51<<<<<<< .working
    5152am__installdirs = "$(DESTDIR)$(pkglibdir)"
    5253pkglibLTLIBRARIES_INSTALL = $(INSTALL)
    … …  
    6162libORXworld_entities_la_OBJECTS =  \
    6263        $(am_libORXworld_entities_la_OBJECTS)
     64=======
     65LIBRARIES = $(noinst_LIBRARIES)
     66AR = ar
     67ARFLAGS = cru
     68libORXworld_entities_a_AR = $(AR) $(ARFLAGS)
     69libORXworld_entities_a_LIBADD =
     70am_libORXworld_entities_a_OBJECTS = world_entity.$(OBJEXT) \
     71        camera.$(OBJEXT) player.$(OBJEXT) npc.$(OBJEXT) npc2.$(OBJEXT) \
     72        environment.$(OBJEXT) skysphere.$(OBJEXT) skybox.$(OBJEXT) \
     73        terrain.$(OBJEXT) satellite.$(OBJEXT) \
     74        character_attributes.$(OBJEXT) test_entity.$(OBJEXT) \
     75        weapon_manager.$(OBJEXT) weapon.$(OBJEXT) projectile.$(OBJEXT) \
     76        test_gun.$(OBJEXT) turret.$(OBJEXT) test_bullet.$(OBJEXT) \
     77        crosshair.$(OBJEXT)
     78libORXworld_entities_a_OBJECTS = $(am_libORXworld_entities_a_OBJECTS)
     79>>>>>>> .merge-right.r5449
    6380DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
    6481depcomp = $(SHELL) $(top_srcdir)/depcomp
    6582am__depfiles_maybe = depfiles
     83<<<<<<< .working
    6684@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/camera.Plo \
    6785@AMDEP_TRUE@    ./$(DEPDIR)/character_attributes.Plo \
    … …  
    8199@AMDEP_TRUE@    ./$(DEPDIR)/weapon_manager.Plo \
    82100@AMDEP_TRUE@    ./$(DEPDIR)/world_entity.Plo
     101=======
     102@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/camera.Po \
     103@AMDEP_TRUE@    ./$(DEPDIR)/character_attributes.Po \
     104@AMDEP_TRUE@    ./$(DEPDIR)/crosshair.Po \
     105@AMDEP_TRUE@    ./$(DEPDIR)/environment.Po ./$(DEPDIR)/npc.Po \
     106@AMDEP_TRUE@    ./$(DEPDIR)/npc2.Po ./$(DEPDIR)/player.Po \
     107@AMDEP_TRUE@    ./$(DEPDIR)/projectile.Po ./$(DEPDIR)/satellite.Po \
     108@AMDEP_TRUE@    ./$(DEPDIR)/skybox.Po ./$(DEPDIR)/skysphere.Po \
     109@AMDEP_TRUE@    ./$(DEPDIR)/terrain.Po ./$(DEPDIR)/test_bullet.Po \
     110@AMDEP_TRUE@    ./$(DEPDIR)/test_entity.Po ./$(DEPDIR)/test_gun.Po \
     111@AMDEP_TRUE@    ./$(DEPDIR)/turret.Po ./$(DEPDIR)/weapon.Po \
     112@AMDEP_TRUE@    ./$(DEPDIR)/weapon_manager.Po \
     113@AMDEP_TRUE@    ./$(DEPDIR)/world_entity.Po
     114>>>>>>> .merge-right.r5449
    83115CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
    84116        $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
    85 LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
    86         $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
    87         $(AM_CXXFLAGS) $(CXXFLAGS)
    88117CXXLD = $(CXX)
    89 CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
    90         $(AM_LDFLAGS) $(LDFLAGS) -o $@
    91 SOURCES = $(libORXworld_entities_la_SOURCES)
    92 DIST_SOURCES = $(libORXworld_entities_la_SOURCES)
     118CXXLINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) \
     119        -o $@
     120SOURCES = $(libORXworld_entities_a_SOURCES)
     121DIST_SOURCES = $(libORXworld_entities_a_SOURCES)
    93122RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
    94123        html-recursive info-recursive install-data-recursive \
    … …  
    106135AMDEP_TRUE = @AMDEP_TRUE@
    107136AMTAR = @AMTAR@
    108 AR = @AR@
    109137AUTOCONF = @AUTOCONF@
    110138AUTOHEADER = @AUTOHEADER@
    … …  
    119147CURL_LIBS = @CURL_LIBS@
    120148CXX = @CXX@
    121 CXXCPP = @CXXCPP@
    122149CXXDEPMODE = @CXXDEPMODE@
    123150CXXFLAGS = @CXXFLAGS@
    … …  
    131158DOXYGEN_FALSE = @DOXYGEN_FALSE@
    132159DOXYGEN_TRUE = @DOXYGEN_TRUE@
    133 ECHO = @ECHO@
    134160ECHO_C = @ECHO_C@
    135161ECHO_N = @ECHO_N@
    … …  
    137163EGREP = @EGREP@
    138164EXEEXT = @EXEEXT@
    139 F77 = @F77@
    140 FFLAGS = @FFLAGS@
    141165GPROF = @GPROF@
    142166GTK2_CFLAGS = @GTK2_CFLAGS@
    … …  
    153177LIBOBJS = @LIBOBJS@
    154178LIBS = @LIBS@
    155 LIBTOOL = @LIBTOOL@
    156 LN_S = @LN_S@
    157179LTLIBOBJS = @LTLIBOBJS@
    158180MAKEINFO = @MAKEINFO@
    … …  
    174196SUB_PROJECTS_TRUE = @SUB_PROJECTS_TRUE@
    175197VERSION = @VERSION@
    176 ac_ct_AR = @ac_ct_AR@
    177198ac_ct_CC = @ac_ct_CC@
    178199ac_ct_CXX = @ac_ct_CXX@
    179 ac_ct_F77 = @ac_ct_F77@
    180200ac_ct_RANLIB = @ac_ct_RANLIB@
    181201ac_ct_STRIP = @ac_ct_STRIP@
    … …  
    220240target_vendor = @target_vendor@
    221241MAINSRCDIR = ..
    222 pkglib_LTLIBRARIES = libORXworld_entities.la
    223 libORXworld_entities_la_SOURCES = \
     242noinst_LIBRARIES = libORXworld_entities.a
     243libORXworld_entities_a_SOURCES = \
    224244                  world_entity.cc \
    225245                  camera.cc \
    … …  
    240260                  weapons/projectile.cc \
    241261                  weapons/test_bullet.cc \
     262<<<<<<< .working
    242263                  weapons/rocket.cc \
    243264                  weapons/laser.cc \
    … …  
    246267                  power_ups/turret_power_up.cc \
    247268                  power_ups/laser_power_up.cc
     269=======
     270                  weapons/crosshair.cc
     271>>>>>>> .merge-right.r5449
    248272
    249273noinst_HEADERS = \
    … …  
    256280                 skysphere.h \
    257281                 skybox.h \
     282                 power_up.h \
    258283                 terrain.h \
    259284                 satellite.h \
    … …  
    266291                 weapons/turret.h \
    267292                 weapons/test_bullet.h \
     293<<<<<<< .working
    268294                 weapons/crosshair.h \
    269295                 power_ups/power_up.h \
    270296                 power_ups/turret_power_up.h \
    271297                 power_ups/laser_power_up.h
     298=======
     299                 weapons/crosshair.h
     300>>>>>>> .merge-right.r5449
    272301
    273302SUBDIRS = .          .
    … …  
    275304
    276305.SUFFIXES:
    277 .SUFFIXES: .cc .lo .o .obj
     306.SUFFIXES: .cc .o .obj
    278307$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
    279308        @for dep in $?; do \
    … …  
    305334$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
    306335        cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
    307 install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES)
    308         @$(NORMAL_INSTALL)
    309         test -z "$(pkglibdir)" || $(mkdir_p) "$(DESTDIR)$(pkglibdir)"
    310         @list='$(pkglib_LTLIBRARIES)'; for p in $$list; do \
    311           if test -f $$p; then \
    312             f="`echo $$p | sed -e 's|^.*/||'`"; \
    313             echo " $(LIBTOOL) --mode=install $(pkglibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(pkglibdir)/$$f'"; \
    314             $(LIBTOOL) --mode=install $(pkglibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(pkglibdir)/$$f"; \
    315           else :; fi; \
    316         done
    317 
    318 uninstall-pkglibLTLIBRARIES:
    319         @$(NORMAL_UNINSTALL)
    320         @list='$(pkglib_LTLIBRARIES)'; for p in $$list; do \
    321             p="`echo $$p | sed -e 's|^.*/||'`"; \
    322           echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(pkglibdir)/$$p'"; \
    323           $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(pkglibdir)/$$p"; \
    324         done
    325 
    326 clean-pkglibLTLIBRARIES:
    327         -test -z "$(pkglib_LTLIBRARIES)" || rm -f $(pkglib_LTLIBRARIES)
    328         @list='$(pkglib_LTLIBRARIES)'; for p in $$list; do \
    329           dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
    330           test "$$dir" != "$$p" || dir=.; \
    331           echo "rm -f \"$${dir}/so_locations\""; \
    332           rm -f "$${dir}/so_locations"; \
    333         done
    334 libORXworld_entities.la: $(libORXworld_entities_la_OBJECTS) $(libORXworld_entities_la_DEPENDENCIES)
    335         $(CXXLINK) -rpath $(pkglibdir) $(libORXworld_entities_la_LDFLAGS) $(libORXworld_entities_la_OBJECTS) $(libORXworld_entities_la_LIBADD) $(LIBS)
     336
     337clean-noinstLIBRARIES:
     338        -test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES)
     339libORXworld_entities.a: $(libORXworld_entities_a_OBJECTS) $(libORXworld_entities_a_DEPENDENCIES)
     340        -rm -f libORXworld_entities.a
     341        $(libORXworld_entities_a_AR) libORXworld_entities.a $(libORXworld_entities_a_OBJECTS) $(libORXworld_entities_a_LIBADD)
     342        $(RANLIB) libORXworld_entities.a
    336343
    337344mostlyclean-compile:
    … …  
    341348        -rm -f *.tab.c
    342349
     350<<<<<<< .working
    343351@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/camera.Plo@am__quote@
    344352@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/character_attributes.Plo@am__quote@
    … …  
    365373@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/weapon_manager.Plo@am__quote@
    366374@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/world_entity.Plo@am__quote@
     375=======
     376@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/camera.Po@am__quote@
     377@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/character_attributes.Po@am__quote@
     378@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/crosshair.Po@am__quote@
     379@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/environment.Po@am__quote@
     380@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/npc.Po@am__quote@
     381@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/npc2.Po@am__quote@
     382@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/player.Po@am__quote@
     383@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/projectile.Po@am__quote@
     384@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/satellite.Po@am__quote@
     385@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/skybox.Po@am__quote@
     386@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/skysphere.Po@am__quote@
     387@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/terrain.Po@am__quote@
     388@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_bullet.Po@am__quote@
     389@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_entity.Po@am__quote@
     390@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_gun.Po@am__quote@
     391@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/turret.Po@am__quote@
     392@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/weapon.Po@am__quote@
     393@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/weapon_manager.Po@am__quote@
     394@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/world_entity.Po@am__quote@
     395>>>>>>> .merge-right.r5449
    367396
    368397.cc.o:
    … …  
    382411@am__fastdepCXX_FALSE@  $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
    383412
    384 .cc.lo:
    385 @am__fastdepCXX_TRUE@   if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
    386 @am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
    387 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
    388 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
    389 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    390 @am__fastdepCXX_FALSE@  $(LTCXXCOMPILE) -c -o $@ $<
    391 
    392413weapon_manager.o: weapons/weapon_manager.cc
    393414@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT weapon_manager.o -MD -MP -MF "$(DEPDIR)/weapon_manager.Tpo" -c -o weapon_manager.o `test -f 'weapons/weapon_manager.cc' || echo '$(srcdir)/'`weapons/weapon_manager.cc; \
    … …  
    406427@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o weapon_manager.obj `if test -f 'weapons/weapon_manager.cc'; then $(CYGPATH_W) 'weapons/weapon_manager.cc'; else $(CYGPATH_W) '$(srcdir)/weapons/weapon_manager.cc'; fi`
    407428
    408 weapon_manager.lo: weapons/weapon_manager.cc
    409 @am__fastdepCXX_TRUE@   if $(LIBTOOL) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT weapon_manager.lo -MD -MP -MF "$(DEPDIR)/weapon_manager.Tpo" -c -o weapon_manager.lo `test -f 'weapons/weapon_manager.cc' || echo '$(srcdir)/'`weapons/weapon_manager.cc; \
    410 @am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/weapon_manager.Tpo" "$(DEPDIR)/weapon_manager.Plo"; else rm -f "$(DEPDIR)/weapon_manager.Tpo"; exit 1; fi
    411 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='weapons/weapon_manager.cc' object='weapon_manager.lo' libtool=yes @AMDEPBACKSLASH@
    412 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/weapon_manager.Plo' tmpdepfile='$(DEPDIR)/weapon_manager.TPlo' @AMDEPBACKSLASH@
    413 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    414 @am__fastdepCXX_FALSE@  $(LIBTOOL) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o weapon_manager.lo `test -f 'weapons/weapon_manager.cc' || echo '$(srcdir)/'`weapons/weapon_manager.cc
    415 
    416429weapon.o: weapons/weapon.cc
    417430@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT weapon.o -MD -MP -MF "$(DEPDIR)/weapon.Tpo" -c -o weapon.o `test -f 'weapons/weapon.cc' || echo '$(srcdir)/'`weapons/weapon.cc; \
    … …  
    430443@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o weapon.obj `if test -f 'weapons/weapon.cc'; then $(CYGPATH_W) 'weapons/weapon.cc'; else $(CYGPATH_W) '$(srcdir)/weapons/weapon.cc'; fi`
    431444
    432 weapon.lo: weapons/weapon.cc
    433 @am__fastdepCXX_TRUE@   if $(LIBTOOL) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT weapon.lo -MD -MP -MF "$(DEPDIR)/weapon.Tpo" -c -o weapon.lo `test -f 'weapons/weapon.cc' || echo '$(srcdir)/'`weapons/weapon.cc; \
    434 @am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/weapon.Tpo" "$(DEPDIR)/weapon.Plo"; else rm -f "$(DEPDIR)/weapon.Tpo"; exit 1; fi
    435 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='weapons/weapon.cc' object='weapon.lo' libtool=yes @AMDEPBACKSLASH@
    436 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/weapon.Plo' tmpdepfile='$(DEPDIR)/weapon.TPlo' @AMDEPBACKSLASH@
    437 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    438 @am__fastdepCXX_FALSE@  $(LIBTOOL) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o weapon.lo `test -f 'weapons/weapon.cc' || echo '$(srcdir)/'`weapons/weapon.cc
    439 
     445<<<<<<< .working
     446=======
     447projectile.o: weapons/projectile.cc
     448@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT projectile.o -MD -MP -MF "$(DEPDIR)/projectile.Tpo" -c -o projectile.o `test -f 'weapons/projectile.cc' || echo '$(srcdir)/'`weapons/projectile.cc; \
     449@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/projectile.Tpo" "$(DEPDIR)/projectile.Po"; else rm -f "$(DEPDIR)/projectile.Tpo"; exit 1; fi
     450@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='weapons/projectile.cc' object='projectile.o' libtool=no @AMDEPBACKSLASH@
     451@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/projectile.Po' tmpdepfile='$(DEPDIR)/projectile.TPo' @AMDEPBACKSLASH@
     452@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     453@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o projectile.o `test -f 'weapons/projectile.cc' || echo '$(srcdir)/'`weapons/projectile.cc
     454
     455projectile.obj: weapons/projectile.cc
     456@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT projectile.obj -MD -MP -MF "$(DEPDIR)/projectile.Tpo" -c -o projectile.obj `if test -f 'weapons/projectile.cc'; then $(CYGPATH_W) 'weapons/projectile.cc'; else $(CYGPATH_W) '$(srcdir)/weapons/projectile.cc'; fi`; \
     457@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/projectile.Tpo" "$(DEPDIR)/projectile.Po"; else rm -f "$(DEPDIR)/projectile.Tpo"; exit 1; fi
     458@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='weapons/projectile.cc' object='projectile.obj' libtool=no @AMDEPBACKSLASH@
     459@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/projectile.Po' tmpdepfile='$(DEPDIR)/projectile.TPo' @AMDEPBACKSLASH@
     460@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     461@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o projectile.obj `if test -f 'weapons/projectile.cc'; then $(CYGPATH_W) 'weapons/projectile.cc'; else $(CYGPATH_W) '$(srcdir)/weapons/projectile.cc'; fi`
     462
     463>>>>>>> .merge-right.r5449
    440464test_gun.o: weapons/test_gun.cc
    441465@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT test_gun.o -MD -MP -MF "$(DEPDIR)/test_gun.Tpo" -c -o test_gun.o `test -f 'weapons/test_gun.cc' || echo '$(srcdir)/'`weapons/test_gun.cc; \
    … …  
    454478@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o test_gun.obj `if test -f 'weapons/test_gun.cc'; then $(CYGPATH_W) 'weapons/test_gun.cc'; else $(CYGPATH_W) '$(srcdir)/weapons/test_gun.cc'; fi`
    455479
    456 test_gun.lo: weapons/test_gun.cc
    457 @am__fastdepCXX_TRUE@   if $(LIBTOOL) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT test_gun.lo -MD -MP -MF "$(DEPDIR)/test_gun.Tpo" -c -o test_gun.lo `test -f 'weapons/test_gun.cc' || echo '$(srcdir)/'`weapons/test_gun.cc; \
    458 @am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/test_gun.Tpo" "$(DEPDIR)/test_gun.Plo"; else rm -f "$(DEPDIR)/test_gun.Tpo"; exit 1; fi
    459 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='weapons/test_gun.cc' object='test_gun.lo' libtool=yes @AMDEPBACKSLASH@
    460 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/test_gun.Plo' tmpdepfile='$(DEPDIR)/test_gun.TPlo' @AMDEPBACKSLASH@
    461 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    462 @am__fastdepCXX_FALSE@  $(LIBTOOL) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o test_gun.lo `test -f 'weapons/test_gun.cc' || echo '$(srcdir)/'`weapons/test_gun.cc
    463 
    464480turret.o: weapons/turret.cc
    465481@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT turret.o -MD -MP -MF "$(DEPDIR)/turret.Tpo" -c -o turret.o `test -f 'weapons/turret.cc' || echo '$(srcdir)/'`weapons/turret.cc; \
    … …  
    478494@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o turret.obj `if test -f 'weapons/turret.cc'; then $(CYGPATH_W) 'weapons/turret.cc'; else $(CYGPATH_W) '$(srcdir)/weapons/turret.cc'; fi`
    479495
    480 turret.lo: weapons/turret.cc
    481 @am__fastdepCXX_TRUE@   if $(LIBTOOL) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT turret.lo -MD -MP -MF "$(DEPDIR)/turret.Tpo" -c -o turret.lo `test -f 'weapons/turret.cc' || echo '$(srcdir)/'`weapons/turret.cc; \
    482 @am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/turret.Tpo" "$(DEPDIR)/turret.Plo"; else rm -f "$(DEPDIR)/turret.Tpo"; exit 1; fi
    483 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='weapons/turret.cc' object='turret.lo' libtool=yes @AMDEPBACKSLASH@
    484 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/turret.Plo' tmpdepfile='$(DEPDIR)/turret.TPlo' @AMDEPBACKSLASH@
    485 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    486 @am__fastdepCXX_FALSE@  $(LIBTOOL) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o turret.lo `test -f 'weapons/turret.cc' || echo '$(srcdir)/'`weapons/turret.cc
    487 
    488496projectile.o: weapons/projectile.cc
    489497@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT projectile.o -MD -MP -MF "$(DEPDIR)/projectile.Tpo" -c -o projectile.o `test -f 'weapons/projectile.cc' || echo '$(srcdir)/'`weapons/projectile.cc; \
    … …  
    526534@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o test_bullet.obj `if test -f 'weapons/test_bullet.cc'; then $(CYGPATH_W) 'weapons/test_bullet.cc'; else $(CYGPATH_W) '$(srcdir)/weapons/test_bullet.cc'; fi`
    527535
    528 test_bullet.lo: weapons/test_bullet.cc
    529 @am__fastdepCXX_TRUE@   if $(LIBTOOL) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT test_bullet.lo -MD -MP -MF "$(DEPDIR)/test_bullet.Tpo" -c -o test_bullet.lo `test -f 'weapons/test_bullet.cc' || echo '$(srcdir)/'`weapons/test_bullet.cc; \
    530 @am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/test_bullet.Tpo" "$(DEPDIR)/test_bullet.Plo"; else rm -f "$(DEPDIR)/test_bullet.Tpo"; exit 1; fi
    531 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='weapons/test_bullet.cc' object='test_bullet.lo' libtool=yes @AMDEPBACKSLASH@
    532 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/test_bullet.Plo' tmpdepfile='$(DEPDIR)/test_bullet.TPlo' @AMDEPBACKSLASH@
    533 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    534 @am__fastdepCXX_FALSE@  $(LIBTOOL) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o test_bullet.lo `test -f 'weapons/test_bullet.cc' || echo '$(srcdir)/'`weapons/test_bullet.cc
    535 
    536536rocket.o: weapons/rocket.cc
    537537@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT rocket.o -MD -MP -MF "$(DEPDIR)/rocket.Tpo" -c -o rocket.o `test -f 'weapons/rocket.cc' || echo '$(srcdir)/'`weapons/rocket.cc; \
    … …  
    597597@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    598598@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o crosshair.obj `if test -f 'weapons/crosshair.cc'; then $(CYGPATH_W) 'weapons/crosshair.cc'; else $(CYGPATH_W) '$(srcdir)/weapons/crosshair.cc'; fi`
     599<<<<<<< .working
    599600
    600601crosshair.lo: weapons/crosshair.cc
    … …  
    686687distclean-libtool:
    687688        -rm -f libtool
     689=======
     690>>>>>>> .merge-right.r5449
    688691uninstall-info-am:
    689692
    … …  
    809812
    810813distdir: $(DISTFILES)
    811         $(mkdir_p) $(distdir)/power_ups $(distdir)/weapons
     814        $(mkdir_p) $(distdir)/weapons
    812815        @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
    813816        topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
    … …  
    851854check-am: all-am
    852855check: check-recursive
    853 all-am: Makefile $(LTLIBRARIES) $(HEADERS)
     856all-am: Makefile $(LIBRARIES) $(HEADERS)
    854857installdirs: installdirs-recursive
    855858installdirs-am:
    856         for dir in "$(DESTDIR)$(pkglibdir)"; do \
    857           test -z "$$dir" || $(mkdir_p) "$$dir"; \
    858         done
    859859install: install-recursive
    860860install-exec: install-exec-recursive
    … …  
    883883clean: clean-recursive
    884884
    885 clean-am: clean-generic clean-libtool clean-pkglibLTLIBRARIES \
    886         mostlyclean-am
     885clean-am: clean-generic clean-noinstLIBRARIES mostlyclean-am
    887886
    888887distclean: distclean-recursive
    … …  
    890889        -rm -f Makefile
    891890distclean-am: clean-am distclean-compile distclean-generic \
    892         distclean-libtool distclean-tags
     891        distclean-tags
    893892
    894893dvi: dvi-recursive
    … …  
    904903install-data-am:
    905904
    906 install-exec-am: install-pkglibLTLIBRARIES
     905install-exec-am:
    907906
    908907install-info: install-info-recursive
    … …  
    919918mostlyclean: mostlyclean-recursive
    920919
    921 mostlyclean-am: mostlyclean-compile mostlyclean-generic \
    922         mostlyclean-libtool
     920mostlyclean-am: mostlyclean-compile mostlyclean-generic
    923921
    924922pdf: pdf-recursive
    … …  
    930928ps-am:
    931929
    932 uninstall-am: uninstall-info-am uninstall-pkglibLTLIBRARIES
     930uninstall-am: uninstall-info-am
    933931
    934932uninstall-info: uninstall-info-recursive
    935933
    936934.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
    937         clean clean-generic clean-libtool clean-pkglibLTLIBRARIES \
    938         clean-recursive ctags ctags-recursive distclean \
    939         distclean-compile distclean-generic distclean-libtool \
    940         distclean-recursive distclean-tags distdir dvi dvi-am html \
    941         html-am info info-am install install-am install-data \
    942         install-data-am install-exec install-exec-am install-info \
    943         install-info-am install-man install-pkglibLTLIBRARIES \
    944         install-strip installcheck installcheck-am installdirs \
    945         installdirs-am maintainer-clean maintainer-clean-generic \
     935        clean clean-generic clean-noinstLIBRARIES clean-recursive \
     936        ctags ctags-recursive distclean distclean-compile \
     937        distclean-generic distclean-recursive distclean-tags distdir \
     938        dvi dvi-am html html-am info info-am install install-am \
     939        install-data install-data-am install-exec install-exec-am \
     940        install-info install-info-am install-man install-strip \
     941        installcheck installcheck-am installdirs installdirs-am \
     942        maintainer-clean maintainer-clean-generic \
    946943        maintainer-clean-recursive mostlyclean mostlyclean-compile \
    947         mostlyclean-generic mostlyclean-libtool mostlyclean-recursive \
    948         pdf pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \
    949         uninstall-info-am uninstall-pkglibLTLIBRARIES
     944        mostlyclean-generic mostlyclean-recursive pdf pdf-am ps ps-am \
     945        tags tags-recursive uninstall uninstall-am uninstall-info-am
    950946
    951947include $(MAINSRCDIR)/defs/include_paths.am
Note: See TracChangeset for help on using the changeset viewer.