Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 5450 in orxonox.OLD for trunk/src/lib/graphics/importer


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

Legend:

Unmodified
Added
Removed

  • trunk/src/lib/graphics/importer/Makefile.am

    r5413 r5450  
    22include $(MAINSRCDIR)/defs/include_paths.am
    33
    4 noinst_LIBRARIES = libORXimporter.a
     4noinst_LTLIBRARIES = libORXimporter.la
    55
    6 libORXimporter_a_SOURCES = model.cc \
    7                            objModel.cc \
    8                            primitive_model.cc \
    9                            md2Model.cc \
    10                            material.cc \
    11                            texture.cc
     6libORXimporter_la_SOURCES = model.cc \
     7                            objModel.cc \
     8                            primitive_model.cc \
     9                            md2Model.cc \
     10                            material.cc \
     11                            texture.cc
    1212
    1313

  • trunk/src/lib/graphics/importer/Makefile.in

    r5413 r5450  
    1616
    1717
    18 SOURCES = $(libORXimporter_a_SOURCES)
     18SOURCES = $(libORXimporter_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 libORXimporter_a_AR = $(AR) $(ARFLAGS)
    55 libORXimporter_a_LIBADD =
    56 am_libORXimporter_a_OBJECTS = model.$(OBJEXT) objModel.$(OBJEXT) \
    57         primitive_model.$(OBJEXT) md2Model.$(OBJEXT) \
    58         material.$(OBJEXT) texture.$(OBJEXT)
    59 libORXimporter_a_OBJECTS = $(am_libORXimporter_a_OBJECTS)
     51LTLIBRARIES = $(noinst_LTLIBRARIES)
     52libORXimporter_la_LIBADD =
     53am_libORXimporter_la_OBJECTS = model.lo objModel.lo primitive_model.lo \
     54        md2Model.lo material.lo texture.lo
     55libORXimporter_la_OBJECTS = $(am_libORXimporter_la_OBJECTS)
    6056DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
    6157depcomp = $(SHELL) $(top_srcdir)/depcomp
    6258am__depfiles_maybe = depfiles
    63 @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/material.Po \
    64 @AMDEP_TRUE@    ./$(DEPDIR)/md2Model.Po ./$(DEPDIR)/model.Po \
    65 @AMDEP_TRUE@    ./$(DEPDIR)/objModel.Po \
    66 @AMDEP_TRUE@    ./$(DEPDIR)/primitive_model.Po \
    67 @AMDEP_TRUE@    ./$(DEPDIR)/texture.Po
     59@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/material.Plo \
     60@AMDEP_TRUE@    ./$(DEPDIR)/md2Model.Plo ./$(DEPDIR)/model.Plo \
     61@AMDEP_TRUE@    ./$(DEPDIR)/objModel.Plo \
     62@AMDEP_TRUE@    ./$(DEPDIR)/primitive_model.Plo \
     63@AMDEP_TRUE@    ./$(DEPDIR)/texture.Plo
    6864CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
    6965        $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
     66LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
     67        $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
     68        $(AM_CXXFLAGS) $(CXXFLAGS)
    7069CXXLD = $(CXX)
    71 CXXLINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) \
    72         -o $@
    73 SOURCES = $(libORXimporter_a_SOURCES)
    74 DIST_SOURCES = $(libORXimporter_a_SOURCES)
     70CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
     71        $(AM_LDFLAGS) $(LDFLAGS) -o $@
     72SOURCES = $(libORXimporter_la_SOURCES)
     73DIST_SOURCES = $(libORXimporter_la_SOURCES)
    7574HEADERS = $(noinst_HEADERS)
    7675ETAGS = etags
    … …  
    8180AMDEP_TRUE = @AMDEP_TRUE@
    8281AMTAR = @AMTAR@
     82AR = @AR@
    8383AUTOCONF = @AUTOCONF@
    8484AUTOHEADER = @AUTOHEADER@
    … …  
    9393CURL_LIBS = @CURL_LIBS@
    9494CXX = @CXX@
     95CXXCPP = @CXXCPP@
    9596CXXDEPMODE = @CXXDEPMODE@
    9697CXXFLAGS = @CXXFLAGS@
    … …  
    104105DOXYGEN_FALSE = @DOXYGEN_FALSE@
    105106DOXYGEN_TRUE = @DOXYGEN_TRUE@
     107ECHO = @ECHO@
    106108ECHO_C = @ECHO_C@
    107109ECHO_N = @ECHO_N@
    … …  
    109111EGREP = @EGREP@
    110112EXEEXT = @EXEEXT@
     113F77 = @F77@
     114FFLAGS = @FFLAGS@
    111115GPROF = @GPROF@
    112116GTK2_CFLAGS = @GTK2_CFLAGS@
    … …  
    123127LIBOBJS = @LIBOBJS@
    124128LIBS = @LIBS@
     129LIBTOOL = @LIBTOOL@
     130LN_S = @LN_S@
    125131LTLIBOBJS = @LTLIBOBJS@
    126132MAKEINFO = @MAKEINFO@
    … …  
    142148SUB_PROJECTS_TRUE = @SUB_PROJECTS_TRUE@
    143149VERSION = @VERSION@
     150ac_ct_AR = @ac_ct_AR@
    144151ac_ct_CC = @ac_ct_CC@
    145152ac_ct_CXX = @ac_ct_CXX@
     153ac_ct_F77 = @ac_ct_F77@
    146154ac_ct_RANLIB = @ac_ct_RANLIB@
    147155ac_ct_STRIP = @ac_ct_STRIP@
    … …  
    186194target_vendor = @target_vendor@
    187195MAINSRCDIR = ../../..
    188 noinst_LIBRARIES = libORXimporter.a
    189 libORXimporter_a_SOURCES = model.cc \
    190                            objModel.cc \
    191                            primitive_model.cc \
    192                            md2Model.cc \
    193                            material.cc \
    194                            texture.cc
     196noinst_LTLIBRARIES = libORXimporter.la
     197libORXimporter_la_SOURCES = model.cc \
     198                            objModel.cc \
     199                            primitive_model.cc \
     200                            md2Model.cc \
     201                            material.cc \
     202                            texture.cc
    195203
    196204noinst_HEADERS = abstract_model.h \
    … …  
    207215
    208216.SUFFIXES:
    209 .SUFFIXES: .cc .o .obj
     217.SUFFIXES: .cc .lo .o .obj
    210218$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
    211219        @for dep in $?; do \
    … …  
    238246        cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
    239247
    240 clean-noinstLIBRARIES:
    241         -test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES)
    242 libORXimporter.a: $(libORXimporter_a_OBJECTS) $(libORXimporter_a_DEPENDENCIES)
    243         -rm -f libORXimporter.a
    244         $(libORXimporter_a_AR) libORXimporter.a $(libORXimporter_a_OBJECTS) $(libORXimporter_a_LIBADD)
    245         $(RANLIB) libORXimporter.a
     248clean-noinstLTLIBRARIES:
     249        -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
     250        @list='$(noinst_LTLIBRARIES)'; for p in $$list; do \
     251          dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
     252          test "$$dir" != "$$p" || dir=.; \
     253          echo "rm -f \"$${dir}/so_locations\""; \
     254          rm -f "$${dir}/so_locations"; \
     255        done
     256libORXimporter.la: $(libORXimporter_la_OBJECTS) $(libORXimporter_la_DEPENDENCIES)
     257        $(CXXLINK)  $(libORXimporter_la_LDFLAGS) $(libORXimporter_la_OBJECTS) $(libORXimporter_la_LIBADD) $(LIBS)
    246258
    247259mostlyclean-compile:
    … …  
    251263        -rm -f *.tab.c
    252264
    253 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/material.Po@am__quote@
    254 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/md2Model.Po@am__quote@
    255 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/model.Po@am__quote@
    256 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/objModel.Po@am__quote@
    257 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/primitive_model.Po@am__quote@
    258 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/texture.Po@am__quote@
     265@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/material.Plo@am__quote@
     266@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/md2Model.Plo@am__quote@
     267@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/model.Plo@am__quote@
     268@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/objModel.Plo@am__quote@
     269@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/primitive_model.Plo@am__quote@
     270@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/texture.Plo@am__quote@
    259271
    260272.cc.o:
    … …  
    273285@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    274286@am__fastdepCXX_FALSE@  $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
     287
     288.cc.lo:
     289@am__fastdepCXX_TRUE@   if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
     290@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
     291@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
     292@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
     293@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     294@am__fastdepCXX_FALSE@  $(LTCXXCOMPILE) -c -o $@ $<
     295
     296mostlyclean-libtool:
     297        -rm -f *.lo
     298
     299clean-libtool:
     300        -rm -rf .libs _libs
     301
     302distclean-libtool:
     303        -rm -f libtool
    275304uninstall-info-am:
    276305
    … …  
    352381check-am: all-am
    353382check: check-am
    354 all-am: Makefile $(LIBRARIES) $(HEADERS)
     383all-am: Makefile $(LTLIBRARIES) $(HEADERS)
    355384installdirs:
    356385install: install-am
    … …  
    380409clean: clean-am
    381410
    382 clean-am: clean-generic clean-noinstLIBRARIES mostlyclean-am
     411clean-am: clean-generic clean-libtool clean-noinstLTLIBRARIES \
     412        mostlyclean-am
    383413
    384414distclean: distclean-am
    … …  
    386416        -rm -f Makefile
    387417distclean-am: clean-am distclean-compile distclean-generic \
    388         distclean-tags
     418        distclean-libtool distclean-tags
    389419
    390420dvi: dvi-am
    … …  
    415445mostlyclean: mostlyclean-am
    416446
    417 mostlyclean-am: mostlyclean-compile mostlyclean-generic
     447mostlyclean-am: mostlyclean-compile mostlyclean-generic \
     448        mostlyclean-libtool
    418449
    419450pdf: pdf-am
    … …  
    428459
    429460.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
    430         clean-noinstLIBRARIES ctags distclean distclean-compile \
    431         distclean-generic distclean-tags distdir dvi dvi-am html \
    432         html-am info info-am install install-am install-data \
    433         install-data-am install-exec install-exec-am install-info \
    434         install-info-am install-man install-strip installcheck \
    435         installcheck-am installdirs maintainer-clean \
    436         maintainer-clean-generic mostlyclean mostlyclean-compile \
    437         mostlyclean-generic pdf pdf-am ps ps-am tags uninstall \
    438         uninstall-am uninstall-info-am
     461        clean-libtool clean-noinstLTLIBRARIES ctags distclean \
     462        distclean-compile distclean-generic distclean-libtool \
     463        distclean-tags distdir dvi dvi-am html html-am info info-am \
     464        install install-am install-data install-data-am install-exec \
     465        install-exec-am install-info install-info-am install-man \
     466        install-strip installcheck installcheck-am installdirs \
     467        maintainer-clean maintainer-clean-generic mostlyclean \
     468        mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
     469        pdf pdf-am ps ps-am tags uninstall uninstall-am \
     470        uninstall-info-am
    439471
    440472include $(MAINSRCDIR)/defs/include_paths.am
Note: See TracChangeset for help on using the changeset viewer.