Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

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


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

orxonox/trunk: removed LIBTOOL again

Location:
trunk/src/lib/graphics/importer
Files:
2 edited

Legend:

Unmodified
Added
Removed

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

    r5452 r5463  
    22include $(MAINSRCDIR)/defs/include_paths.am
    33
    4 pkglib_LTLIBRARIES = libORXimporter.la
     4noinst_LIBRARIES = libORXimporter.a
    55
    6 libORXimporter_la_SOURCES = model.cc \
    7                             objModel.cc \
    8                             primitive_model.cc \
    9                             md2Model.cc \
    10                             material.cc \
    11                             texture.cc
     6libORXimporter_a_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

    r5452 r5463  
    1616
    1717
    18 SOURCES = $(libORXimporter_la_SOURCES)
     18SOURCES = $(libORXimporter_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 libORXimporter_la_LIBADD =
    55 am_libORXimporter_la_OBJECTS = model.lo objModel.lo primitive_model.lo \
    56         md2Model.lo material.lo texture.lo
    57 libORXimporter_la_OBJECTS = $(am_libORXimporter_la_OBJECTS)
     51LIBRARIES = $(noinst_LIBRARIES)
     52AR = ar
     53ARFLAGS = cru
     54libORXimporter_a_AR = $(AR) $(ARFLAGS)
     55libORXimporter_a_LIBADD =
     56am_libORXimporter_a_OBJECTS = model.$(OBJEXT) objModel.$(OBJEXT) \
     57        primitive_model.$(OBJEXT) md2Model.$(OBJEXT) \
     58        material.$(OBJEXT) texture.$(OBJEXT)
     59libORXimporter_a_OBJECTS = $(am_libORXimporter_a_OBJECTS)
    5860DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
    5961depcomp = $(SHELL) $(top_srcdir)/depcomp
    6062am__depfiles_maybe = depfiles
    61 @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/material.Plo \
    62 @AMDEP_TRUE@    ./$(DEPDIR)/md2Model.Plo ./$(DEPDIR)/model.Plo \
    63 @AMDEP_TRUE@    ./$(DEPDIR)/objModel.Plo \
    64 @AMDEP_TRUE@    ./$(DEPDIR)/primitive_model.Plo \
    65 @AMDEP_TRUE@    ./$(DEPDIR)/texture.Plo
     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
    6668CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
    6769        $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
    68 LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
    69         $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
    70         $(AM_CXXFLAGS) $(CXXFLAGS)
    7170CXXLD = $(CXX)
    72 CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
    73         $(AM_LDFLAGS) $(LDFLAGS) -o $@
    74 SOURCES = $(libORXimporter_la_SOURCES)
    75 DIST_SOURCES = $(libORXimporter_la_SOURCES)
     71CXXLINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) \
     72        -o $@
     73SOURCES = $(libORXimporter_a_SOURCES)
     74DIST_SOURCES = $(libORXimporter_a_SOURCES)
    7675HEADERS = $(noinst_HEADERS)
    7776ETAGS = etags
    … …  
    8281AMDEP_TRUE = @AMDEP_TRUE@
    8382AMTAR = @AMTAR@
    84 AR = @AR@
    8583AUTOCONF = @AUTOCONF@
    8684AUTOHEADER = @AUTOHEADER@
    … …  
    9593CURL_LIBS = @CURL_LIBS@
    9694CXX = @CXX@
    97 CXXCPP = @CXXCPP@
    9895CXXDEPMODE = @CXXDEPMODE@
    9996CXXFLAGS = @CXXFLAGS@
    … …  
    107104DOXYGEN_FALSE = @DOXYGEN_FALSE@
    108105DOXYGEN_TRUE = @DOXYGEN_TRUE@
    109 ECHO = @ECHO@
    110106ECHO_C = @ECHO_C@
    111107ECHO_N = @ECHO_N@
    … …  
    113109EGREP = @EGREP@
    114110EXEEXT = @EXEEXT@
    115 F77 = @F77@
    116 FFLAGS = @FFLAGS@
    117111GPROF = @GPROF@
    118112GTK2_CFLAGS = @GTK2_CFLAGS@
    … …  
    129123LIBOBJS = @LIBOBJS@
    130124LIBS = @LIBS@
    131 LIBTOOL = @LIBTOOL@
    132 LN_S = @LN_S@
    133125LTLIBOBJS = @LTLIBOBJS@
    134126MAKEINFO = @MAKEINFO@
    … …  
    150142SUB_PROJECTS_TRUE = @SUB_PROJECTS_TRUE@
    151143VERSION = @VERSION@
    152 ac_ct_AR = @ac_ct_AR@
    153144ac_ct_CC = @ac_ct_CC@
    154145ac_ct_CXX = @ac_ct_CXX@
    155 ac_ct_F77 = @ac_ct_F77@
    156146ac_ct_RANLIB = @ac_ct_RANLIB@
    157147ac_ct_STRIP = @ac_ct_STRIP@
    … …  
    196186target_vendor = @target_vendor@
    197187MAINSRCDIR = ../../..
    198 pkglib_LTLIBRARIES = libORXimporter.la
    199 libORXimporter_la_SOURCES = model.cc \
    200                             objModel.cc \
    201                             primitive_model.cc \
    202                             md2Model.cc \
    203                             material.cc \
    204                             texture.cc
     188noinst_LIBRARIES = libORXimporter.a
     189libORXimporter_a_SOURCES = model.cc \
     190                           objModel.cc \
     191                           primitive_model.cc \
     192                           md2Model.cc \
     193                           material.cc \
     194                           texture.cc
    205195
    206196noinst_HEADERS = abstract_model.h \
    … …  
    217207
    218208.SUFFIXES:
    219 .SUFFIXES: .cc .lo .o .obj
     209.SUFFIXES: .cc .o .obj
    220210$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
    221211        @for dep in $?; do \
    … …  
    227217          esac; \
    228218        done; \
    229         echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/lib/graphics/importer/Makefile'; \
     219        echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/lib/graphics/importer/Makefile'; \
    230220        cd $(top_srcdir) && \
    231           $(AUTOMAKE) --foreign  src/lib/graphics/importer/Makefile
     221          $(AUTOMAKE) --gnu  src/lib/graphics/importer/Makefile
    232222.PRECIOUS: Makefile
    233223Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
    … …  
    247237$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
    248238        cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
    249 install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES)
    250         @$(NORMAL_INSTALL)
    251         test -z "$(pkglibdir)" || $(mkdir_p) "$(DESTDIR)$(pkglibdir)"
    252         @list='$(pkglib_LTLIBRARIES)'; for p in $$list; do \
    253           if test -f $$p; then \
    254             f="`echo $$p | sed -e 's|^.*/||'`"; \
    255             echo " $(LIBTOOL) --mode=install $(pkglibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(pkglibdir)/$$f'"; \
    256             $(LIBTOOL) --mode=install $(pkglibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(pkglibdir)/$$f"; \
    257           else :; fi; \
    258         done
    259 
    260 uninstall-pkglibLTLIBRARIES:
    261         @$(NORMAL_UNINSTALL)
    262         @list='$(pkglib_LTLIBRARIES)'; for p in $$list; do \
    263             p="`echo $$p | sed -e 's|^.*/||'`"; \
    264           echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(pkglibdir)/$$p'"; \
    265           $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(pkglibdir)/$$p"; \
    266         done
    267 
    268 clean-pkglibLTLIBRARIES:
    269         -test -z "$(pkglib_LTLIBRARIES)" || rm -f $(pkglib_LTLIBRARIES)
    270         @list='$(pkglib_LTLIBRARIES)'; for p in $$list; do \
    271           dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
    272           test "$$dir" != "$$p" || dir=.; \
    273           echo "rm -f \"$${dir}/so_locations\""; \
    274           rm -f "$${dir}/so_locations"; \
    275         done
    276 libORXimporter.la: $(libORXimporter_la_OBJECTS) $(libORXimporter_la_DEPENDENCIES)
    277         $(CXXLINK) -rpath $(pkglibdir) $(libORXimporter_la_LDFLAGS) $(libORXimporter_la_OBJECTS) $(libORXimporter_la_LIBADD) $(LIBS)
     239
     240clean-noinstLIBRARIES:
     241        -test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES)
     242libORXimporter.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
    278246
    279247mostlyclean-compile:
    … …  
    283251        -rm -f *.tab.c
    284252
    285 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/material.Plo@am__quote@
    286 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/md2Model.Plo@am__quote@
    287 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/model.Plo@am__quote@
    288 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/objModel.Plo@am__quote@
    289 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/primitive_model.Plo@am__quote@
    290 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/texture.Plo@am__quote@
     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@
    291259
    292260.cc.o:
    … …  
    305273@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    306274@am__fastdepCXX_FALSE@  $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
    307 
    308 .cc.lo:
    309 @am__fastdepCXX_TRUE@   if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
    310 @am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
    311 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
    312 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
    313 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    314 @am__fastdepCXX_FALSE@  $(LTCXXCOMPILE) -c -o $@ $<
    315 
    316 mostlyclean-libtool:
    317         -rm -f *.lo
    318 
    319 clean-libtool:
    320         -rm -rf .libs _libs
    321 
    322 distclean-libtool:
    323         -rm -f libtool
    324275uninstall-info-am:
    325276
    … …  
    401352check-am: all-am
    402353check: check-am
    403 all-am: Makefile $(LTLIBRARIES) $(HEADERS)
     354all-am: Makefile $(LIBRARIES) $(HEADERS)
    404355installdirs:
    405         for dir in "$(DESTDIR)$(pkglibdir)"; do \
    406           test -z "$$dir" || $(mkdir_p) "$$dir"; \
    407         done
    408356install: install-am
    409357install-exec: install-exec-am
    … …  
    432380clean: clean-am
    433381
    434 clean-am: clean-generic clean-libtool clean-pkglibLTLIBRARIES \
    435         mostlyclean-am
     382clean-am: clean-generic clean-noinstLIBRARIES mostlyclean-am
    436383
    437384distclean: distclean-am
    … …  
    439386        -rm -f Makefile
    440387distclean-am: clean-am distclean-compile distclean-generic \
    441         distclean-libtool distclean-tags
     388        distclean-tags
    442389
    443390dvi: dvi-am
    … …  
    453400install-data-am:
    454401
    455 install-exec-am: install-pkglibLTLIBRARIES
     402install-exec-am:
    456403
    457404install-info: install-info-am
    … …  
    468415mostlyclean: mostlyclean-am
    469416
    470 mostlyclean-am: mostlyclean-compile mostlyclean-generic \
    471         mostlyclean-libtool
     417mostlyclean-am: mostlyclean-compile mostlyclean-generic
    472418
    473419pdf: pdf-am
    … …  
    479425ps-am:
    480426
    481 uninstall-am: uninstall-info-am uninstall-pkglibLTLIBRARIES
     427uninstall-am: uninstall-info-am
    482428
    483429.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
    484         clean-libtool clean-pkglibLTLIBRARIES ctags distclean \
    485         distclean-compile distclean-generic distclean-libtool \
    486         distclean-tags distdir dvi dvi-am html html-am info info-am \
    487         install install-am install-data install-data-am install-exec \
    488         install-exec-am install-info install-info-am install-man \
    489         install-pkglibLTLIBRARIES install-strip installcheck \
     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 \
    490435        installcheck-am installdirs maintainer-clean \
    491436        maintainer-clean-generic mostlyclean mostlyclean-compile \
    492         mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
    493         tags uninstall uninstall-am uninstall-info-am \
    494         uninstall-pkglibLTLIBRARIES
     437        mostlyclean-generic pdf pdf-am ps ps-am tags uninstall \
     438        uninstall-am uninstall-info-am
    495439
    496440include $(MAINSRCDIR)/defs/include_paths.am
Note: See TracChangeset for help on using the changeset viewer.