Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

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


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

Legend:

Unmodified
Added
Removed

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

    r5413 r5450  
    22include $(MAINSRCDIR)/defs/include_paths.am
    33
    4 noinst_LIBRARIES = libORXevent.a
     4noinst_LTLIBRARIES = libORXevent.la
    55
    6 libORXevent_a_SOURCES = event.cc \
    7                         event_handler.cc \
    8                         event_listener.cc \
    9                         key_mapper.cc \
    10                         key_names.cc
     6libORXevent_la_SOURCES = event.cc \
     7                         event_handler.cc \
     8                         event_listener.cc \
     9                         key_mapper.cc \
     10                         key_names.cc
    1111
    1212

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

    r5413 r5450  
    1616
    1717
    18 SOURCES = $(libORXevent_a_SOURCES)
     18SOURCES = $(libORXevent_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 libORXevent_a_AR = $(AR) $(ARFLAGS)
    55 libORXevent_a_LIBADD =
    56 am_libORXevent_a_OBJECTS = event.$(OBJEXT) event_handler.$(OBJEXT) \
    57         event_listener.$(OBJEXT) key_mapper.$(OBJEXT) \
    58         key_names.$(OBJEXT)
    59 libORXevent_a_OBJECTS = $(am_libORXevent_a_OBJECTS)
     51LTLIBRARIES = $(noinst_LTLIBRARIES)
     52libORXevent_la_LIBADD =
     53am_libORXevent_la_OBJECTS = event.lo event_handler.lo \
     54        event_listener.lo key_mapper.lo key_names.lo
     55libORXevent_la_OBJECTS = $(am_libORXevent_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)/event.Po \
    64 @AMDEP_TRUE@    ./$(DEPDIR)/event_handler.Po \
    65 @AMDEP_TRUE@    ./$(DEPDIR)/event_listener.Po \
    66 @AMDEP_TRUE@    ./$(DEPDIR)/key_mapper.Po ./$(DEPDIR)/key_names.Po
     59@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/event.Plo \
     60@AMDEP_TRUE@    ./$(DEPDIR)/event_handler.Plo \
     61@AMDEP_TRUE@    ./$(DEPDIR)/event_listener.Plo \
     62@AMDEP_TRUE@    ./$(DEPDIR)/key_mapper.Plo \
     63@AMDEP_TRUE@    ./$(DEPDIR)/key_names.Plo
    6764CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
    6865        $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
     66LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
     67        $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
     68        $(AM_CXXFLAGS) $(CXXFLAGS)
    6969CXXLD = $(CXX)
    70 CXXLINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) \
    71         -o $@
    72 SOURCES = $(libORXevent_a_SOURCES)
    73 DIST_SOURCES = $(libORXevent_a_SOURCES)
     70CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
     71        $(AM_LDFLAGS) $(LDFLAGS) -o $@
     72SOURCES = $(libORXevent_la_SOURCES)
     73DIST_SOURCES = $(libORXevent_la_SOURCES)
    7474HEADERS = $(noinst_HEADERS)
    7575ETAGS = etags
    … …  
    8080AMDEP_TRUE = @AMDEP_TRUE@
    8181AMTAR = @AMTAR@
     82AR = @AR@
    8283AUTOCONF = @AUTOCONF@
    8384AUTOHEADER = @AUTOHEADER@
    … …  
    9293CURL_LIBS = @CURL_LIBS@
    9394CXX = @CXX@
     95CXXCPP = @CXXCPP@
    9496CXXDEPMODE = @CXXDEPMODE@
    9597CXXFLAGS = @CXXFLAGS@
    … …  
    103105DOXYGEN_FALSE = @DOXYGEN_FALSE@
    104106DOXYGEN_TRUE = @DOXYGEN_TRUE@
     107ECHO = @ECHO@
    105108ECHO_C = @ECHO_C@
    106109ECHO_N = @ECHO_N@
    … …  
    108111EGREP = @EGREP@
    109112EXEEXT = @EXEEXT@
     113F77 = @F77@
     114FFLAGS = @FFLAGS@
    110115GPROF = @GPROF@
    111116GTK2_CFLAGS = @GTK2_CFLAGS@
    … …  
    122127LIBOBJS = @LIBOBJS@
    123128LIBS = @LIBS@
     129LIBTOOL = @LIBTOOL@
     130LN_S = @LN_S@
    124131LTLIBOBJS = @LTLIBOBJS@
    125132MAKEINFO = @MAKEINFO@
    … …  
    141148SUB_PROJECTS_TRUE = @SUB_PROJECTS_TRUE@
    142149VERSION = @VERSION@
     150ac_ct_AR = @ac_ct_AR@
    143151ac_ct_CC = @ac_ct_CC@
    144152ac_ct_CXX = @ac_ct_CXX@
     153ac_ct_F77 = @ac_ct_F77@
    145154ac_ct_RANLIB = @ac_ct_RANLIB@
    146155ac_ct_STRIP = @ac_ct_STRIP@
    … …  
    185194target_vendor = @target_vendor@
    186195MAINSRCDIR = ../..
    187 noinst_LIBRARIES = libORXevent.a
    188 libORXevent_a_SOURCES = event.cc \
    189                         event_handler.cc \
    190                         event_listener.cc \
    191                         key_mapper.cc \
    192                         key_names.cc
     196noinst_LTLIBRARIES = libORXevent.la
     197libORXevent_la_SOURCES = event.cc \
     198                         event_handler.cc \
     199                         event_listener.cc \
     200                         key_mapper.cc \
     201                         key_names.cc
    193202
    194203noinst_HEADERS = event.h \
    … …  
    202211
    203212.SUFFIXES:
    204 .SUFFIXES: .cc .o .obj
     213.SUFFIXES: .cc .lo .o .obj
    205214$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
    206215        @for dep in $?; do \
    … …  
    233242        cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
    234243
    235 clean-noinstLIBRARIES:
    236         -test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES)
    237 libORXevent.a: $(libORXevent_a_OBJECTS) $(libORXevent_a_DEPENDENCIES)
    238         -rm -f libORXevent.a
    239         $(libORXevent_a_AR) libORXevent.a $(libORXevent_a_OBJECTS) $(libORXevent_a_LIBADD)
    240         $(RANLIB) libORXevent.a
     244clean-noinstLTLIBRARIES:
     245        -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
     246        @list='$(noinst_LTLIBRARIES)'; for p in $$list; do \
     247          dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
     248          test "$$dir" != "$$p" || dir=.; \
     249          echo "rm -f \"$${dir}/so_locations\""; \
     250          rm -f "$${dir}/so_locations"; \
     251        done
     252libORXevent.la: $(libORXevent_la_OBJECTS) $(libORXevent_la_DEPENDENCIES)
     253        $(CXXLINK)  $(libORXevent_la_LDFLAGS) $(libORXevent_la_OBJECTS) $(libORXevent_la_LIBADD) $(LIBS)
    241254
    242255mostlyclean-compile:
    … …  
    246259        -rm -f *.tab.c
    247260
    248 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/event.Po@am__quote@
    249 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/event_handler.Po@am__quote@
    250 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/event_listener.Po@am__quote@
    251 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/key_mapper.Po@am__quote@
    252 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/key_names.Po@am__quote@
     261@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/event.Plo@am__quote@
     262@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/event_handler.Plo@am__quote@
     263@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/event_listener.Plo@am__quote@
     264@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/key_mapper.Plo@am__quote@
     265@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/key_names.Plo@am__quote@
    253266
    254267.cc.o:
    … …  
    267280@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    268281@am__fastdepCXX_FALSE@  $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
     282
     283.cc.lo:
     284@am__fastdepCXX_TRUE@   if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
     285@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
     286@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
     287@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
     288@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     289@am__fastdepCXX_FALSE@  $(LTCXXCOMPILE) -c -o $@ $<
     290
     291mostlyclean-libtool:
     292        -rm -f *.lo
     293
     294clean-libtool:
     295        -rm -rf .libs _libs
     296
     297distclean-libtool:
     298        -rm -f libtool
    269299uninstall-info-am:
    270300
    … …  
    346376check-am: all-am
    347377check: check-am
    348 all-am: Makefile $(LIBRARIES) $(HEADERS)
     378all-am: Makefile $(LTLIBRARIES) $(HEADERS)
    349379installdirs:
    350380install: install-am
    … …  
    374404clean: clean-am
    375405
    376 clean-am: clean-generic clean-noinstLIBRARIES mostlyclean-am
     406clean-am: clean-generic clean-libtool clean-noinstLTLIBRARIES \
     407        mostlyclean-am
    377408
    378409distclean: distclean-am
    … …  
    380411        -rm -f Makefile
    381412distclean-am: clean-am distclean-compile distclean-generic \
    382         distclean-tags
     413        distclean-libtool distclean-tags
    383414
    384415dvi: dvi-am
    … …  
    409440mostlyclean: mostlyclean-am
    410441
    411 mostlyclean-am: mostlyclean-compile mostlyclean-generic
     442mostlyclean-am: mostlyclean-compile mostlyclean-generic \
     443        mostlyclean-libtool
    412444
    413445pdf: pdf-am
    … …  
    422454
    423455.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
     456        clean-libtool clean-noinstLTLIBRARIES ctags distclean \
     457        distclean-compile distclean-generic distclean-libtool \
     458        distclean-tags distdir dvi dvi-am html html-am info info-am \
     459        install install-am install-data install-data-am install-exec \
     460        install-exec-am install-info install-info-am install-man \
     461        install-strip installcheck installcheck-am installdirs \
     462        maintainer-clean maintainer-clean-generic mostlyclean \
     463        mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
     464        pdf pdf-am ps ps-am tags uninstall uninstall-am \
     465        uninstall-info-am
    433466
    434467include $(MAINSRCDIR)/defs/include_paths.am
Note: See TracChangeset for help on using the changeset viewer.