Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

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


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

orxonox/trunk: removed LIBTOOL again

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

Legend:

Unmodified
Added
Removed

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

    r5452 r5463  
    11
    2 pkglib_LTLIBRARIES = libtinyxml.la
     2noinst_LIBRARIES = libtinyxml.a
    33
    4 libtinyxml_la_SOURCES = tinyxml.cc \
     4libtinyxml_a_SOURCES = tinyxml.cc \
    55                       tinystr.cc \
    66                       tinyxmlerror.cc \

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

    r5452 r5463  
    1616
    1717
    18 SOURCES = $(libtinyxml_la_SOURCES)
     18SOURCES = $(libtinyxml_a_SOURCES)
    1919
    2020srcdir = @srcdir@
    … …  
    4949CONFIG_HEADER = $(top_builddir)/config.h
    5050CONFIG_CLEAN_FILES =
    51 am__installdirs = "$(DESTDIR)$(pkglibdir)"
    52 pkglibLTLIBRARIES_INSTALL = $(INSTALL)
    53 LTLIBRARIES = $(pkglib_LTLIBRARIES)
    54 libtinyxml_la_LIBADD =
    55 am_libtinyxml_la_OBJECTS = tinyxml.lo tinystr.lo tinyxmlerror.lo \
    56         tinyxmlparser.lo
    57 libtinyxml_la_OBJECTS = $(am_libtinyxml_la_OBJECTS)
     51LIBRARIES = $(noinst_LIBRARIES)
     52AR = ar
     53ARFLAGS = cru
     54libtinyxml_a_AR = $(AR) $(ARFLAGS)
     55libtinyxml_a_LIBADD =
     56am_libtinyxml_a_OBJECTS = tinyxml.$(OBJEXT) tinystr.$(OBJEXT) \
     57        tinyxmlerror.$(OBJEXT) tinyxmlparser.$(OBJEXT)
     58libtinyxml_a_OBJECTS = $(am_libtinyxml_a_OBJECTS)
    5859DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
    5960depcomp = $(SHELL) $(top_srcdir)/depcomp
    6061am__depfiles_maybe = depfiles
    61 @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/tinystr.Plo \
    62 @AMDEP_TRUE@    ./$(DEPDIR)/tinyxml.Plo \
    63 @AMDEP_TRUE@    ./$(DEPDIR)/tinyxmlerror.Plo \
    64 @AMDEP_TRUE@    ./$(DEPDIR)/tinyxmlparser.Plo
     62@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/tinystr.Po ./$(DEPDIR)/tinyxml.Po \
     63@AMDEP_TRUE@    ./$(DEPDIR)/tinyxmlerror.Po \
     64@AMDEP_TRUE@    ./$(DEPDIR)/tinyxmlparser.Po
    6565CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
    6666        $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
    67 LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
    68         $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
    69         $(AM_CXXFLAGS) $(CXXFLAGS)
    7067CXXLD = $(CXX)
    71 CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
    72         $(AM_LDFLAGS) $(LDFLAGS) -o $@
    73 SOURCES = $(libtinyxml_la_SOURCES)
    74 DIST_SOURCES = $(libtinyxml_la_SOURCES)
     68CXXLINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) \
     69        -o $@
     70SOURCES = $(libtinyxml_a_SOURCES)
     71DIST_SOURCES = $(libtinyxml_a_SOURCES)
    7572HEADERS = $(noinst_HEADERS)
    7673ETAGS = etags
    … …  
    8178AMDEP_TRUE = @AMDEP_TRUE@
    8279AMTAR = @AMTAR@
    83 AR = @AR@
    8480AUTOCONF = @AUTOCONF@
    8581AUTOHEADER = @AUTOHEADER@
    … …  
    9490CURL_LIBS = @CURL_LIBS@
    9591CXX = @CXX@
    96 CXXCPP = @CXXCPP@
    9792CXXDEPMODE = @CXXDEPMODE@
    9893CXXFLAGS = @CXXFLAGS@
    … …  
    106101DOXYGEN_FALSE = @DOXYGEN_FALSE@
    107102DOXYGEN_TRUE = @DOXYGEN_TRUE@
    108 ECHO = @ECHO@
    109103ECHO_C = @ECHO_C@
    110104ECHO_N = @ECHO_N@
    … …  
    112106EGREP = @EGREP@
    113107EXEEXT = @EXEEXT@
    114 F77 = @F77@
    115 FFLAGS = @FFLAGS@
    116108GPROF = @GPROF@
    117109GTK2_CFLAGS = @GTK2_CFLAGS@
    … …  
    128120LIBOBJS = @LIBOBJS@
    129121LIBS = @LIBS@
    130 LIBTOOL = @LIBTOOL@
    131 LN_S = @LN_S@
    132122LTLIBOBJS = @LTLIBOBJS@
    133123MAKEINFO = @MAKEINFO@
    … …  
    149139SUB_PROJECTS_TRUE = @SUB_PROJECTS_TRUE@
    150140VERSION = @VERSION@
    151 ac_ct_AR = @ac_ct_AR@
    152141ac_ct_CC = @ac_ct_CC@
    153142ac_ct_CXX = @ac_ct_CXX@
    154 ac_ct_F77 = @ac_ct_F77@
    155143ac_ct_RANLIB = @ac_ct_RANLIB@
    156144ac_ct_STRIP = @ac_ct_STRIP@
    … …  
    194182target_os = @target_os@
    195183target_vendor = @target_vendor@
    196 pkglib_LTLIBRARIES = libtinyxml.la
    197 libtinyxml_la_SOURCES = tinyxml.cc \
     184noinst_LIBRARIES = libtinyxml.a
     185libtinyxml_a_SOURCES = tinyxml.cc \
    198186                       tinystr.cc \
    199187                       tinyxmlerror.cc \
    … …  
    206194
    207195.SUFFIXES:
    208 .SUFFIXES: .cc .lo .o .obj
     196.SUFFIXES: .cc .o .obj
    209197$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
    210198        @for dep in $?; do \
    … …  
    216204          esac; \
    217205        done; \
    218         echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/lib/tinyxml/Makefile'; \
     206        echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/lib/tinyxml/Makefile'; \
    219207        cd $(top_srcdir) && \
    220           $(AUTOMAKE) --foreign  src/lib/tinyxml/Makefile
     208          $(AUTOMAKE) --gnu  src/lib/tinyxml/Makefile
    221209.PRECIOUS: Makefile
    222210Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
    … …  
    236224$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
    237225        cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
    238 install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES)
    239         @$(NORMAL_INSTALL)
    240         test -z "$(pkglibdir)" || $(mkdir_p) "$(DESTDIR)$(pkglibdir)"
    241         @list='$(pkglib_LTLIBRARIES)'; for p in $$list; do \
    242           if test -f $$p; then \
    243             f="`echo $$p | sed -e 's|^.*/||'`"; \
    244             echo " $(LIBTOOL) --mode=install $(pkglibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(pkglibdir)/$$f'"; \
    245             $(LIBTOOL) --mode=install $(pkglibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(pkglibdir)/$$f"; \
    246           else :; fi; \
    247         done
    248 
    249 uninstall-pkglibLTLIBRARIES:
    250         @$(NORMAL_UNINSTALL)
    251         @list='$(pkglib_LTLIBRARIES)'; for p in $$list; do \
    252             p="`echo $$p | sed -e 's|^.*/||'`"; \
    253           echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(pkglibdir)/$$p'"; \
    254           $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(pkglibdir)/$$p"; \
    255         done
    256 
    257 clean-pkglibLTLIBRARIES:
    258         -test -z "$(pkglib_LTLIBRARIES)" || rm -f $(pkglib_LTLIBRARIES)
    259         @list='$(pkglib_LTLIBRARIES)'; for p in $$list; do \
    260           dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
    261           test "$$dir" != "$$p" || dir=.; \
    262           echo "rm -f \"$${dir}/so_locations\""; \
    263           rm -f "$${dir}/so_locations"; \
    264         done
    265 libtinyxml.la: $(libtinyxml_la_OBJECTS) $(libtinyxml_la_DEPENDENCIES)
    266         $(CXXLINK) -rpath $(pkglibdir) $(libtinyxml_la_LDFLAGS) $(libtinyxml_la_OBJECTS) $(libtinyxml_la_LIBADD) $(LIBS)
     226
     227clean-noinstLIBRARIES:
     228        -test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES)
     229libtinyxml.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
    267233
    268234mostlyclean-compile:
    … …  
    272238        -rm -f *.tab.c
    273239
    274 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tinystr.Plo@am__quote@
    275 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tinyxml.Plo@am__quote@
    276 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tinyxmlerror.Plo@am__quote@
    277 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tinyxmlparser.Plo@am__quote@
     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@
    278244
    279245.cc.o:
    … …  
    292258@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    293259@am__fastdepCXX_FALSE@  $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
    294 
    295 .cc.lo:
    296 @am__fastdepCXX_TRUE@   if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
    297 @am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
    298 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
    299 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
    300 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    301 @am__fastdepCXX_FALSE@  $(LTCXXCOMPILE) -c -o $@ $<
    302 
    303 mostlyclean-libtool:
    304         -rm -f *.lo
    305 
    306 clean-libtool:
    307         -rm -rf .libs _libs
    308 
    309 distclean-libtool:
    310         -rm -f libtool
    311260uninstall-info-am:
    312261
    … …  
    388337check-am: all-am
    389338check: check-am
    390 all-am: Makefile $(LTLIBRARIES) $(HEADERS)
     339all-am: Makefile $(LIBRARIES) $(HEADERS)
    391340installdirs:
    392         for dir in "$(DESTDIR)$(pkglibdir)"; do \
    393           test -z "$$dir" || $(mkdir_p) "$$dir"; \
    394         done
    395341install: install-am
    396342install-exec: install-exec-am
    … …  
    419365clean: clean-am
    420366
    421 clean-am: clean-generic clean-libtool clean-pkglibLTLIBRARIES \
    422         mostlyclean-am
     367clean-am: clean-generic clean-noinstLIBRARIES mostlyclean-am
    423368
    424369distclean: distclean-am
    … …  
    426371        -rm -f Makefile
    427372distclean-am: clean-am distclean-compile distclean-generic \
    428         distclean-libtool distclean-tags
     373        distclean-tags
    429374
    430375dvi: dvi-am
    … …  
    440385install-data-am:
    441386
    442 install-exec-am: install-pkglibLTLIBRARIES
     387install-exec-am:
    443388
    444389install-info: install-info-am
    … …  
    455400mostlyclean: mostlyclean-am
    456401
    457 mostlyclean-am: mostlyclean-compile mostlyclean-generic \
    458         mostlyclean-libtool
     402mostlyclean-am: mostlyclean-compile mostlyclean-generic
    459403
    460404pdf: pdf-am
    … …  
    466410ps-am:
    467411
    468 uninstall-am: uninstall-info-am uninstall-pkglibLTLIBRARIES
     412uninstall-am: uninstall-info-am
    469413
    470414.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
    471         clean-libtool clean-pkglibLTLIBRARIES ctags distclean \
    472         distclean-compile distclean-generic distclean-libtool \
    473         distclean-tags distdir dvi dvi-am html html-am info info-am \
    474         install install-am install-data install-data-am install-exec \
    475         install-exec-am install-info install-info-am install-man \
    476         install-pkglibLTLIBRARIES install-strip installcheck \
     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 \
    477420        installcheck-am installdirs maintainer-clean \
    478421        maintainer-clean-generic mostlyclean mostlyclean-compile \
    479         mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
    480         tags uninstall uninstall-am uninstall-info-am \
    481         uninstall-pkglibLTLIBRARIES
     422        mostlyclean-generic pdf pdf-am ps ps-am tags uninstall \
     423        uninstall-am uninstall-info-am
    482424
    483425# Tell versions [3.59,3.63) of GNU make to not export all variables.
Note: See TracChangeset for help on using the changeset viewer.