Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 5450 in orxonox.OLD for trunk/src/lib/particles


Ignore:
Timestamp:
Oct 29, 2005, 4:29:07 PM (19 years ago)
Author:
bensch
Message:

orxonox/trunk: building with LIBTOOL again, this time for real
Since now we link shared libraries together, there is no more problem with uninitialized global values

Location:
trunk/src/lib/particles
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/lib/particles/Makefile.am

    r5413 r5450  
    22include $(MAINSRCDIR)/defs/include_paths.am
    33
    4 noinst_LIBRARIES = libORXparticles.a
     4pkglib_LTLIBRARIES = libORXparticles.la
    55
    6 libORXparticles_a_SOURCES = particle_engine.cc \
    7                             particle_emitter.cc \
    8                             particle_system.cc \
    9                             quick_animation.cc
     6libORXparticles_la_SOURCES = particle_engine.cc \
     7                             particle_emitter.cc \
     8                             particle_system.cc \
     9                             quick_animation.cc
    1010
    1111

  • trunk/src/lib/particles/Makefile.in

    r5413 r5450  
    1616
    1717
    18 SOURCES = $(libORXparticles_a_SOURCES)
     18SOURCES = $(libORXparticles_la_SOURCES)
    1919
    2020srcdir = @srcdir@
    … …  
    4949CONFIG_HEADER = $(top_builddir)/config.h
    5050CONFIG_CLEAN_FILES =
    51 LIBRARIES = $(noinst_LIBRARIES)
    52 AR = ar
    53 ARFLAGS = cru
    54 libORXparticles_a_AR = $(AR) $(ARFLAGS)
    55 libORXparticles_a_LIBADD =
    56 am_libORXparticles_a_OBJECTS = particle_engine.$(OBJEXT) \
    57         particle_emitter.$(OBJEXT) particle_system.$(OBJEXT) \
    58         quick_animation.$(OBJEXT)
    59 libORXparticles_a_OBJECTS = $(am_libORXparticles_a_OBJECTS)
     51am__installdirs = "$(DESTDIR)$(pkglibdir)"
     52pkglibLTLIBRARIES_INSTALL = $(INSTALL)
     53LTLIBRARIES = $(pkglib_LTLIBRARIES)
     54libORXparticles_la_LIBADD =
     55am_libORXparticles_la_OBJECTS = particle_engine.lo particle_emitter.lo \
     56        particle_system.lo quick_animation.lo
     57libORXparticles_la_OBJECTS = $(am_libORXparticles_la_OBJECTS)
    6058DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
    6159depcomp = $(SHELL) $(top_srcdir)/depcomp
    6260am__depfiles_maybe = depfiles
    63 @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/particle_emitter.Po \
    64 @AMDEP_TRUE@    ./$(DEPDIR)/particle_engine.Po \
    65 @AMDEP_TRUE@    ./$(DEPDIR)/particle_system.Po \
    66 @AMDEP_TRUE@    ./$(DEPDIR)/quick_animation.Po
     61@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/particle_emitter.Plo \
     62@AMDEP_TRUE@    ./$(DEPDIR)/particle_engine.Plo \
     63@AMDEP_TRUE@    ./$(DEPDIR)/particle_system.Plo \
     64@AMDEP_TRUE@    ./$(DEPDIR)/quick_animation.Plo
    6765CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
    6866        $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
     67LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
     68        $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
     69        $(AM_CXXFLAGS) $(CXXFLAGS)
    6970CXXLD = $(CXX)
    70 CXXLINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) \
    71         -o $@
    72 SOURCES = $(libORXparticles_a_SOURCES)
    73 DIST_SOURCES = $(libORXparticles_a_SOURCES)
     71CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
     72        $(AM_LDFLAGS) $(LDFLAGS) -o $@
     73SOURCES = $(libORXparticles_la_SOURCES)
     74DIST_SOURCES = $(libORXparticles_la_SOURCES)
    7475HEADERS = $(noinst_HEADERS)
    7576ETAGS = etags
    … …  
    8081AMDEP_TRUE = @AMDEP_TRUE@
    8182AMTAR = @AMTAR@
     83AR = @AR@
    8284AUTOCONF = @AUTOCONF@
    8385AUTOHEADER = @AUTOHEADER@
    … …  
    9294CURL_LIBS = @CURL_LIBS@
    9395CXX = @CXX@
     96CXXCPP = @CXXCPP@
    9497CXXDEPMODE = @CXXDEPMODE@
    9598CXXFLAGS = @CXXFLAGS@
    … …  
    103106DOXYGEN_FALSE = @DOXYGEN_FALSE@
    104107DOXYGEN_TRUE = @DOXYGEN_TRUE@
     108ECHO = @ECHO@
    105109ECHO_C = @ECHO_C@
    106110ECHO_N = @ECHO_N@
    … …  
    108112EGREP = @EGREP@
    109113EXEEXT = @EXEEXT@
     114F77 = @F77@
     115FFLAGS = @FFLAGS@
    110116GPROF = @GPROF@
    111117GTK2_CFLAGS = @GTK2_CFLAGS@
    … …  
    122128LIBOBJS = @LIBOBJS@
    123129LIBS = @LIBS@
     130LIBTOOL = @LIBTOOL@
     131LN_S = @LN_S@
    124132LTLIBOBJS = @LTLIBOBJS@
    125133MAKEINFO = @MAKEINFO@
    … …  
    141149SUB_PROJECTS_TRUE = @SUB_PROJECTS_TRUE@
    142150VERSION = @VERSION@
     151ac_ct_AR = @ac_ct_AR@
    143152ac_ct_CC = @ac_ct_CC@
    144153ac_ct_CXX = @ac_ct_CXX@
     154ac_ct_F77 = @ac_ct_F77@
    145155ac_ct_RANLIB = @ac_ct_RANLIB@
    146156ac_ct_STRIP = @ac_ct_STRIP@
    … …  
    185195target_vendor = @target_vendor@
    186196MAINSRCDIR = ../..
    187 noinst_LIBRARIES = libORXparticles.a
    188 libORXparticles_a_SOURCES = particle_engine.cc \
    189                             particle_emitter.cc \
    190                             particle_system.cc \
    191                             quick_animation.cc
     197pkglib_LTLIBRARIES = libORXparticles.la
     198libORXparticles_la_SOURCES = particle_engine.cc \
     199                             particle_emitter.cc \
     200                             particle_system.cc \
     201                             quick_animation.cc
    192202
    193203noinst_HEADERS = particle_engine.h \
    … …  
    199209
    200210.SUFFIXES:
    201 .SUFFIXES: .cc .o .obj
     211.SUFFIXES: .cc .lo .o .obj
    202212$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
    203213        @for dep in $?; do \
    … …  
    229239$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
    230240        cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
    231 
    232 clean-noinstLIBRARIES:
    233         -test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES)
    234 libORXparticles.a: $(libORXparticles_a_OBJECTS) $(libORXparticles_a_DEPENDENCIES)
    235         -rm -f libORXparticles.a
    236         $(libORXparticles_a_AR) libORXparticles.a $(libORXparticles_a_OBJECTS) $(libORXparticles_a_LIBADD)
    237         $(RANLIB) libORXparticles.a
     241install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES)
     242        @$(NORMAL_INSTALL)
     243        test -z "$(pkglibdir)" || $(mkdir_p) "$(DESTDIR)$(pkglibdir)"
     244        @list='$(pkglib_LTLIBRARIES)'; for p in $$list; do \
     245          if test -f $$p; then \
     246            f="`echo $$p | sed -e 's|^.*/||'`"; \
     247            echo " $(LIBTOOL) --mode=install $(pkglibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(pkglibdir)/$$f'"; \
     248            $(LIBTOOL) --mode=install $(pkglibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(pkglibdir)/$$f"; \
     249          else :; fi; \
     250        done
     251
     252uninstall-pkglibLTLIBRARIES:
     253        @$(NORMAL_UNINSTALL)
     254        @list='$(pkglib_LTLIBRARIES)'; for p in $$list; do \
     255            p="`echo $$p | sed -e 's|^.*/||'`"; \
     256          echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(pkglibdir)/$$p'"; \
     257          $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(pkglibdir)/$$p"; \
     258        done
     259
     260clean-pkglibLTLIBRARIES:
     261        -test -z "$(pkglib_LTLIBRARIES)" || rm -f $(pkglib_LTLIBRARIES)
     262        @list='$(pkglib_LTLIBRARIES)'; for p in $$list; do \
     263          dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
     264          test "$$dir" != "$$p" || dir=.; \
     265          echo "rm -f \"$${dir}/so_locations\""; \
     266          rm -f "$${dir}/so_locations"; \
     267        done
     268libORXparticles.la: $(libORXparticles_la_OBJECTS) $(libORXparticles_la_DEPENDENCIES)
     269        $(CXXLINK) -rpath $(pkglibdir) $(libORXparticles_la_LDFLAGS) $(libORXparticles_la_OBJECTS) $(libORXparticles_la_LIBADD) $(LIBS)
    238270
    239271mostlyclean-compile:
    … …  
    243275        -rm -f *.tab.c
    244276
    245 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/particle_emitter.Po@am__quote@
    246 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/particle_engine.Po@am__quote@
    247 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/particle_system.Po@am__quote@
    248 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/quick_animation.Po@am__quote@
     277@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/particle_emitter.Plo@am__quote@
     278@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/particle_engine.Plo@am__quote@
     279@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/particle_system.Plo@am__quote@
     280@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/quick_animation.Plo@am__quote@
    249281
    250282.cc.o:
    … …  
    263295@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    264296@am__fastdepCXX_FALSE@  $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
     297
     298.cc.lo:
     299@am__fastdepCXX_TRUE@   if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
     300@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
     301@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
     302@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
     303@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     304@am__fastdepCXX_FALSE@  $(LTCXXCOMPILE) -c -o $@ $<
     305
     306mostlyclean-libtool:
     307        -rm -f *.lo
     308
     309clean-libtool:
     310        -rm -rf .libs _libs
     311
     312distclean-libtool:
     313        -rm -f libtool
    265314uninstall-info-am:
    266315
    … …  
    342391check-am: all-am
    343392check: check-am
    344 all-am: Makefile $(LIBRARIES) $(HEADERS)
     393all-am: Makefile $(LTLIBRARIES) $(HEADERS)
    345394installdirs:
     395        for dir in "$(DESTDIR)$(pkglibdir)"; do \
     396          test -z "$$dir" || $(mkdir_p) "$$dir"; \
     397        done
    346398install: install-am
    347399install-exec: install-exec-am
    … …  
    370422clean: clean-am
    371423
    372 clean-am: clean-generic clean-noinstLIBRARIES mostlyclean-am
     424clean-am: clean-generic clean-libtool clean-pkglibLTLIBRARIES \
     425        mostlyclean-am
    373426
    374427distclean: distclean-am
    … …  
    376429        -rm -f Makefile
    377430distclean-am: clean-am distclean-compile distclean-generic \
    378         distclean-tags
     431        distclean-libtool distclean-tags
    379432
    380433dvi: dvi-am
    … …  
    390443install-data-am:
    391444
    392 install-exec-am:
     445install-exec-am: install-pkglibLTLIBRARIES
    393446
    394447install-info: install-info-am
    … …  
    405458mostlyclean: mostlyclean-am
    406459
    407 mostlyclean-am: mostlyclean-compile mostlyclean-generic
     460mostlyclean-am: mostlyclean-compile mostlyclean-generic \
     461        mostlyclean-libtool
    408462
    409463pdf: pdf-am
    … …  
    415469ps-am:
    416470
    417 uninstall-am: uninstall-info-am
     471uninstall-am: uninstall-info-am uninstall-pkglibLTLIBRARIES
    418472
    419473.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
    420         clean-noinstLIBRARIES ctags distclean distclean-compile \
    421         distclean-generic distclean-tags distdir dvi dvi-am html \
    422         html-am info info-am install install-am install-data \
    423         install-data-am install-exec install-exec-am install-info \
    424         install-info-am install-man install-strip installcheck \
     474        clean-libtool clean-pkglibLTLIBRARIES ctags distclean \
     475        distclean-compile distclean-generic distclean-libtool \
     476        distclean-tags distdir dvi dvi-am html html-am info info-am \
     477        install install-am install-data install-data-am install-exec \
     478        install-exec-am install-info install-info-am install-man \
     479        install-pkglibLTLIBRARIES install-strip installcheck \
    425480        installcheck-am installdirs maintainer-clean \
    426481        maintainer-clean-generic mostlyclean mostlyclean-compile \
    427         mostlyclean-generic pdf pdf-am ps ps-am tags uninstall \
    428         uninstall-am uninstall-info-am
     482        mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
     483        tags uninstall uninstall-am uninstall-info-am \
     484        uninstall-pkglibLTLIBRARIES
    429485
    430486include $(MAINSRCDIR)/defs/include_paths.am
Note: See TracChangeset for help on using the changeset viewer.