Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

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


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

orxonox/trunk: removed LIBTOOL again

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

Legend:

Unmodified
Added
Removed

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

    r5452 r5463  
    22include $(MAINSRCDIR)/defs/include_paths.am
    33
    4 pkglib_LTLIBRARIES = libORXshell.la
     4noinst_LIBRARIES = libORXshell.a
    55
    6 libORXshell_la_SOURCES = shell.cc \
    7                          shell_buffer.cc \
    8                          shell_input.cc \
    9                          shell_command.cc \
    10                          shell_completion.cc
     6libORXshell_a_SOURCES = shell.cc \
     7                        shell_buffer.cc \
     8                        shell_input.cc \
     9                        shell_command.cc \
     10                        shell_completion.cc
    1111
    1212

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

    r5452 r5463  
    1616
    1717
    18 SOURCES = $(libORXshell_la_SOURCES)
     18SOURCES = $(libORXshell_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 libORXshell_la_LIBADD =
    55 am_libORXshell_la_OBJECTS = shell.lo shell_buffer.lo shell_input.lo \
    56         shell_command.lo shell_completion.lo
    57 libORXshell_la_OBJECTS = $(am_libORXshell_la_OBJECTS)
     51LIBRARIES = $(noinst_LIBRARIES)
     52AR = ar
     53ARFLAGS = cru
     54libORXshell_a_AR = $(AR) $(ARFLAGS)
     55libORXshell_a_LIBADD =
     56am_libORXshell_a_OBJECTS = shell.$(OBJEXT) shell_buffer.$(OBJEXT) \
     57        shell_input.$(OBJEXT) shell_command.$(OBJEXT) \
     58        shell_completion.$(OBJEXT)
     59libORXshell_a_OBJECTS = $(am_libORXshell_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)/shell.Plo \
    62 @AMDEP_TRUE@    ./$(DEPDIR)/shell_buffer.Plo \
    63 @AMDEP_TRUE@    ./$(DEPDIR)/shell_command.Plo \
    64 @AMDEP_TRUE@    ./$(DEPDIR)/shell_completion.Plo \
    65 @AMDEP_TRUE@    ./$(DEPDIR)/shell_input.Plo
     63@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/shell.Po \
     64@AMDEP_TRUE@    ./$(DEPDIR)/shell_buffer.Po \
     65@AMDEP_TRUE@    ./$(DEPDIR)/shell_command.Po \
     66@AMDEP_TRUE@    ./$(DEPDIR)/shell_completion.Po \
     67@AMDEP_TRUE@    ./$(DEPDIR)/shell_input.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 = $(libORXshell_la_SOURCES)
    75 DIST_SOURCES = $(libORXshell_la_SOURCES)
     71CXXLINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) \
     72        -o $@
     73SOURCES = $(libORXshell_a_SOURCES)
     74DIST_SOURCES = $(libORXshell_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 = libORXshell.la
    199 libORXshell_la_SOURCES = shell.cc \
    200                          shell_buffer.cc \
    201                          shell_input.cc \
    202                          shell_command.cc \
    203                          shell_completion.cc
     188noinst_LIBRARIES = libORXshell.a
     189libORXshell_a_SOURCES = shell.cc \
     190                        shell_buffer.cc \
     191                        shell_input.cc \
     192                        shell_command.cc \
     193                        shell_completion.cc
    204194
    205195noinst_HEADERS = shell.h \
    … …  
    212202
    213203.SUFFIXES:
    214 .SUFFIXES: .cc .lo .o .obj
     204.SUFFIXES: .cc .o .obj
    215205$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
    216206        @for dep in $?; do \
    … …  
    222212          esac; \
    223213        done; \
    224         echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/lib/shell/Makefile'; \
     214        echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/lib/shell/Makefile'; \
    225215        cd $(top_srcdir) && \
    226           $(AUTOMAKE) --foreign  src/lib/shell/Makefile
     216          $(AUTOMAKE) --gnu  src/lib/shell/Makefile
    227217.PRECIOUS: Makefile
    228218Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
    … …  
    242232$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
    243233        cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
    244 install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES)
    245         @$(NORMAL_INSTALL)
    246         test -z "$(pkglibdir)" || $(mkdir_p) "$(DESTDIR)$(pkglibdir)"
    247         @list='$(pkglib_LTLIBRARIES)'; for p in $$list; do \
    248           if test -f $$p; then \
    249             f="`echo $$p | sed -e 's|^.*/||'`"; \
    250             echo " $(LIBTOOL) --mode=install $(pkglibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(pkglibdir)/$$f'"; \
    251             $(LIBTOOL) --mode=install $(pkglibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(pkglibdir)/$$f"; \
    252           else :; fi; \
    253         done
    254 
    255 uninstall-pkglibLTLIBRARIES:
    256         @$(NORMAL_UNINSTALL)
    257         @list='$(pkglib_LTLIBRARIES)'; for p in $$list; do \
    258             p="`echo $$p | sed -e 's|^.*/||'`"; \
    259           echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(pkglibdir)/$$p'"; \
    260           $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(pkglibdir)/$$p"; \
    261         done
    262 
    263 clean-pkglibLTLIBRARIES:
    264         -test -z "$(pkglib_LTLIBRARIES)" || rm -f $(pkglib_LTLIBRARIES)
    265         @list='$(pkglib_LTLIBRARIES)'; for p in $$list; do \
    266           dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
    267           test "$$dir" != "$$p" || dir=.; \
    268           echo "rm -f \"$${dir}/so_locations\""; \
    269           rm -f "$${dir}/so_locations"; \
    270         done
    271 libORXshell.la: $(libORXshell_la_OBJECTS) $(libORXshell_la_DEPENDENCIES)
    272         $(CXXLINK) -rpath $(pkglibdir) $(libORXshell_la_LDFLAGS) $(libORXshell_la_OBJECTS) $(libORXshell_la_LIBADD) $(LIBS)
     234
     235clean-noinstLIBRARIES:
     236        -test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES)
     237libORXshell.a: $(libORXshell_a_OBJECTS) $(libORXshell_a_DEPENDENCIES)
     238        -rm -f libORXshell.a
     239        $(libORXshell_a_AR) libORXshell.a $(libORXshell_a_OBJECTS) $(libORXshell_a_LIBADD)
     240        $(RANLIB) libORXshell.a
    273241
    274242mostlyclean-compile:
    … …  
    278246        -rm -f *.tab.c
    279247
    280 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/shell.Plo@am__quote@
    281 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/shell_buffer.Plo@am__quote@
    282 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/shell_command.Plo@am__quote@
    283 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/shell_completion.Plo@am__quote@
    284 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/shell_input.Plo@am__quote@
     248@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/shell.Po@am__quote@
     249@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/shell_buffer.Po@am__quote@
     250@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/shell_command.Po@am__quote@
     251@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/shell_completion.Po@am__quote@
     252@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/shell_input.Po@am__quote@
    285253
    286254.cc.o:
    … …  
    299267@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    300268@am__fastdepCXX_FALSE@  $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
    301 
    302 .cc.lo:
    303 @am__fastdepCXX_TRUE@   if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
    304 @am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
    305 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
    306 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
    307 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    308 @am__fastdepCXX_FALSE@  $(LTCXXCOMPILE) -c -o $@ $<
    309 
    310 mostlyclean-libtool:
    311         -rm -f *.lo
    312 
    313 clean-libtool:
    314         -rm -rf .libs _libs
    315 
    316 distclean-libtool:
    317         -rm -f libtool
    318269uninstall-info-am:
    319270
    … …  
    395346check-am: all-am
    396347check: check-am
    397 all-am: Makefile $(LTLIBRARIES) $(HEADERS)
     348all-am: Makefile $(LIBRARIES) $(HEADERS)
    398349installdirs:
    399         for dir in "$(DESTDIR)$(pkglibdir)"; do \
    400           test -z "$$dir" || $(mkdir_p) "$$dir"; \
    401         done
    402350install: install-am
    403351install-exec: install-exec-am
    … …  
    426374clean: clean-am
    427375
    428 clean-am: clean-generic clean-libtool clean-pkglibLTLIBRARIES \
    429         mostlyclean-am
     376clean-am: clean-generic clean-noinstLIBRARIES mostlyclean-am
    430377
    431378distclean: distclean-am
    … …  
    433380        -rm -f Makefile
    434381distclean-am: clean-am distclean-compile distclean-generic \
    435         distclean-libtool distclean-tags
     382        distclean-tags
    436383
    437384dvi: dvi-am
    … …  
    447394install-data-am:
    448395
    449 install-exec-am: install-pkglibLTLIBRARIES
     396install-exec-am:
    450397
    451398install-info: install-info-am
    … …  
    462409mostlyclean: mostlyclean-am
    463410
    464 mostlyclean-am: mostlyclean-compile mostlyclean-generic \
    465         mostlyclean-libtool
     411mostlyclean-am: mostlyclean-compile mostlyclean-generic
    466412
    467413pdf: pdf-am
    … …  
    473419ps-am:
    474420
    475 uninstall-am: uninstall-info-am uninstall-pkglibLTLIBRARIES
     421uninstall-am: uninstall-info-am
    476422
    477423.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
    478         clean-libtool clean-pkglibLTLIBRARIES ctags distclean \
    479         distclean-compile distclean-generic distclean-libtool \
    480         distclean-tags distdir dvi dvi-am html html-am info info-am \
    481         install install-am install-data install-data-am install-exec \
    482         install-exec-am install-info install-info-am install-man \
    483         install-pkglibLTLIBRARIES install-strip installcheck \
     424        clean-noinstLIBRARIES ctags distclean distclean-compile \
     425        distclean-generic distclean-tags distdir dvi dvi-am html \
     426        html-am info info-am install install-am install-data \
     427        install-data-am install-exec install-exec-am install-info \
     428        install-info-am install-man install-strip installcheck \
    484429        installcheck-am installdirs maintainer-clean \
    485430        maintainer-clean-generic mostlyclean mostlyclean-compile \
    486         mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
    487         tags uninstall uninstall-am uninstall-info-am \
    488         uninstall-pkglibLTLIBRARIES
     431        mostlyclean-generic pdf pdf-am ps ps-am tags uninstall \
     432        uninstall-am uninstall-info-am
    489433
    490434include $(MAINSRCDIR)/defs/include_paths.am
Note: See TracChangeset for help on using the changeset viewer.