Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

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


Ignore:
Timestamp:
Oct 29, 2005, 5:04:19 PM (19 years ago)
Author:
bensch
Message:

orxonox/trunk: libtoolize

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

Legend:

Unmodified
Added
Removed
  • trunk/src/lib/shell/Makefile.am

    r5450 r5452  
    22include $(MAINSRCDIR)/defs/include_paths.am
    33
    4 noinst_LTLIBRARIES = libORXshell.la
     4pkglib_LTLIBRARIES = libORXshell.la
    55
    66libORXshell_la_SOURCES = shell.cc \
  • trunk/src/lib/shell/Makefile.in

    r5450 r5452  
    4949CONFIG_HEADER = $(top_builddir)/config.h
    5050CONFIG_CLEAN_FILES =
    51 LTLIBRARIES = $(noinst_LTLIBRARIES)
     51am__installdirs = "$(DESTDIR)$(pkglibdir)"
     52pkglibLTLIBRARIES_INSTALL = $(INSTALL)
     53LTLIBRARIES = $(pkglib_LTLIBRARIES)
    5254libORXshell_la_LIBADD =
    5355am_libORXshell_la_OBJECTS = shell.lo shell_buffer.lo shell_input.lo \
     
    194196target_vendor = @target_vendor@
    195197MAINSRCDIR = ../..
    196 noinst_LTLIBRARIES = libORXshell.la
     198pkglib_LTLIBRARIES = libORXshell.la
    197199libORXshell_la_SOURCES = shell.cc \
    198200                         shell_buffer.cc \
     
    240242$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
    241243        cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
    242 
    243 clean-noinstLTLIBRARIES:
    244         -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
    245         @list='$(noinst_LTLIBRARIES)'; for p in $$list; do \
     244install-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
     255uninstall-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
     263clean-pkglibLTLIBRARIES:
     264        -test -z "$(pkglib_LTLIBRARIES)" || rm -f $(pkglib_LTLIBRARIES)
     265        @list='$(pkglib_LTLIBRARIES)'; for p in $$list; do \
    246266          dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
    247267          test "$$dir" != "$$p" || dir=.; \
     
    250270        done
    251271libORXshell.la: $(libORXshell_la_OBJECTS) $(libORXshell_la_DEPENDENCIES)
    252         $(CXXLINK) $(libORXshell_la_LDFLAGS) $(libORXshell_la_OBJECTS) $(libORXshell_la_LIBADD) $(LIBS)
     272        $(CXXLINK) -rpath $(pkglibdir) $(libORXshell_la_LDFLAGS) $(libORXshell_la_OBJECTS) $(libORXshell_la_LIBADD) $(LIBS)
    253273
    254274mostlyclean-compile:
     
    377397all-am: Makefile $(LTLIBRARIES) $(HEADERS)
    378398installdirs:
     399        for dir in "$(DESTDIR)$(pkglibdir)"; do \
     400          test -z "$$dir" || $(mkdir_p) "$$dir"; \
     401        done
    379402install: install-am
    380403install-exec: install-exec-am
     
    403426clean: clean-am
    404427
    405 clean-am: clean-generic clean-libtool clean-noinstLTLIBRARIES \
     428clean-am: clean-generic clean-libtool clean-pkglibLTLIBRARIES \
    406429        mostlyclean-am
    407430
     
    424447install-data-am:
    425448
    426 install-exec-am:
     449install-exec-am: install-pkglibLTLIBRARIES
    427450
    428451install-info: install-info-am
     
    450473ps-am:
    451474
    452 uninstall-am: uninstall-info-am
     475uninstall-am: uninstall-info-am uninstall-pkglibLTLIBRARIES
    453476
    454477.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
    455         clean-libtool clean-noinstLTLIBRARIES ctags distclean \
     478        clean-libtool clean-pkglibLTLIBRARIES ctags distclean \
    456479        distclean-compile distclean-generic distclean-libtool \
    457480        distclean-tags distdir dvi dvi-am html html-am info info-am \
    458481        install install-am install-data install-data-am install-exec \
    459482        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
     483        install-pkglibLTLIBRARIES install-strip installcheck \
     484        installcheck-am installdirs maintainer-clean \
     485        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
    465489
    466490include $(MAINSRCDIR)/defs/include_paths.am
Note: See TracChangeset for help on using the changeset viewer.