[gnome-control-center] lib: Do not install private libgnome-control-center



commit 8cca2cab60e0b4811c3c7fee1fff0beb84283492
Author: Bastien Nocera <hadess hadess net>
Date:   Tue Oct 18 19:07:32 2011 +0100

    lib: Do not install private libgnome-control-center
    
    https://bugzilla.gnome.org/show_bug.cgi?id=655287

 configure.ac                        |   10 +---------
 libgnome-control-center/Makefile.am |    5 +----
 2 files changed, 2 insertions(+), 13 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 8976fe5..7963abb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -19,14 +19,6 @@ AC_HEADER_STDC
 LT_PREREQ([2.2])
 LT_INIT
 
-# .so version for libgnome-control-center
-LIBGNOMECONTROLCENTER_CURRENT=1
-LIBGNOMECONTROLCENTER_REVISION=0
-LIBGNOMECONTROLCENTER_AGE=0
-AC_SUBST(LIBGNOMECONTROLCENTER_CURRENT)
-AC_SUBST(LIBGNOMECONTROLCENTER_REVISION)
-AC_SUBST(LIBGNOMECONTROLCENTER_AGE)
-
 # Use the GNOME documentation framework
 GNOME_DOC_INIT
 
@@ -224,7 +216,7 @@ AC_SUBST(PANELS_DIR)
 PANEL_CFLAGS="-I\$(top_srcdir)/ -DG_LOG_DOMAIN=\"\\\"\$(cappletname)-cc-panel\\\"\""
 AC_SUBST(PANEL_CFLAGS)
 
-PANEL_LIBS="\$(top_builddir)/libgnome-control-center/libgnome-control-center.la"
+PANEL_LIBS=""
 AC_SUBST(PANEL_LIBS)
 
 PANEL_LDFLAGS="-export_dynamic -avoid-version -module -no-undefined -export-symbols-regex '^g_io_module_(load|unload)'"
diff --git a/libgnome-control-center/Makefile.am b/libgnome-control-center/Makefile.am
index eff6734..f84fc5e 100644
--- a/libgnome-control-center/Makefile.am
+++ b/libgnome-control-center/Makefile.am
@@ -9,7 +9,7 @@ AM_CPPFLAGS =					\
 	-DMENUDIR="\"$(menudir)\""		\
 	$(NULL)
 
-lib_LTLIBRARIES = libgnome-control-center.la
+noinst_LTLIBRARIES = libgnome-control-center.la
 
 libgnome_control_center_la_SOURCES =		\
 	cc-panel.c				\
@@ -22,13 +22,10 @@ libgnome_control_center_la_SOURCES =		\
 
 libgnome_control_center_la_LDFLAGS =		\
 	-no-undefined				\
-	-version-info $(LIBGNOMECONTROLCENTER_CURRENT):$(LIBGNOMECONTROLCENTER_REVISION):$(LIBGNOMECONTROLCENTER_AGE) \
 	$(NULL)
 
 libgnome_control_center_la_LIBADD = 		\
 	$(LIBGNOME_CONTROL_CENTER_LIBS)		\
 	$(NULL)
 
-libgnome_control_center_la_LIBTOOLFLAGS = --tag=disable-static
-
 -include $(top_srcdir)/git.mk



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]