Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

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


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

Legend:

Unmodified
Added
Removed

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

    r5413 r5450  
    22include $(MAINSRCDIR)/defs/include_paths.am
    33
    4 noinst_LIBRARIES = libORXshell.a
     4noinst_LTLIBRARIES = libORXshell.la
    55
    6 libORXshell_a_SOURCES = shell.cc \
    7                         shell_buffer.cc \
    8                         shell_input.cc \
    9                         shell_command.cc \
    10                         shell_completion.cc
     6libORXshell_la_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

    r5413 r5450  
    1616
    1717
    18 SOURCES = $(libORXshell_a_SOURCES)
     18SOURCES = $(libORXshell_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 libORXshell_a_AR = $(AR) $(ARFLAGS)
    55 libORXshell_a_LIBADD =
    56 am_libORXshell_a_OBJECTS = shell.$(OBJEXT) shell_buffer.$(OBJEXT) \
    57         shell_input.$(OBJEXT) shell_command.$(OBJEXT) \
    58         shell_completion.$(OBJEXT)
    59 libORXshell_a_OBJECTS = $(am_libORXshell_a_OBJECTS)
     51LTLIBRARIES = $(noinst_LTLIBRARIES)
     52libORXshell_la_LIBADD =
     53am_libORXshell_la_OBJECTS = shell.lo shell_buffer.lo shell_input.lo \
     54        shell_command.lo shell_completion.lo
     55libORXshell_la_OBJECTS = $(am_libORXshell_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)/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
     59@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/shell.Plo \
     60@AMDEP_TRUE@    ./$(DEPDIR)/shell_buffer.Plo \
     61@AMDEP_TRUE@    ./$(DEPDIR)/shell_command.Plo \
     62@AMDEP_TRUE@    ./$(DEPDIR)/shell_completion.Plo \
     63@AMDEP_TRUE@    ./$(DEPDIR)/shell_input.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 = $(libORXshell_a_SOURCES)
    74 DIST_SOURCES = $(libORXshell_a_SOURCES)
     70CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
     71        $(AM_LDFLAGS) $(LDFLAGS) -o $@
     72SOURCES = $(libORXshell_la_SOURCES)
     73DIST_SOURCES = $(libORXshell_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 = libORXshell.a
    189 libORXshell_a_SOURCES = shell.cc \
    190                         shell_buffer.cc \
    191                         shell_input.cc \
    192                         shell_command.cc \
    193                         shell_completion.cc
     196noinst_LTLIBRARIES = libORXshell.la
     197libORXshell_la_SOURCES = shell.cc \
     198                         shell_buffer.cc \
     199                         shell_input.cc \
     200                         shell_command.cc \
     201                         shell_completion.cc
    194202
    195203noinst_HEADERS = shell.h \
    … …  
    202210
    203211.SUFFIXES:
    204 .SUFFIXES: .cc .o .obj
     212.SUFFIXES: .cc .lo .o .obj
    205213$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
    206214        @for dep in $?; do \
    … …  
    233241        cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
    234242
    235 clean-noinstLIBRARIES:
    236         -test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES)
    237 libORXshell.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
     243clean-noinstLTLIBRARIES:
     244        -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
     245        @list='$(noinst_LTLIBRARIES)'; for p in $$list; do \
     246          dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
     247          test "$$dir" != "$$p" || dir=.; \
     248          echo "rm -f \"$${dir}/so_locations\""; \
     249          rm -f "$${dir}/so_locations"; \
     250        done
     251libORXshell.la: $(libORXshell_la_OBJECTS) $(libORXshell_la_DEPENDENCIES)
     252        $(CXXLINK)  $(libORXshell_la_LDFLAGS) $(libORXshell_la_OBJECTS) $(libORXshell_la_LIBADD) $(LIBS)
    241253
    242254mostlyclean-compile:
    … …  
    246258        -rm -f *.tab.c
    247259
    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@
     260@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/shell.Plo@am__quote@
     261@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/shell_buffer.Plo@am__quote@
     262@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/shell_command.Plo@am__quote@
     263@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/shell_completion.Plo@am__quote@
     264@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/shell_input.Plo@am__quote@
    253265
    254266.cc.o:
    … …  
    267279@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    268280@am__fastdepCXX_FALSE@  $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
     281
     282.cc.lo:
     283@am__fastdepCXX_TRUE@   if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
     284@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
     285@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
     286@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
     287@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     288@am__fastdepCXX_FALSE@  $(LTCXXCOMPILE) -c -o $@ $<
     289
     290mostlyclean-libtool:
     291        -rm -f *.lo
     292
     293clean-libtool:
     294        -rm -rf .libs _libs
     295
     296distclean-libtool:
     297        -rm -f libtool
    269298uninstall-info-am:
    270299
    … …  
    346375check-am: all-am
    347376check: check-am
    348 all-am: Makefile $(LIBRARIES) $(HEADERS)
     377all-am: Makefile $(LTLIBRARIES) $(HEADERS)
    349378installdirs:
    350379install: install-am
    … …  
    374403clean: clean-am
    375404
    376 clean-am: clean-generic clean-noinstLIBRARIES mostlyclean-am
     405clean-am: clean-generic clean-libtool clean-noinstLTLIBRARIES \
     406        mostlyclean-am
    377407
    378408distclean: distclean-am
    … …  
    380410        -rm -f Makefile
    381411distclean-am: clean-am distclean-compile distclean-generic \
    382         distclean-tags
     412        distclean-libtool distclean-tags
    383413
    384414dvi: dvi-am
    … …  
    409439mostlyclean: mostlyclean-am
    410440
    411 mostlyclean-am: mostlyclean-compile mostlyclean-generic
     441mostlyclean-am: mostlyclean-compile mostlyclean-generic \
     442        mostlyclean-libtool
    412443
    413444pdf: pdf-am
    … …  
    422453
    423454.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
    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 \
    429         installcheck-am installdirs maintainer-clean \
    430         maintainer-clean-generic mostlyclean mostlyclean-compile \
    431         mostlyclean-generic pdf pdf-am ps ps-am tags uninstall \
    432         uninstall-am uninstall-info-am
     455        clean-libtool clean-noinstLTLIBRARIES ctags distclean \
     456        distclean-compile distclean-generic distclean-libtool \
     457        distclean-tags distdir dvi dvi-am html html-am info info-am \
     458        install install-am install-data install-data-am install-exec \
     459        install-exec-am install-info install-info-am install-man \
     460        install-strip installcheck installcheck-am installdirs \
     461        maintainer-clean maintainer-clean-generic mostlyclean \
     462        mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
     463        pdf pdf-am ps ps-am tags uninstall uninstall-am \
     464        uninstall-info-am
    433465
    434466include $(MAINSRCDIR)/defs/include_paths.am
Note: See TracChangeset for help on using the changeset viewer.