gnome-shell r55 - trunk/src

[otaylor svn gnome org]

Author: otaylor
Date: Tue Nov 18 01:13:53 2008
New Revision: 55
URL: http://svn.gnome.org/viewvc/gnome-shell?rev=55&view=rev

Log:
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.


Modified:
   trunk/src/Makefile-tidy.am
   trunk/src/Makefile-tray.am

Modified: trunk/src/Makefile-tidy.am
==============================================================================
--- trunk/src/Makefile-tidy.am	(original)
+++ trunk/src/Makefile-tidy.am	Tue Nov 18 01:13:53 2008
@@ -85,7 +85,7 @@
 	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 = \

Modified: trunk/src/Makefile-tray.am
==============================================================================
--- trunk/src/Makefile-tray.am	(original)
+++ trunk/src/Makefile-tray.am	Tue Nov 18 01:13:53 2008
@@ -41,7 +41,7 @@
 	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 =	\