Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

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


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/tinyxml
Files:
2 edited

Legend:

Unmodified
Added
Removed

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

    r5413 r5450  
    11
    2 noinst_LIBRARIES = libtinyxml.a
     2noinst_LTLIBRARIES = libtinyxml.la
    33
    4 libtinyxml_a_SOURCES = tinyxml.cc \
     4libtinyxml_la_SOURCES = tinyxml.cc \
    55                       tinystr.cc \
    66                       tinyxmlerror.cc \

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

    r5413 r5450  
    1616
    1717
    18 SOURCES = $(libtinyxml_a_SOURCES)
     18SOURCES = $(libtinyxml_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 libtinyxml_a_AR = $(AR) $(ARFLAGS)
    55 libtinyxml_a_LIBADD =
    56 am_libtinyxml_a_OBJECTS = tinyxml.$(OBJEXT) tinystr.$(OBJEXT) \
    57         tinyxmlerror.$(OBJEXT) tinyxmlparser.$(OBJEXT)
    58 libtinyxml_a_OBJECTS = $(am_libtinyxml_a_OBJECTS)
     51LTLIBRARIES = $(noinst_LTLIBRARIES)
     52libtinyxml_la_LIBADD =
     53am_libtinyxml_la_OBJECTS = tinyxml.lo tinystr.lo tinyxmlerror.lo \
     54        tinyxmlparser.lo
     55libtinyxml_la_OBJECTS = $(am_libtinyxml_la_OBJECTS)
    5956DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
    6057depcomp = $(SHELL) $(top_srcdir)/depcomp
    6158am__depfiles_maybe = depfiles
    62 @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/tinystr.Po ./$(DEPDIR)/tinyxml.Po \
    63 @AMDEP_TRUE@    ./$(DEPDIR)/tinyxmlerror.Po \
    64 @AMDEP_TRUE@    ./$(DEPDIR)/tinyxmlparser.Po
     59@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/tinystr.Plo \
     60@AMDEP_TRUE@    ./$(DEPDIR)/tinyxml.Plo \
     61@AMDEP_TRUE@    ./$(DEPDIR)/tinyxmlerror.Plo \
     62@AMDEP_TRUE@    ./$(DEPDIR)/tinyxmlparser.Plo
    6563CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
    6664        $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
     65LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
     66        $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
     67        $(AM_CXXFLAGS) $(CXXFLAGS)
    6768CXXLD = $(CXX)
    68 CXXLINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) \
    69         -o $@
    70 SOURCES = $(libtinyxml_a_SOURCES)
    71 DIST_SOURCES = $(libtinyxml_a_SOURCES)
     69CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
     70        $(AM_LDFLAGS) $(LDFLAGS) -o $@
     71SOURCES = $(libtinyxml_la_SOURCES)
     72DIST_SOURCES = $(libtinyxml_la_SOURCES)
    7273HEADERS = $(noinst_HEADERS)
    7374ETAGS = etags
    … …  
    7879AMDEP_TRUE = @AMDEP_TRUE@
    7980AMTAR = @AMTAR@
     81AR = @AR@
    8082AUTOCONF = @AUTOCONF@
    8183AUTOHEADER = @AUTOHEADER@
    … …  
    9092CURL_LIBS = @CURL_LIBS@
    9193CXX = @CXX@
     94CXXCPP = @CXXCPP@
    9295CXXDEPMODE = @CXXDEPMODE@
    9396CXXFLAGS = @CXXFLAGS@
    … …  
    101104DOXYGEN_FALSE = @DOXYGEN_FALSE@
    102105DOXYGEN_TRUE = @DOXYGEN_TRUE@
     106ECHO = @ECHO@
    103107ECHO_C = @ECHO_C@
    104108ECHO_N = @ECHO_N@
    … …  
    106110EGREP = @EGREP@
    107111EXEEXT = @EXEEXT@
     112F77 = @F77@
     113FFLAGS = @FFLAGS@
    108114GPROF = @GPROF@
    109115GTK2_CFLAGS = @GTK2_CFLAGS@
    … …  
    120126LIBOBJS = @LIBOBJS@
    121127LIBS = @LIBS@
     128LIBTOOL = @LIBTOOL@
     129LN_S = @LN_S@
    122130LTLIBOBJS = @LTLIBOBJS@
    123131MAKEINFO = @MAKEINFO@
    … …  
    139147SUB_PROJECTS_TRUE = @SUB_PROJECTS_TRUE@
    140148VERSION = @VERSION@
     149ac_ct_AR = @ac_ct_AR@
    141150ac_ct_CC = @ac_ct_CC@
    142151ac_ct_CXX = @ac_ct_CXX@
     152ac_ct_F77 = @ac_ct_F77@
    143153ac_ct_RANLIB = @ac_ct_RANLIB@
    144154ac_ct_STRIP = @ac_ct_STRIP@
    … …  
    182192target_os = @target_os@
    183193target_vendor = @target_vendor@
    184 noinst_LIBRARIES = libtinyxml.a
    185 libtinyxml_a_SOURCES = tinyxml.cc \
     194noinst_LTLIBRARIES = libtinyxml.la
     195libtinyxml_la_SOURCES = tinyxml.cc \
    186196                       tinystr.cc \
    187197                       tinyxmlerror.cc \
    … …  
    194204
    195205.SUFFIXES:
    196 .SUFFIXES: .cc .o .obj
     206.SUFFIXES: .cc .lo .o .obj
    197207$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
    198208        @for dep in $?; do \
    … …  
    225235        cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
    226236
    227 clean-noinstLIBRARIES:
    228         -test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES)
    229 libtinyxml.a: $(libtinyxml_a_OBJECTS) $(libtinyxml_a_DEPENDENCIES)
    230         -rm -f libtinyxml.a
    231         $(libtinyxml_a_AR) libtinyxml.a $(libtinyxml_a_OBJECTS) $(libtinyxml_a_LIBADD)
    232         $(RANLIB) libtinyxml.a
     237clean-noinstLTLIBRARIES:
     238        -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
     239        @list='$(noinst_LTLIBRARIES)'; for p in $$list; do \
     240          dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
     241          test "$$dir" != "$$p" || dir=.; \
     242          echo "rm -f \"$${dir}/so_locations\""; \
     243          rm -f "$${dir}/so_locations"; \
     244        done
     245libtinyxml.la: $(libtinyxml_la_OBJECTS) $(libtinyxml_la_DEPENDENCIES)
     246        $(CXXLINK)  $(libtinyxml_la_LDFLAGS) $(libtinyxml_la_OBJECTS) $(libtinyxml_la_LIBADD) $(LIBS)
    233247
    234248mostlyclean-compile:
    … …  
    238252        -rm -f *.tab.c
    239253
    240 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tinystr.Po@am__quote@
    241 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tinyxml.Po@am__quote@
    242 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tinyxmlerror.Po@am__quote@
    243 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tinyxmlparser.Po@am__quote@
     254@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tinystr.Plo@am__quote@
     255@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tinyxml.Plo@am__quote@
     256@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tinyxmlerror.Plo@am__quote@
     257@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tinyxmlparser.Plo@am__quote@
    244258
    245259.cc.o:
    … …  
    258272@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    259273@am__fastdepCXX_FALSE@  $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
     274
     275.cc.lo:
     276@am__fastdepCXX_TRUE@   if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
     277@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
     278@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
     279@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
     280@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     281@am__fastdepCXX_FALSE@  $(LTCXXCOMPILE) -c -o $@ $<
     282
     283mostlyclean-libtool:
     284        -rm -f *.lo
     285
     286clean-libtool:
     287        -rm -rf .libs _libs
     288
     289distclean-libtool:
     290        -rm -f libtool
    260291uninstall-info-am:
    261292
    … …  
    337368check-am: all-am
    338369check: check-am
    339 all-am: Makefile $(LIBRARIES) $(HEADERS)
     370all-am: Makefile $(LTLIBRARIES) $(HEADERS)
    340371installdirs:
    341372install: install-am
    … …  
    365396clean: clean-am
    366397
    367 clean-am: clean-generic clean-noinstLIBRARIES mostlyclean-am
     398clean-am: clean-generic clean-libtool clean-noinstLTLIBRARIES \
     399        mostlyclean-am
    368400
    369401distclean: distclean-am
    … …  
    371403        -rm -f Makefile
    372404distclean-am: clean-am distclean-compile distclean-generic \
    373         distclean-tags
     405        distclean-libtool distclean-tags
    374406
    375407dvi: dvi-am
    … …  
    400432mostlyclean: mostlyclean-am
    401433
    402 mostlyclean-am: mostlyclean-compile mostlyclean-generic
     434mostlyclean-am: mostlyclean-compile mostlyclean-generic \
     435        mostlyclean-libtool
    403436
    404437pdf: pdf-am
    … …  
    413446
    414447.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
    415         clean-noinstLIBRARIES ctags distclean distclean-compile \
    416         distclean-generic distclean-tags distdir dvi dvi-am html \
    417         html-am info info-am install install-am install-data \
    418         install-data-am install-exec install-exec-am install-info \
    419         install-info-am install-man install-strip installcheck \
    420         installcheck-am installdirs maintainer-clean \
    421         maintainer-clean-generic mostlyclean mostlyclean-compile \
    422         mostlyclean-generic pdf pdf-am ps ps-am tags uninstall \
    423         uninstall-am uninstall-info-am
     448        clean-libtool clean-noinstLTLIBRARIES ctags distclean \
     449        distclean-compile distclean-generic distclean-libtool \
     450        distclean-tags distdir dvi dvi-am html html-am info info-am \
     451        install install-am install-data install-data-am install-exec \
     452        install-exec-am install-info install-info-am install-man \
     453        install-strip installcheck installcheck-am installdirs \
     454        maintainer-clean maintainer-clean-generic mostlyclean \
     455        mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
     456        pdf pdf-am ps ps-am tags uninstall uninstall-am \
     457        uninstall-info-am
    424458
    425459# Tell versions [3.59,3.63) of GNU make to not export all variables.
Note: See TracChangeset for help on using the changeset viewer.