From 2253f8bf2c956aa8456d37fa5c32246653b6e6d9 Mon Sep 17 00:00:00 2001 From: Owen Taylor Date: Tue, 18 Nov 2008 01:13:53 +0000 Subject: [PATCH] Build libtray and libtidy as uninstalled convenience libraries as intended Move libtidy and libtray from lib_LTLIBRARIES to noinst_LTLIBRARIES; this keeps automake from passing an -rpath when building them, which in turn convinces libtool to build them as convenience libraries rather than shared objects. svn path=/trunk/; revision=55 --- src/Makefile-tidy.am | 2 +- src/Makefile-tray.am | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Makefile-tidy.am b/src/Makefile-tidy.am index 91c9393d5..327a9e198 100644 --- a/src/Makefile-tidy.am +++ b/src/Makefile-tidy.am @@ -85,7 +85,7 @@ tidy-enum-types.c: stamp-tidy-enum-types.h tidy/tidy-enum-types.c.in cp xgen-tetc tidy-enum-types.c && \ rm -f xgen-tetc -lib_LTLIBRARIES = libtidy-1.0.la +noinst_LTLIBRARIES = libtidy-1.0.la libtidy_1_0_la_LIBADD = $(TIDY_LIBS) libtidy_1_0_la_SOURCES = \ diff --git a/src/Makefile-tray.am b/src/Makefile-tray.am index 647026a91..91be199f5 100644 --- a/src/Makefile-tray.am +++ b/src/Makefile-tray.am @@ -41,7 +41,7 @@ na-marshal.c: Makefile tray/na-marshal.list cp -f xgen-tmc na-marshal.c && \ rm -f xgen-tmc -lib_LTLIBRARIES += libtray.la +noinst_LTLIBRARIES += libtray.la libtray_la_LIBADD = $(TRAY_LIBS) libtray_la_SOURCES = \