Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 5452 in orxonox.OLD for trunk


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

orxonox/trunk: libtoolize

Location:
trunk/src/lib
Files:
22 edited

Legend:

Unmodified
Added
Removed

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

    r5450 r5452  
    22include $(MAINSRCDIR)/defs/include_paths.am
    33
    4 noinst_LTLIBRARIES = libORXcd.la
     4pkglib_LTLIBRARIES = libORXcd.la
    55
    66libORXcd_la_SOURCES = cd_engine.cc \

  • trunk/src/lib/collision_detection/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)
    5254libORXcd_la_LIBADD =
    5355am_libORXcd_la_OBJECTS = cd_engine.lo collision.lo obb.lo obb_tree.lo \
    … …  
    198200target_vendor = @target_vendor@
    199201MAINSRCDIR = ../..
    200 noinst_LTLIBRARIES = libORXcd.la
     202pkglib_LTLIBRARIES = libORXcd.la
    201203libORXcd_la_SOURCES = cd_engine.cc \
    202204                      collision.cc \
    … …  
    254256$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
    255257        cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
    256 
    257 clean-noinstLTLIBRARIES:
    258         -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
    259         @list='$(noinst_LTLIBRARIES)'; for p in $$list; do \
     258install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES)
     259        @$(NORMAL_INSTALL)
     260        test -z "$(pkglibdir)" || $(mkdir_p) "$(DESTDIR)$(pkglibdir)"
     261        @list='$(pkglib_LTLIBRARIES)'; for p in $$list; do \
     262          if test -f $$p; then \
     263            f="`echo $$p | sed -e 's|^.*/||'`"; \
     264            echo " $(LIBTOOL) --mode=install $(pkglibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(pkglibdir)/$$f'"; \
     265            $(LIBTOOL) --mode=install $(pkglibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(pkglibdir)/$$f"; \
     266          else :; fi; \
     267        done
     268
     269uninstall-pkglibLTLIBRARIES:
     270        @$(NORMAL_UNINSTALL)
     271        @list='$(pkglib_LTLIBRARIES)'; for p in $$list; do \
     272            p="`echo $$p | sed -e 's|^.*/||'`"; \
     273          echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(pkglibdir)/$$p'"; \
     274          $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(pkglibdir)/$$p"; \
     275        done
     276
     277clean-pkglibLTLIBRARIES:
     278        -test -z "$(pkglib_LTLIBRARIES)" || rm -f $(pkglib_LTLIBRARIES)
     279        @list='$(pkglib_LTLIBRARIES)'; for p in $$list; do \
    260280          dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
    261281          test "$$dir" != "$$p" || dir=.; \
    … …  
    264284        done
    265285libORXcd.la: $(libORXcd_la_OBJECTS) $(libORXcd_la_DEPENDENCIES)
    266         $(CXXLINK) $(libORXcd_la_LDFLAGS) $(libORXcd_la_OBJECTS) $(libORXcd_la_LIBADD) $(LIBS)
     286        $(CXXLINK) -rpath $(pkglibdir) $(libORXcd_la_LDFLAGS) $(libORXcd_la_OBJECTS) $(libORXcd_la_LIBADD) $(LIBS)
    267287
    268288mostlyclean-compile:
    … …  
    395415all-am: Makefile $(LTLIBRARIES) $(HEADERS)
    396416installdirs:
     417        for dir in "$(DESTDIR)$(pkglibdir)"; do \
     418          test -z "$$dir" || $(mkdir_p) "$$dir"; \
     419        done
    397420install: install-am
    398421install-exec: install-exec-am
    … …  
    421444clean: clean-am
    422445
    423 clean-am: clean-generic clean-libtool clean-noinstLTLIBRARIES \
     446clean-am: clean-generic clean-libtool clean-pkglibLTLIBRARIES \
    424447        mostlyclean-am
    425448
    … …  
    442465install-data-am:
    443466
    444 install-exec-am:
     467install-exec-am: install-pkglibLTLIBRARIES
    445468
    446469install-info: install-info-am
    … …  
    468491ps-am:
    469492
    470 uninstall-am: uninstall-info-am
     493uninstall-am: uninstall-info-am uninstall-pkglibLTLIBRARIES
    471494
    472495.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
    473         clean-libtool clean-noinstLTLIBRARIES ctags distclean \
     496        clean-libtool clean-pkglibLTLIBRARIES ctags distclean \
    474497        distclean-compile distclean-generic distclean-libtool \
    475498        distclean-tags distdir dvi dvi-am html html-am info info-am \
    476499        install install-am install-data install-data-am install-exec \
    477500        install-exec-am install-info install-info-am install-man \
    478         install-strip installcheck installcheck-am installdirs \
    479         maintainer-clean maintainer-clean-generic mostlyclean \
    480         mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
    481         pdf pdf-am ps ps-am tags uninstall uninstall-am \
    482         uninstall-info-am
     501        install-pkglibLTLIBRARIES install-strip installcheck \
     502        installcheck-am installdirs maintainer-clean \
     503        maintainer-clean-generic mostlyclean mostlyclean-compile \
     504        mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
     505        tags uninstall uninstall-am uninstall-info-am \
     506        uninstall-pkglibLTLIBRARIES
    483507
    484508include $(MAINSRCDIR)/defs/include_paths.am

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

    r5450 r5452  
    22include $(MAINSRCDIR)/defs/include_paths.am
    33
    4 noinst_LTLIBRARIES = libORXevent.la
     4pkglib_LTLIBRARIES = libORXevent.la
    55
    66libORXevent_la_SOURCES = event.cc \

  • trunk/src/lib/event/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)
    5254libORXevent_la_LIBADD =
    5355am_libORXevent_la_OBJECTS = event.lo event_handler.lo \
    … …  
    194196target_vendor = @target_vendor@
    195197MAINSRCDIR = ../..
    196 noinst_LTLIBRARIES = libORXevent.la
     198pkglib_LTLIBRARIES = libORXevent.la
    197199libORXevent_la_SOURCES = event.cc \
    198200                         event_handler.cc \
    … …  
    241243$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
    242244        cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
    243 
    244 clean-noinstLTLIBRARIES:
    245         -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
    246         @list='$(noinst_LTLIBRARIES)'; for p in $$list; do \
     245install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES)
     246        @$(NORMAL_INSTALL)
     247        test -z "$(pkglibdir)" || $(mkdir_p) "$(DESTDIR)$(pkglibdir)"
     248        @list='$(pkglib_LTLIBRARIES)'; for p in $$list; do \
     249          if test -f $$p; then \
     250            f="`echo $$p | sed -e 's|^.*/||'`"; \
     251            echo " $(LIBTOOL) --mode=install $(pkglibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(pkglibdir)/$$f'"; \
     252            $(LIBTOOL) --mode=install $(pkglibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(pkglibdir)/$$f"; \
     253          else :; fi; \
     254        done
     255
     256uninstall-pkglibLTLIBRARIES:
     257        @$(NORMAL_UNINSTALL)
     258        @list='$(pkglib_LTLIBRARIES)'; for p in $$list; do \
     259            p="`echo $$p | sed -e 's|^.*/||'`"; \
     260          echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(pkglibdir)/$$p'"; \
     261          $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(pkglibdir)/$$p"; \
     262        done
     263
     264clean-pkglibLTLIBRARIES:
     265        -test -z "$(pkglib_LTLIBRARIES)" || rm -f $(pkglib_LTLIBRARIES)
     266        @list='$(pkglib_LTLIBRARIES)'; for p in $$list; do \
    247267          dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
    248268          test "$$dir" != "$$p" || dir=.; \
    … …  
    251271        done
    252272libORXevent.la: $(libORXevent_la_OBJECTS) $(libORXevent_la_DEPENDENCIES)
    253         $(CXXLINK) $(libORXevent_la_LDFLAGS) $(libORXevent_la_OBJECTS) $(libORXevent_la_LIBADD) $(LIBS)
     273        $(CXXLINK) -rpath $(pkglibdir) $(libORXevent_la_LDFLAGS) $(libORXevent_la_OBJECTS) $(libORXevent_la_LIBADD) $(LIBS)
    254274
    255275mostlyclean-compile:
    … …  
    378398all-am: Makefile $(LTLIBRARIES) $(HEADERS)
    379399installdirs:
     400        for dir in "$(DESTDIR)$(pkglibdir)"; do \
     401          test -z "$$dir" || $(mkdir_p) "$$dir"; \
     402        done
    380403install: install-am
    381404install-exec: install-exec-am
    … …  
    404427clean: clean-am
    405428
    406 clean-am: clean-generic clean-libtool clean-noinstLTLIBRARIES \
     429clean-am: clean-generic clean-libtool clean-pkglibLTLIBRARIES \
    407430        mostlyclean-am
    408431
    … …  
    425448install-data-am:
    426449
    427 install-exec-am:
     450install-exec-am: install-pkglibLTLIBRARIES
    428451
    429452install-info: install-info-am
    … …  
    451474ps-am:
    452475
    453 uninstall-am: uninstall-info-am
     476uninstall-am: uninstall-info-am uninstall-pkglibLTLIBRARIES
    454477
    455478.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
    456         clean-libtool clean-noinstLTLIBRARIES ctags distclean \
     479        clean-libtool clean-pkglibLTLIBRARIES ctags distclean \
    457480        distclean-compile distclean-generic distclean-libtool \
    458481        distclean-tags distdir dvi dvi-am html html-am info info-am \
    459482        install install-am install-data install-data-am install-exec \
    460483        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
     484        install-pkglibLTLIBRARIES install-strip installcheck \
     485        installcheck-am installdirs maintainer-clean \
     486        maintainer-clean-generic mostlyclean mostlyclean-compile \
     487        mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
     488        tags uninstall uninstall-am uninstall-info-am \
     489        uninstall-pkglibLTLIBRARIES
    466490
    467491include $(MAINSRCDIR)/defs/include_paths.am

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

    r5450 r5452  
    22include $(MAINSRCDIR)/defs/include_paths.am
    33
    4 noinst_LTLIBRARIES = libORXgraphics.la
     4pkglib_LTLIBRARIES = libORXgraphics.la
    55
    66libORXgraphics_la_SOURCES = graphics_engine.cc \

  • trunk/src/lib/graphics/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)
    5254libORXgraphics_la_LIBADD =
    5355am_libORXgraphics_la_OBJECTS = graphics_engine.lo light.lo shader.lo \
    … …  
    202204target_vendor = @target_vendor@
    203205MAINSRCDIR = ../..
    204 noinst_LTLIBRARIES = libORXgraphics.la
     206pkglib_LTLIBRARIES = libORXgraphics.la
    205207libORXgraphics_la_SOURCES = graphics_engine.cc \
    206208                            light.cc \
    … …  
    258260$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
    259261        cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
    260 
    261 clean-noinstLTLIBRARIES:
    262         -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
    263         @list='$(noinst_LTLIBRARIES)'; for p in $$list; do \
     262install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES)
     263        @$(NORMAL_INSTALL)
     264        test -z "$(pkglibdir)" || $(mkdir_p) "$(DESTDIR)$(pkglibdir)"
     265        @list='$(pkglib_LTLIBRARIES)'; for p in $$list; do \
     266          if test -f $$p; then \
     267            f="`echo $$p | sed -e 's|^.*/||'`"; \
     268            echo " $(LIBTOOL) --mode=install $(pkglibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(pkglibdir)/$$f'"; \
     269            $(LIBTOOL) --mode=install $(pkglibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(pkglibdir)/$$f"; \
     270          else :; fi; \
     271        done
     272
     273uninstall-pkglibLTLIBRARIES:
     274        @$(NORMAL_UNINSTALL)
     275        @list='$(pkglib_LTLIBRARIES)'; for p in $$list; do \
     276            p="`echo $$p | sed -e 's|^.*/||'`"; \
     277          echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(pkglibdir)/$$p'"; \
     278          $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(pkglibdir)/$$p"; \
     279        done
     280
     281clean-pkglibLTLIBRARIES:
     282        -test -z "$(pkglib_LTLIBRARIES)" || rm -f $(pkglib_LTLIBRARIES)
     283        @list='$(pkglib_LTLIBRARIES)'; for p in $$list; do \
    264284          dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
    265285          test "$$dir" != "$$p" || dir=.; \
    … …  
    268288        done
    269289libORXgraphics.la: $(libORXgraphics_la_OBJECTS) $(libORXgraphics_la_DEPENDENCIES)
    270         $(CXXLINK) $(libORXgraphics_la_LDFLAGS) $(libORXgraphics_la_OBJECTS) $(libORXgraphics_la_LIBADD) $(LIBS)
     290        $(CXXLINK) -rpath $(pkglibdir) $(libORXgraphics_la_LDFLAGS) $(libORXgraphics_la_OBJECTS) $(libORXgraphics_la_LIBADD) $(LIBS)
    271291
    272292mostlyclean-compile:
    … …  
    605625installdirs: installdirs-recursive
    606626installdirs-am:
     627        for dir in "$(DESTDIR)$(pkglibdir)"; do \
     628          test -z "$$dir" || $(mkdir_p) "$$dir"; \
     629        done
    607630install: install-recursive
    608631install-exec: install-exec-recursive
    … …  
    631654clean: clean-recursive
    632655
    633 clean-am: clean-generic clean-libtool clean-noinstLTLIBRARIES \
     656clean-am: clean-generic clean-libtool clean-pkglibLTLIBRARIES \
    634657        mostlyclean-am
    635658
    … …  
    652675install-data-am:
    653676
    654 install-exec-am:
     677install-exec-am: install-pkglibLTLIBRARIES
    655678
    656679install-info: install-info-recursive
    … …  
    678701ps-am:
    679702
    680 uninstall-am: uninstall-info-am
     703uninstall-am: uninstall-info-am uninstall-pkglibLTLIBRARIES
    681704
    682705uninstall-info: uninstall-info-recursive
    683706
    684707.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
    685         clean clean-generic clean-libtool clean-noinstLTLIBRARIES \
     708        clean clean-generic clean-libtool clean-pkglibLTLIBRARIES \
    686709        clean-recursive ctags ctags-recursive distclean \
    687710        distclean-compile distclean-generic distclean-libtool \
    … …  
    689712        html-am info info-am install install-am install-data \
    690713        install-data-am install-exec install-exec-am install-info \
    691         install-info-am install-man install-strip installcheck \
    692         installcheck-am installdirs installdirs-am maintainer-clean \
    693         maintainer-clean-generic maintainer-clean-recursive \
    694         mostlyclean mostlyclean-compile mostlyclean-generic \
    695         mostlyclean-libtool mostlyclean-recursive pdf pdf-am ps ps-am \
    696         tags tags-recursive uninstall uninstall-am uninstall-info-am
     714        install-info-am install-man install-pkglibLTLIBRARIES \
     715        install-strip installcheck installcheck-am installdirs \
     716        installdirs-am maintainer-clean maintainer-clean-generic \
     717        maintainer-clean-recursive mostlyclean mostlyclean-compile \
     718        mostlyclean-generic mostlyclean-libtool mostlyclean-recursive \
     719        pdf pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \
     720        uninstall-info-am uninstall-pkglibLTLIBRARIES
    697721
    698722include $(MAINSRCDIR)/defs/include_paths.am

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

    r5450 r5452  
    22include $(MAINSRCDIR)/defs/include_paths.am
    33
    4 noinst_LTLIBRARIES = libORXimporter.la
     4pkglib_LTLIBRARIES = libORXimporter.la
    55
    66libORXimporter_la_SOURCES = model.cc \

  • trunk/src/lib/graphics/importer/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)
    5254libORXimporter_la_LIBADD =
    5355am_libORXimporter_la_OBJECTS = model.lo objModel.lo primitive_model.lo \
    … …  
    194196target_vendor = @target_vendor@
    195197MAINSRCDIR = ../../..
    196 noinst_LTLIBRARIES = libORXimporter.la
     198pkglib_LTLIBRARIES = libORXimporter.la
    197199libORXimporter_la_SOURCES = model.cc \
    198200                            objModel.cc \
    … …  
    245247$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
    246248        cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
    247 
    248 clean-noinstLTLIBRARIES:
    249         -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
    250         @list='$(noinst_LTLIBRARIES)'; for p in $$list; do \
     249install-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
     260uninstall-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
     268clean-pkglibLTLIBRARIES:
     269        -test -z "$(pkglib_LTLIBRARIES)" || rm -f $(pkglib_LTLIBRARIES)
     270        @list='$(pkglib_LTLIBRARIES)'; for p in $$list; do \
    251271          dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
    252272          test "$$dir" != "$$p" || dir=.; \
    … …  
    255275        done
    256276libORXimporter.la: $(libORXimporter_la_OBJECTS) $(libORXimporter_la_DEPENDENCIES)
    257         $(CXXLINK) $(libORXimporter_la_LDFLAGS) $(libORXimporter_la_OBJECTS) $(libORXimporter_la_LIBADD) $(LIBS)
     277        $(CXXLINK) -rpath $(pkglibdir) $(libORXimporter_la_LDFLAGS) $(libORXimporter_la_OBJECTS) $(libORXimporter_la_LIBADD) $(LIBS)
    258278
    259279mostlyclean-compile:
    … …  
    383403all-am: Makefile $(LTLIBRARIES) $(HEADERS)
    384404installdirs:
     405        for dir in "$(DESTDIR)$(pkglibdir)"; do \
     406          test -z "$$dir" || $(mkdir_p) "$$dir"; \
     407        done
    385408install: install-am
    386409install-exec: install-exec-am
    … …  
    409432clean: clean-am
    410433
    411 clean-am: clean-generic clean-libtool clean-noinstLTLIBRARIES \
     434clean-am: clean-generic clean-libtool clean-pkglibLTLIBRARIES \
    412435        mostlyclean-am
    413436
    … …  
    430453install-data-am:
    431454
    432 install-exec-am:
     455install-exec-am: install-pkglibLTLIBRARIES
    433456
    434457install-info: install-info-am
    … …  
    456479ps-am:
    457480
    458 uninstall-am: uninstall-info-am
     481uninstall-am: uninstall-info-am uninstall-pkglibLTLIBRARIES
    459482
    460483.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
    461         clean-libtool clean-noinstLTLIBRARIES ctags distclean \
     484        clean-libtool clean-pkglibLTLIBRARIES ctags distclean \
    462485        distclean-compile distclean-generic distclean-libtool \
    463486        distclean-tags distdir dvi dvi-am html html-am info info-am \
    464487        install install-am install-data install-data-am install-exec \
    465488        install-exec-am install-info install-info-am install-man \
    466         install-strip installcheck installcheck-am installdirs \
    467         maintainer-clean maintainer-clean-generic mostlyclean \
    468         mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
    469         pdf pdf-am ps ps-am tags uninstall uninstall-am \
    470         uninstall-info-am
     489        install-pkglibLTLIBRARIES install-strip installcheck \
     490        installcheck-am installdirs maintainer-clean \
     491        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
    471495
    472496include $(MAINSRCDIR)/defs/include_paths.am

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

    r5450 r5452  
    22include $(MAINSRCDIR)/defs/include_paths.am
    33
    4 noinst_LTLIBRARIES = libORXquadtree.la
     4pkglib_LTLIBRARIES = libORXquadtree.la
    55
    66libORXquadtree_la_SOURCES = quadtree.cc \

  • trunk/src/lib/graphics/spatial_separation/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)
    5254libORXquadtree_la_LIBADD =
    5355am_libORXquadtree_la_OBJECTS = quadtree.lo quadtree_node.lo \
    … …  
    192194target_vendor = @target_vendor@
    193195MAINSRCDIR = ../../..
    194 noinst_LTLIBRARIES = libORXquadtree.la
     196pkglib_LTLIBRARIES = libORXquadtree.la
    195197libORXquadtree_la_SOURCES = quadtree.cc \
    196198                            quadtree_node.cc \
    … …  
    234236$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
    235237        cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
    236 
    237 clean-noinstLTLIBRARIES:
    238         -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
    239         @list='$(noinst_LTLIBRARIES)'; for p in $$list; do \
     238install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES)
     239        @$(NORMAL_INSTALL)
     240        test -z "$(pkglibdir)" || $(mkdir_p) "$(DESTDIR)$(pkglibdir)"
     241        @list='$(pkglib_LTLIBRARIES)'; for p in $$list; do \
     242          if test -f $$p; then \
     243            f="`echo $$p | sed -e 's|^.*/||'`"; \
     244            echo " $(LIBTOOL) --mode=install $(pkglibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(pkglibdir)/$$f'"; \
     245            $(LIBTOOL) --mode=install $(pkglibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(pkglibdir)/$$f"; \
     246          else :; fi; \
     247        done
     248
     249uninstall-pkglibLTLIBRARIES:
     250        @$(NORMAL_UNINSTALL)
     251        @list='$(pkglib_LTLIBRARIES)'; for p in $$list; do \
     252            p="`echo $$p | sed -e 's|^.*/||'`"; \
     253          echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(pkglibdir)/$$p'"; \
     254          $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(pkglibdir)/$$p"; \
     255        done
     256
     257clean-pkglibLTLIBRARIES:
     258        -test -z "$(pkglib_LTLIBRARIES)" || rm -f $(pkglib_LTLIBRARIES)
     259        @list='$(pkglib_LTLIBRARIES)'; for p in $$list; do \
    240260          dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
    241261          test "$$dir" != "$$p" || dir=.; \
    … …  
    244264        done
    245265libORXquadtree.la: $(libORXquadtree_la_OBJECTS) $(libORXquadtree_la_DEPENDENCIES)
    246         $(CXXLINK) $(libORXquadtree_la_LDFLAGS) $(libORXquadtree_la_OBJECTS) $(libORXquadtree_la_LIBADD) $(LIBS)
     266        $(CXXLINK) -rpath $(pkglibdir) $(libORXquadtree_la_LDFLAGS) $(libORXquadtree_la_OBJECTS) $(libORXquadtree_la_LIBADD) $(LIBS)
    247267
    248268mostlyclean-compile:
    … …  
    369389all-am: Makefile $(LTLIBRARIES) $(HEADERS)
    370390installdirs:
     391        for dir in "$(DESTDIR)$(pkglibdir)"; do \
     392          test -z "$$dir" || $(mkdir_p) "$$dir"; \
     393        done
    371394install: install-am
    372395install-exec: install-exec-am
    … …  
    395418clean: clean-am
    396419
    397 clean-am: clean-generic clean-libtool clean-noinstLTLIBRARIES \
     420clean-am: clean-generic clean-libtool clean-pkglibLTLIBRARIES \
    398421        mostlyclean-am
    399422
    … …  
    416439install-data-am:
    417440
    418 install-exec-am:
     441install-exec-am: install-pkglibLTLIBRARIES
    419442
    420443install-info: install-info-am
    … …  
    442465ps-am:
    443466
    444 uninstall-am: uninstall-info-am
     467uninstall-am: uninstall-info-am uninstall-pkglibLTLIBRARIES
    445468
    446469.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
    447         clean-libtool clean-noinstLTLIBRARIES ctags distclean \
     470        clean-libtool clean-pkglibLTLIBRARIES ctags distclean \
    448471        distclean-compile distclean-generic distclean-libtool \
    449472        distclean-tags distdir dvi dvi-am html html-am info info-am \
    450473        install install-am install-data install-data-am install-exec \
    451474        install-exec-am install-info install-info-am install-man \
    452         install-strip installcheck installcheck-am installdirs \
    453         maintainer-clean maintainer-clean-generic mostlyclean \
    454         mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
    455         pdf pdf-am ps ps-am tags uninstall uninstall-am \
    456         uninstall-info-am
     475        install-pkglibLTLIBRARIES install-strip installcheck \
     476        installcheck-am installdirs maintainer-clean \
     477        maintainer-clean-generic mostlyclean mostlyclean-compile \
     478        mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
     479        tags uninstall uninstall-am uninstall-info-am \
     480        uninstall-pkglibLTLIBRARIES
    457481
    458482include $(MAINSRCDIR)/defs/include_paths.am

  • trunk/src/lib/gui/gl_gui/Makefile.am

    r5450 r5452  
    44AM_LDFLAGS =
    55
    6 noinst_LTLIBRARIES = libORXglgui.la
     6pkglib_LTLIBRARIES = libORXglgui.la
    77
    88libORXglgui_la_CPPFLAGS = -DBUILD_ORXONOX

  • trunk/src/lib/gui/gl_gui/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)
    5254libORXglgui_la_LIBADD =
    5355am_libORXglgui_la_OBJECTS = libORXglgui_la-glmenu_imagescreen.lo \
    … …  
    205207MAINSRCDIR = ../../..
    206208AM_LDFLAGS =
    207 noinst_LTLIBRARIES = libORXglgui.la
     209pkglib_LTLIBRARIES = libORXglgui.la
    208210libORXglgui_la_CPPFLAGS = -DBUILD_ORXONOX
    209211libORXglgui_la_SOURCES = glmenu/glmenu_imagescreen.cc \
    … …  
    264266$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
    265267        cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
    266 
    267 clean-noinstLTLIBRARIES:
    268         -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
    269         @list='$(noinst_LTLIBRARIES)'; for p in $$list; do \
     268install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES)
     269        @$(NORMAL_INSTALL)
     270        test -z "$(pkglibdir)" || $(mkdir_p) "$(DESTDIR)$(pkglibdir)"
     271        @list='$(pkglib_LTLIBRARIES)'; for p in $$list; do \
     272          if test -f $$p; then \
     273            f="`echo $$p | sed -e 's|^.*/||'`"; \
     274            echo " $(LIBTOOL) --mode=install $(pkglibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(pkglibdir)/$$f'"; \
     275            $(LIBTOOL) --mode=install $(pkglibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(pkglibdir)/$$f"; \
     276          else :; fi; \
     277        done
     278
     279uninstall-pkglibLTLIBRARIES:
     280        @$(NORMAL_UNINSTALL)
     281        @list='$(pkglib_LTLIBRARIES)'; for p in $$list; do \
     282            p="`echo $$p | sed -e 's|^.*/||'`"; \
     283          echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(pkglibdir)/$$p'"; \
     284          $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(pkglibdir)/$$p"; \
     285        done
     286
     287clean-pkglibLTLIBRARIES:
     288        -test -z "$(pkglib_LTLIBRARIES)" || rm -f $(pkglib_LTLIBRARIES)
     289        @list='$(pkglib_LTLIBRARIES)'; for p in $$list; do \
    270290          dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
    271291          test "$$dir" != "$$p" || dir=.; \
    … …  
    274294        done
    275295libORXglgui.la: $(libORXglgui_la_OBJECTS) $(libORXglgui_la_DEPENDENCIES)
    276         $(CXXLINK) $(libORXglgui_la_LDFLAGS) $(libORXglgui_la_OBJECTS) $(libORXglgui_la_LIBADD) $(LIBS)
     296        $(CXXLINK) -rpath $(pkglibdir) $(libORXglgui_la_LDFLAGS) $(libORXglgui_la_OBJECTS) $(libORXglgui_la_LIBADD) $(LIBS)
    277297
    278298mostlyclean-compile:
    … …  
    647667all-am: Makefile $(LTLIBRARIES) $(HEADERS)
    648668installdirs:
     669        for dir in "$(DESTDIR)$(pkglibdir)"; do \
     670          test -z "$$dir" || $(mkdir_p) "$$dir"; \
     671        done
    649672install: install-am
    650673install-exec: install-exec-am
    … …  
    673696clean: clean-am
    674697
    675 clean-am: clean-generic clean-libtool clean-noinstLTLIBRARIES \
     698clean-am: clean-generic clean-libtool clean-pkglibLTLIBRARIES \
    676699        mostlyclean-am
    677700
    … …  
    694717install-data-am:
    695718
    696 install-exec-am:
     719install-exec-am: install-pkglibLTLIBRARIES
    697720
    698721install-info: install-info-am
    … …  
    720743ps-am:
    721744
    722 uninstall-am: uninstall-info-am
     745uninstall-am: uninstall-info-am uninstall-pkglibLTLIBRARIES
    723746
    724747.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
    725         clean-libtool clean-noinstLTLIBRARIES ctags distclean \
     748        clean-libtool clean-pkglibLTLIBRARIES ctags distclean \
    726749        distclean-compile distclean-generic distclean-libtool \
    727750        distclean-tags distdir dvi dvi-am html html-am info info-am \
    728751        install install-am install-data install-data-am install-exec \
    729752        install-exec-am install-info install-info-am install-man \
    730         install-strip installcheck installcheck-am installdirs \
    731         maintainer-clean maintainer-clean-generic mostlyclean \
    732         mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
    733         pdf pdf-am ps ps-am tags uninstall uninstall-am \
    734         uninstall-info-am
     753        install-pkglibLTLIBRARIES install-strip installcheck \
     754        installcheck-am installdirs maintainer-clean \
     755        maintainer-clean-generic mostlyclean mostlyclean-compile \
     756        mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
     757        tags uninstall uninstall-am uninstall-info-am \
     758        uninstall-pkglibLTLIBRARIES
    735759
    736760include $(MAINSRCDIR)/defs/include_paths.am

  • trunk/src/lib/gui/gtk_gui/Makefile.am

    r5450 r5452  
    22include $(MAINSRCDIR)/defs/include_paths.am
    33
    4 noinst_LTLIBRARIES = libORXgui.la
     4pkglib_LTLIBRARIES = libORXgui.la
    55
    66libORXgui_la_CPPFLAGS = -DBUILD_ORXONOX \

  • trunk/src/lib/gui/gtk_gui/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)
    5254libORXgui_la_LIBADD =
    5355am_libORXgui_la_OBJECTS = libORXgui_la-gui.lo libORXgui_la-gui_gtk.lo \
    … …  
    202204target_vendor = @target_vendor@
    203205MAINSRCDIR = ../../..
    204 noinst_LTLIBRARIES = libORXgui.la
     206pkglib_LTLIBRARIES = libORXgui.la
    205207libORXgui_la_CPPFLAGS = -DBUILD_ORXONOX \
    206208                        $(GTK2_CFLAGS) $(GTHREAD_CFLAGS) $(CURL_CFLAGS) $(MSBITFIELDS)
    … …  
    265267$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
    266268        cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
    267 
    268 clean-noinstLTLIBRARIES:
    269         -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
    270         @list='$(noinst_LTLIBRARIES)'; for p in $$list; do \
     269install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES)
     270        @$(NORMAL_INSTALL)
     271        test -z "$(pkglibdir)" || $(mkdir_p) "$(DESTDIR)$(pkglibdir)"
     272        @list='$(pkglib_LTLIBRARIES)'; for p in $$list; do \
     273          if test -f $$p; then \
     274            f="`echo $$p | sed -e 's|^.*/||'`"; \
     275            echo " $(LIBTOOL) --mode=install $(pkglibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(pkglibdir)/$$f'"; \
     276            $(LIBTOOL) --mode=install $(pkglibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(pkglibdir)/$$f"; \
     277          else :; fi; \
     278        done
     279
     280uninstall-pkglibLTLIBRARIES:
     281        @$(NORMAL_UNINSTALL)
     282        @list='$(pkglib_LTLIBRARIES)'; for p in $$list; do \
     283            p="`echo $$p | sed -e 's|^.*/||'`"; \
     284          echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(pkglibdir)/$$p'"; \
     285          $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(pkglibdir)/$$p"; \
     286        done
     287
     288clean-pkglibLTLIBRARIES:
     289        -test -z "$(pkglib_LTLIBRARIES)" || rm -f $(pkglib_LTLIBRARIES)
     290        @list='$(pkglib_LTLIBRARIES)'; for p in $$list; do \
    271291          dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
    272292          test "$$dir" != "$$p" || dir=.; \
    … …  
    275295        done
    276296libORXgui.la: $(libORXgui_la_OBJECTS) $(libORXgui_la_DEPENDENCIES)
    277         $(CXXLINK) $(libORXgui_la_LDFLAGS) $(libORXgui_la_OBJECTS) $(libORXgui_la_LIBADD) $(LIBS)
     297        $(CXXLINK) -rpath $(pkglibdir) $(libORXgui_la_LDFLAGS) $(libORXgui_la_OBJECTS) $(libORXgui_la_LIBADD) $(LIBS)
    278298
    279299mostlyclean-compile:
    … …  
    647667all-am: Makefile $(LTLIBRARIES) $(HEADERS)
    648668installdirs:
     669        for dir in "$(DESTDIR)$(pkglibdir)"; do \
     670          test -z "$$dir" || $(mkdir_p) "$$dir"; \
     671        done
    649672install: install-am
    650673install-exec: install-exec-am
    … …  
    673696clean: clean-am
    674697
    675 clean-am: clean-generic clean-libtool clean-noinstLTLIBRARIES \
     698clean-am: clean-generic clean-libtool clean-pkglibLTLIBRARIES \
    676699        mostlyclean-am
    677700
    … …  
    694717install-data-am:
    695718
    696 install-exec-am:
     719install-exec-am: install-pkglibLTLIBRARIES
    697720
    698721install-info: install-info-am
    … …  
    720743ps-am:
    721744
    722 uninstall-am: uninstall-info-am
     745uninstall-am: uninstall-info-am uninstall-pkglibLTLIBRARIES
    723746
    724747.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
    725         clean-libtool clean-noinstLTLIBRARIES ctags distclean \
     748        clean-libtool clean-pkglibLTLIBRARIES ctags distclean \
    726749        distclean-compile distclean-generic distclean-libtool \
    727750        distclean-tags distdir dvi dvi-am html html-am info info-am \
    728751        install install-am install-data install-data-am install-exec \
    729752        install-exec-am install-info install-info-am install-man \
    730         install-strip installcheck installcheck-am installdirs \
    731         maintainer-clean maintainer-clean-generic mostlyclean \
    732         mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
    733         pdf pdf-am ps ps-am tags uninstall uninstall-am \
    734         uninstall-info-am
     753        install-pkglibLTLIBRARIES install-strip installcheck \
     754        installcheck-am installdirs maintainer-clean \
     755        maintainer-clean-generic mostlyclean mostlyclean-compile \
     756        mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
     757        tags uninstall uninstall-am uninstall-info-am \
     758        uninstall-pkglibLTLIBRARIES
    735759
    736760include $(MAINSRCDIR)/defs/include_paths.am

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

    r5450 r5452  
    22include $(MAINSRCDIR)/defs/include_paths.am
    33
    4 noinst_LTLIBRARIES = libORXphysics.la
     4pkglib_LTLIBRARIES = libORXphysics.la
    55
    66libORXphysics_la_SOURCES = physics_interface.cc \

  • trunk/src/lib/physics/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)
    5254libORXphysics_la_LIBADD =
    5355am_libORXphysics_la_OBJECTS = physics_interface.lo \
    … …  
    196198target_vendor = @target_vendor@
    197199MAINSRCDIR = ../..
    198 noinst_LTLIBRARIES = libORXphysics.la
     200pkglib_LTLIBRARIES = libORXphysics.la
    199201libORXphysics_la_SOURCES = physics_interface.cc \
    200202                           physics_connection.cc \
    … …  
    247249$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
    248250        cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
    249 
    250 clean-noinstLTLIBRARIES:
    251         -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
    252         @list='$(noinst_LTLIBRARIES)'; for p in $$list; do \
     251install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES)
     252        @$(NORMAL_INSTALL)
     253        test -z "$(pkglibdir)" || $(mkdir_p) "$(DESTDIR)$(pkglibdir)"
     254        @list='$(pkglib_LTLIBRARIES)'; for p in $$list; do \
     255          if test -f $$p; then \
     256            f="`echo $$p | sed -e 's|^.*/||'`"; \
     257            echo " $(LIBTOOL) --mode=install $(pkglibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(pkglibdir)/$$f'"; \
     258            $(LIBTOOL) --mode=install $(pkglibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(pkglibdir)/$$f"; \
     259          else :; fi; \
     260        done
     261
     262uninstall-pkglibLTLIBRARIES:
     263        @$(NORMAL_UNINSTALL)
     264        @list='$(pkglib_LTLIBRARIES)'; for p in $$list; do \
     265            p="`echo $$p | sed -e 's|^.*/||'`"; \
     266          echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(pkglibdir)/$$p'"; \
     267          $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(pkglibdir)/$$p"; \
     268        done
     269
     270clean-pkglibLTLIBRARIES:
     271        -test -z "$(pkglib_LTLIBRARIES)" || rm -f $(pkglib_LTLIBRARIES)
     272        @list='$(pkglib_LTLIBRARIES)'; for p in $$list; do \
    253273          dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
    254274          test "$$dir" != "$$p" || dir=.; \
    … …  
    257277        done
    258278libORXphysics.la: $(libORXphysics_la_OBJECTS) $(libORXphysics_la_DEPENDENCIES)
    259         $(CXXLINK) $(libORXphysics_la_LDFLAGS) $(libORXphysics_la_OBJECTS) $(libORXphysics_la_LIBADD) $(LIBS)
     279        $(CXXLINK) -rpath $(pkglibdir) $(libORXphysics_la_LDFLAGS) $(libORXphysics_la_OBJECTS) $(libORXphysics_la_LIBADD) $(LIBS)
    260280
    261281mostlyclean-compile:
    … …  
    483503all-am: Makefile $(LTLIBRARIES) $(HEADERS)
    484504installdirs:
     505        for dir in "$(DESTDIR)$(pkglibdir)"; do \
     506          test -z "$$dir" || $(mkdir_p) "$$dir"; \
     507        done
    485508install: install-am
    486509install-exec: install-exec-am
    … …  
    509532clean: clean-am
    510533
    511 clean-am: clean-generic clean-libtool clean-noinstLTLIBRARIES \
     534clean-am: clean-generic clean-libtool clean-pkglibLTLIBRARIES \
    512535        mostlyclean-am
    513536
    … …  
    530553install-data-am:
    531554
    532 install-exec-am:
     555install-exec-am: install-pkglibLTLIBRARIES
    533556
    534557install-info: install-info-am
    … …  
    556579ps-am:
    557580
    558 uninstall-am: uninstall-info-am
     581uninstall-am: uninstall-info-am uninstall-pkglibLTLIBRARIES
    559582
    560583.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
    561         clean-libtool clean-noinstLTLIBRARIES ctags distclean \
     584        clean-libtool clean-pkglibLTLIBRARIES ctags distclean \
    562585        distclean-compile distclean-generic distclean-libtool \
    563586        distclean-tags distdir dvi dvi-am html html-am info info-am \
    564587        install install-am install-data install-data-am install-exec \
    565588        install-exec-am install-info install-info-am install-man \
    566         install-strip installcheck installcheck-am installdirs \
    567         maintainer-clean maintainer-clean-generic mostlyclean \
    568         mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
    569         pdf pdf-am ps ps-am tags uninstall uninstall-am \
    570         uninstall-info-am
     589        install-pkglibLTLIBRARIES install-strip installcheck \
     590        installcheck-am installdirs maintainer-clean \
     591        maintainer-clean-generic mostlyclean mostlyclean-compile \
     592        mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
     593        tags uninstall uninstall-am uninstall-info-am \
     594        uninstall-pkglibLTLIBRARIES
    571595
    572596include $(MAINSRCDIR)/defs/include_paths.am

  • 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

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

    r5450 r5452  
    22include $(MAINSRCDIR)/defs/include_paths.am
    33
    4 noinst_LTLIBRARIES = libORXsound.la
     4pkglib_LTLIBRARIES = libORXsound.la
    55
    66libORXsound_la_SOURCES = sound_engine.cc \

  • trunk/src/lib/sound/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)
    5254libORXsound_la_LIBADD =
    5355am_libORXsound_la_OBJECTS = sound_engine.lo sound_source.lo \
    … …  
    193195target_vendor = @target_vendor@
    194196MAINSRCDIR = ../..
    195 noinst_LTLIBRARIES = libORXsound.la
     197pkglib_LTLIBRARIES = libORXsound.la
    196198libORXsound_la_SOURCES = sound_engine.cc \
    197199                         sound_source.cc \
    … …  
    237239$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
    238240        cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
    239 
    240 clean-noinstLTLIBRARIES:
    241         -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
    242         @list='$(noinst_LTLIBRARIES)'; for p in $$list; do \
     241install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES)
     242        @$(NORMAL_INSTALL)
     243        test -z "$(pkglibdir)" || $(mkdir_p) "$(DESTDIR)$(pkglibdir)"
     244        @list='$(pkglib_LTLIBRARIES)'; for p in $$list; do \
     245          if test -f $$p; then \
     246            f="`echo $$p | sed -e 's|^.*/||'`"; \
     247            echo " $(LIBTOOL) --mode=install $(pkglibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(pkglibdir)/$$f'"; \
     248            $(LIBTOOL) --mode=install $(pkglibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(pkglibdir)/$$f"; \
     249          else :; fi; \
     250        done
     251
     252uninstall-pkglibLTLIBRARIES:
     253        @$(NORMAL_UNINSTALL)
     254        @list='$(pkglib_LTLIBRARIES)'; for p in $$list; do \
     255            p="`echo $$p | sed -e 's|^.*/||'`"; \
     256          echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(pkglibdir)/$$p'"; \
     257          $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(pkglibdir)/$$p"; \
     258        done
     259
     260clean-pkglibLTLIBRARIES:
     261        -test -z "$(pkglib_LTLIBRARIES)" || rm -f $(pkglib_LTLIBRARIES)
     262        @list='$(pkglib_LTLIBRARIES)'; for p in $$list; do \
    243263          dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
    244264          test "$$dir" != "$$p" || dir=.; \
    … …  
    247267        done
    248268libORXsound.la: $(libORXsound_la_OBJECTS) $(libORXsound_la_DEPENDENCIES)
    249         $(CXXLINK) $(libORXsound_la_LDFLAGS) $(libORXsound_la_OBJECTS) $(libORXsound_la_LIBADD) $(LIBS)
     269        $(CXXLINK) -rpath $(pkglibdir) $(libORXsound_la_LDFLAGS) $(libORXsound_la_OBJECTS) $(libORXsound_la_LIBADD) $(LIBS)
    250270
    251271mostlyclean-compile:
    … …  
    373393all-am: Makefile $(LTLIBRARIES) $(HEADERS)
    374394installdirs:
     395        for dir in "$(DESTDIR)$(pkglibdir)"; do \
     396          test -z "$$dir" || $(mkdir_p) "$$dir"; \
     397        done
    375398install: install-am
    376399install-exec: install-exec-am
    … …  
    399422clean: clean-am
    400423
    401 clean-am: clean-generic clean-libtool clean-noinstLTLIBRARIES \
     424clean-am: clean-generic clean-libtool clean-pkglibLTLIBRARIES \
    402425        mostlyclean-am
    403426
    … …  
    420443install-data-am:
    421444
    422 install-exec-am:
     445install-exec-am: install-pkglibLTLIBRARIES
    423446
    424447install-info: install-info-am
    … …  
    446469ps-am:
    447470
    448 uninstall-am: uninstall-info-am
     471uninstall-am: uninstall-info-am uninstall-pkglibLTLIBRARIES
    449472
    450473.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
    451         clean-libtool clean-noinstLTLIBRARIES ctags distclean \
     474        clean-libtool clean-pkglibLTLIBRARIES ctags distclean \
    452475        distclean-compile distclean-generic distclean-libtool \
    453476        distclean-tags distdir dvi dvi-am html html-am info info-am \
    454477        install install-am install-data install-data-am install-exec \
    455478        install-exec-am install-info install-info-am install-man \
    456         install-strip installcheck installcheck-am installdirs \
    457         maintainer-clean maintainer-clean-generic mostlyclean \
    458         mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
    459         pdf pdf-am ps ps-am tags uninstall uninstall-am \
    460         uninstall-info-am
     479        install-pkglibLTLIBRARIES install-strip installcheck \
     480        installcheck-am installdirs maintainer-clean \
     481        maintainer-clean-generic mostlyclean mostlyclean-compile \
     482        mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
     483        tags uninstall uninstall-am uninstall-info-am \
     484        uninstall-pkglibLTLIBRARIES
    461485
    462486include $(MAINSRCDIR)/defs/include_paths.am

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

    r5450 r5452  
    11
    2 noinst_LTLIBRARIES = libtinyxml.la
     2pkglib_LTLIBRARIES = libtinyxml.la
    33
    44libtinyxml_la_SOURCES = tinyxml.cc \

  • trunk/src/lib/tinyxml/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)
    5254libtinyxml_la_LIBADD =
    5355am_libtinyxml_la_OBJECTS = tinyxml.lo tinystr.lo tinyxmlerror.lo \
    … …  
    192194target_os = @target_os@
    193195target_vendor = @target_vendor@
    194 noinst_LTLIBRARIES = libtinyxml.la
     196pkglib_LTLIBRARIES = libtinyxml.la
    195197libtinyxml_la_SOURCES = tinyxml.cc \
    196198                       tinystr.cc \
    … …  
    234236$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
    235237        cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
    236 
    237 clean-noinstLTLIBRARIES:
    238         -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
    239         @list='$(noinst_LTLIBRARIES)'; for p in $$list; do \
     238install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES)
     239        @$(NORMAL_INSTALL)
     240        test -z "$(pkglibdir)" || $(mkdir_p) "$(DESTDIR)$(pkglibdir)"
     241        @list='$(pkglib_LTLIBRARIES)'; for p in $$list; do \
     242          if test -f $$p; then \
     243            f="`echo $$p | sed -e 's|^.*/||'`"; \
     244            echo " $(LIBTOOL) --mode=install $(pkglibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(pkglibdir)/$$f'"; \
     245            $(LIBTOOL) --mode=install $(pkglibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(pkglibdir)/$$f"; \
     246          else :; fi; \
     247        done
     248
     249uninstall-pkglibLTLIBRARIES:
     250        @$(NORMAL_UNINSTALL)
     251        @list='$(pkglib_LTLIBRARIES)'; for p in $$list; do \
     252            p="`echo $$p | sed -e 's|^.*/||'`"; \
     253          echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(pkglibdir)/$$p'"; \
     254          $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(pkglibdir)/$$p"; \
     255        done
     256
     257clean-pkglibLTLIBRARIES:
     258        -test -z "$(pkglib_LTLIBRARIES)" || rm -f $(pkglib_LTLIBRARIES)
     259        @list='$(pkglib_LTLIBRARIES)'; for p in $$list; do \
    240260          dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
    241261          test "$$dir" != "$$p" || dir=.; \
    … …  
    244264        done
    245265libtinyxml.la: $(libtinyxml_la_OBJECTS) $(libtinyxml_la_DEPENDENCIES)
    246         $(CXXLINK) $(libtinyxml_la_LDFLAGS) $(libtinyxml_la_OBJECTS) $(libtinyxml_la_LIBADD) $(LIBS)
     266        $(CXXLINK) -rpath $(pkglibdir) $(libtinyxml_la_LDFLAGS) $(libtinyxml_la_OBJECTS) $(libtinyxml_la_LIBADD) $(LIBS)
    247267
    248268mostlyclean-compile:
    … …  
    370390all-am: Makefile $(LTLIBRARIES) $(HEADERS)
    371391installdirs:
     392        for dir in "$(DESTDIR)$(pkglibdir)"; do \
     393          test -z "$$dir" || $(mkdir_p) "$$dir"; \
     394        done
    372395install: install-am
    373396install-exec: install-exec-am
    … …  
    396419clean: clean-am
    397420
    398 clean-am: clean-generic clean-libtool clean-noinstLTLIBRARIES \
     421clean-am: clean-generic clean-libtool clean-pkglibLTLIBRARIES \
    399422        mostlyclean-am
    400423
    … …  
    417440install-data-am:
    418441
    419 install-exec-am:
     442install-exec-am: install-pkglibLTLIBRARIES
    420443
    421444install-info: install-info-am
    … …  
    443466ps-am:
    444467
    445 uninstall-am: uninstall-info-am
     468uninstall-am: uninstall-info-am uninstall-pkglibLTLIBRARIES
    446469
    447470.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
    448         clean-libtool clean-noinstLTLIBRARIES ctags distclean \
     471        clean-libtool clean-pkglibLTLIBRARIES ctags distclean \
    449472        distclean-compile distclean-generic distclean-libtool \
    450473        distclean-tags distdir dvi dvi-am html html-am info info-am \
    451474        install install-am install-data install-data-am install-exec \
    452475        install-exec-am install-info install-info-am install-man \
    453         install-strip installcheck installcheck-am installdirs \
    454         maintainer-clean maintainer-clean-generic mostlyclean \
    455         mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
    456         pdf pdf-am ps ps-am tags uninstall uninstall-am \
    457         uninstall-info-am
     476        install-pkglibLTLIBRARIES install-strip installcheck \
     477        installcheck-am installdirs maintainer-clean \
     478        maintainer-clean-generic mostlyclean mostlyclean-compile \
     479        mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
     480        tags uninstall uninstall-am uninstall-info-am \
     481        uninstall-pkglibLTLIBRARIES
    458482
    459483# Tell versions [3.59,3.63) of GNU make to not export all variables.
Note: See TracChangeset for help on using the changeset viewer.