Reduced the number of generated shared objects.

3 files changed, 14 insertions, 66 deletions

diff --git a/src/Makefile.am b/src/Makefile.am
index d50aedf..31e1d72 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,5 +1,5 @@
 
-lib_LTLIBRARIES = libchrysacore.la libchrysaglibext.la libchrysadisass.la libchrysagtkext.la libchrysagui.la libchrysaplugin.la
+lib_LTLIBRARIES = libchrysacore.la
 
 bin_PROGRAMS = chrysalide csrvmng
 
@@ -8,79 +8,29 @@ bin_PROGRAMS = chrysalide csrvmng
 
 
 ############################################################
-# Bibliothèques dynamiques
+# Bibliothèque dynamique
 ############################################################
 
-#--- libchrysadisas
+#--- libchrysacore
 
 libchrysacore_la_SOURCES =
 
-libchrysacore_la_LDFLAGS = $(LIBGTK_LIBS) $(LIBXML_LIBS)	\
-	-Lcommon/.libs -lcommon
+libchrysacore_la_LDFLAGS = $(LIBGTK_LIBS) $(LIBXML_LIBS) $(LIBSQLITE_LIBS) $(LIBARCHIVE_LIBS)
 
 libchrysacore_la_LIBADD =				\
-	core/libcore.la
-
-
-#--- libchrysadisas
-
-libchrysadisass_la_SOURCES =
-
-libchrysadisass_la_LDFLAGS = $(LIBGTK_LIBS) $(LIBXML_LIBS) $(LIBSQLITE_LIBS) $(LIBARCHIVE_LIBS) \
-	-Lcommon/.libs -lcommon -L.libs -lchrysaglibext -lrt
-
-libchrysadisass_la_LIBADD =				\
 	analysis/libanalysis.la				\
 	arch/libarch.la						\
+	common/libcommon.la					\
+	core/libcore.la						\
 	debug/libdebug.la					\
 	format/libformat.la					\
-	mangling/libmangling.la
-
-
-#--- libchrysaglibext
-
-libchrysaglibext_la_SOURCES =
-
-libchrysaglibext_la_LDFLAGS = $(LIBGTK_LIBS)
-
-libchrysaglibext_la_LIBADD =						\
-	glibext/libglibext.la
-
-
-#--- libchrysagtkext
-
-libchrysagtkext_la_SOURCES =
-
-libchrysagtkext_la_LDFLAGS = $(LIBGTK_LIBS)		\
-	-L.libs -lchrysadisass
-
-libchrysagtkext_la_LIBADD =						\
-	gtkext/libgtkext.la
-
-
-#--- libchrysagui
-
-libchrysagui_la_SOURCES =
-
-libchrysagui_la_LDFLAGS = $(LIBGTK_LIBS)			\
-	-L.libs -lchrysagtkext
-
-libchrysagui_la_LIBADD =							\
-	gui/libgui.la
-
-
-#--- libchrysaplugin
-
-libchrysaplugin_la_SOURCES =
-
-libchrysaplugin_la_LDFLAGS = $(LIBGTK_LIBS)		\
-	-L.libs -lchrysadisass -lchrysagui
-
-libchrysaplugin_la_LIBADD =						\
+	glibext/libglibext.la				\
+	gtkext/libgtkext.la					\
+	gui/libgui.la						\
+	mangling/libmangling.la				\
 	plugins/libplugins.la
 
 
-
 ############################################################
 # Programme principal
 ############################################################
@@ -95,9 +45,7 @@ AM_CFLAGS = $(DEBUG_CFLAGS) $(WARNING_FLAGS) $(COMPLIANCE_FLAGS)
 
 
 chrysalide_LDFLAGS = $(LIBGTK_LIBS) -L/usr/X11R6/lib -ldl -lm $(LIBXML_LIBS) `pkg-config --libs gthread-2.0` $(LIBPYTHON_LIBS) $(LIBARCHIVE_LIBS) $(LIBSQLITE_LIBS) \
-	-L.libs -lchrysaglibext -lchrysadisass -lchrysagtkext -lchrysagui -lchrysacore 			\
-	-Lcommon/.libs -lcommon						\
-	-Lplugins/.libs -lplugins
+	-L.libs -lchrysacore
 
 
 chrysalide_LDADD = $(LIBINTL)
@@ -112,7 +60,7 @@ csrvmng_SOURCES =						\
 	csrvmng.c
 
 
-csrvmng_LDFLAGS = $(LIBXML_LIBS) -Lcommon/.libs -lcommon
+csrvmng_LDFLAGS = $(LIBXML_LIBS) -L.libs -lchrysacore
 
 
 
diff --git a/src/common/Makefile.am b/src/common/Makefile.am
index d2f6186..08c31cd 100755
--- a/src/common/Makefile.am
+++ b/src/common/Makefile.am
@@ -1,5 +1,5 @@
 
-lib_LTLIBRARIES = libcommon.la
+noinst_LTLIBRARIES = libcommon.la
 
 libcommon_la_SOURCES =					\
 	array.h array.c						\
diff --git a/src/plugins/Makefile.am b/src/plugins/Makefile.am
index 96558be..77deddc 100644
--- a/src/plugins/Makefile.am
+++ b/src/plugins/Makefile.am
@@ -1,5 +1,5 @@
 
-lib_LTLIBRARIES = libplugins.la
+noinst_LTLIBRARIES = libplugins.la
 
 libplugins_la_SOURCES =					\
 	context-int.h						\