Reduced the number of generated shared objects.

20 files changed, 48 insertions, 82 deletions

diff --git a/plugins/androhelpers/Makefile.am b/plugins/androhelpers/Makefile.am
index 8366d33..031396e 100644
--- a/plugins/androhelpers/Makefile.am
+++ b/plugins/androhelpers/Makefile.am
@@ -7,9 +7,7 @@ libandrohelpers_la_SOURCES =			\
 	try_n_catch.h try_n_catch.c			\
 	switch.h switch.c
 
-libandrohelpers_la_LDFLAGS = -L$(top_srcdir)/src/.libs -L$(top_srcdir)/src/gui/.libs -lchrysagui \
-	-lchrysadisass -lchrysagtkext 	\
-	-L$(top_srcdir)/src/plugins/.libs -lplugins
+libandrohelpers_la_LDFLAGS = -L$(top_srcdir)/src/.libs -lchrysacore
 
 
 AM_CPPFLAGS = $(LIBGTK_CFLAGS) $(LIBXML_CFLAGS) $(LIBPYTHON_CFLAGS) $(LIBPYGOBJECT_CFLAGS) \
diff --git a/plugins/arm/Makefile.am b/plugins/arm/Makefile.am
index 3e691f4..597249f 100644
--- a/plugins/arm/Makefile.am
+++ b/plugins/arm/Makefile.am
@@ -20,8 +20,8 @@ libarm_la_LIBADD =						\
 
 libarm_la_CFLAGS = $(AM_CFLAGS)
 
-libarm_la_LDFLAGS = 					\
-	$(LIBPYTHON_LIBS) $(LIBPYGOBJECT_LIBS)
+libarm_la_LDFLAGS = $(LIBPYTHON_LIBS) $(LIBPYGOBJECT_LIBS) \
+	-L$(top_srcdir)/src/.libs -lchrysacore
 
 
 AM_CPPFLAGS = $(LIBGTK_CFLAGS) $(LIBPYTHON_CFLAGS) $(LIBPYGOBJECT_CFLAGS) $(LIBXML_CFLAGS) -I$(top_srcdir)/src
diff --git a/plugins/dalvik/Makefile.am b/plugins/dalvik/Makefile.am
index 2e042f2..2c44d7c 100644
--- a/plugins/dalvik/Makefile.am
+++ b/plugins/dalvik/Makefile.am
@@ -23,6 +23,8 @@ libdalvik_la_LIBADD =					\
 
 libdalvik_la_CFLAGS = $(AM_CFLAGS)
 
+libdalvik_la_LDFLAGS = -L$(top_srcdir)/src/.libs -lchrysacore
+
 
 AM_CPPFLAGS = $(LIBGTK_CFLAGS) $(LIBPYTHON_CFLAGS) $(LIBPYGOBJECT_CFLAGS) $(LIBXML_CFLAGS) -I$(top_srcdir)/src
 
diff --git a/plugins/dalvik/v35/Makefile.am b/plugins/dalvik/v35/Makefile.am
index a29d4a5..71466e2 100644
--- a/plugins/dalvik/v35/Makefile.am
+++ b/plugins/dalvik/v35/Makefile.am
@@ -1,5 +1,5 @@
 
-lib_LTLIBRARIES = libdalvik35.la
+noinst_LTLIBRARIES = libdalvik35.la
 
 libdalvik35_la_SOURCES =				\
 	instruction.h instruction.c			\
diff --git a/plugins/devdbg/Makefile.am b/plugins/devdbg/Makefile.am
index c53f302..ff62e1a 100644
--- a/plugins/devdbg/Makefile.am
+++ b/plugins/devdbg/Makefile.am
@@ -8,6 +8,8 @@ libspeed_la_SOURCES =					\
 
 libspeed_la_CFLAGS = $(AM_CFLAGS)
 
+libspeed_la_LDFLAGS = -L$(top_srcdir)/src/.libs -lchrysacore
+
 
 AM_CPPFLAGS = $(LIBGTK_CFLAGS) $(LIBXML_CFLAGS) -I$(top_srcdir)/src
 
diff --git a/plugins/dex/Makefile.am b/plugins/dex/Makefile.am
index a17b0f2..cfa07d7 100755
--- a/plugins/dex/Makefile.am
+++ b/plugins/dex/Makefile.am
@@ -14,8 +14,8 @@ libdex_la_SOURCES =						\
 libdex_la_LIBADD =						\
 	python/libdexpython.la
 
-libdex_la_LDFLAGS = 					\
-	$(LIBPYTHON_LIBS) $(LIBPYGOBJECT_LIBS)
+libdex_la_LDFLAGS = $(LIBPYTHON_LIBS) $(LIBPYGOBJECT_LIBS) \
+	-L$(top_srcdir)/src/.libs -lchrysacore
 
 
 AM_CPPFLAGS = $(LIBGTK_CFLAGS) $(LIBXML_CFLAGS) -I$(top_srcdir)/src
diff --git a/plugins/dexbnf/Makefile.am b/plugins/dexbnf/Makefile.am
index 08e0680..7daa761 100644
--- a/plugins/dexbnf/Makefile.am
+++ b/plugins/dexbnf/Makefile.am
@@ -16,8 +16,8 @@ libdexbnf_la_CFLAGS = $(AM_CFLAGS)
 libdexbnf_la_LIBADD =					\
 	python/libdexbnfpython.la
 
-libdexbnf_la_LDFLAGS =						\
-	$(LIBPYTHON_LIBS) $(LIBPYGOBJECT_LIBS)
+libdexbnf_la_LDFLAGS = $(LIBPYTHON_LIBS) $(LIBPYGOBJECT_LIBS) \
+	-L$(top_srcdir)/src/.libs -lchrysacore
 
 
 AM_CPPFLAGS = $(LIBGTK_CFLAGS) $(LIBXML_CFLAGS) -I$(top_srcdir)/src
diff --git a/plugins/elf/Makefile.am b/plugins/elf/Makefile.am
index 6d7fb58..415bd2b 100644
--- a/plugins/elf/Makefile.am
+++ b/plugins/elf/Makefile.am
@@ -18,8 +18,8 @@ libelf_la_SOURCES =						\
 libelf_la_LIBADD =						\
 	python/libelfpython.la
 
-libelf_la_LDFLAGS = 					\
-	$(LIBPYTHON_LIBS) $(LIBPYGOBJECT_LIBS)
+libelf_la_LDFLAGS = $(LIBPYTHON_LIBS) $(LIBPYGOBJECT_LIBS) \
+	-L$(top_srcdir)/src/.libs -lchrysacore
 
 
 AM_CPPFLAGS = $(LIBGTK_CFLAGS) $(LIBPYTHON_CFLAGS) $(LIBPYGOBJECT_CFLAGS) $(LIBXML_CFLAGS) -I$(top_srcdir)/src
diff --git a/plugins/fmtp/Makefile.am b/plugins/fmtp/Makefile.am
index d8b5e74..5a95306 100644
--- a/plugins/fmtp/Makefile.am
+++ b/plugins/fmtp/Makefile.am
@@ -9,6 +9,8 @@ libfmtp_la_SOURCES =					\
 
 libfmtp_la_CFLAGS = $(AM_CFLAGS)
 
+libfmtp_la_LDFLAGS = -L$(top_srcdir)/src/.libs -lchrysacore
+
 
 AM_CPPFLAGS = $(LIBGTK_CFLAGS) $(LIBXML_CFLAGS) -I$(top_srcdir)/src
 
diff --git a/plugins/libcsem/Makefile.am b/plugins/libcsem/Makefile.am
index a120120..2b29e81 100644
--- a/plugins/libcsem/Makefile.am
+++ b/plugins/libcsem/Makefile.am
@@ -9,6 +9,8 @@ liblibcsem_la_SOURCES =					\
 
 liblibcsem_la_CFLAGS = $(AM_CFLAGS)
 
+liblibcsem_la_LDFLAGS = -L$(top_srcdir)/src/.libs -lchrysacore
+
 
 AM_CPPFLAGS = $(LIBGTK_CFLAGS) $(LIBXML_CFLAGS) -I$(top_srcdir)/src -I$(top_srcdir)
 
diff --git a/plugins/mobicore/Makefile.am b/plugins/mobicore/Makefile.am
index b495df3..8814d5c 100644
--- a/plugins/mobicore/Makefile.am
+++ b/plugins/mobicore/Makefile.am
@@ -12,6 +12,8 @@ libmobicore_la_SOURCES =				\
 
 libmobicore_la_CFLAGS = $(AM_CFLAGS)
 
+libmobicore_la_LDFLAGS = -L$(top_srcdir)/src/.libs -lchrysacore
+
 
 AM_CPPFLAGS = $(LIBGTK_CFLAGS) $(LIBXML_CFLAGS) -I$(top_srcdir)/src
 
diff --git a/plugins/pychrysalide/Makefile.am b/plugins/pychrysalide/Makefile.am
index ede96c9..b023726 100644
--- a/plugins/pychrysalide/Makefile.am
+++ b/plugins/pychrysalide/Makefile.am
@@ -25,8 +25,7 @@ pychrysalide_la_LIBADD =				\
 
 pychrysalide_la_LDFLAGS = -module -avoid-version \
 	$(LIBPYTHON_LIBS) $(LIBPYGOBJECT_LIBS) \
-	-L$(top_srcdir)/src/.libs -lchrysadisass -lchrysagui -lchrysagtkext -lchrysacore \
-	-L$(top_srcdir)/src/plugins/.libs -lplugins
+	-L$(top_srcdir)/src/.libs -lchrysacore
 
 
 AM_CPPFLAGS = $(LIBPYTHON_CFLAGS) $(LIBPYGOBJECT_CFLAGS) $(LIBGTK_CFLAGS) $(LIBXML_CFLAGS) \
diff --git a/plugins/readdex/Makefile.am b/plugins/readdex/Makefile.am
index 68feeff..b6c53a9 100644
--- a/plugins/readdex/Makefile.am
+++ b/plugins/readdex/Makefile.am
@@ -12,6 +12,9 @@ libreaddex_la_SOURCES =					\
 
 libreaddex_la_CFLAGS = $(AM_CFLAGS)
 
+libreaddex_la_LDFLAGS = -L$(top_srcdir)/plugins/fmtp/.libs -lfmtp \
+	-L$(top_srcdir)/src/.libs -lchrysacore
+
 
 AM_CPPFLAGS = $(LIBGTK_CFLAGS) $(LIBXML_CFLAGS) -I$(top_srcdir)/src
 
diff --git a/plugins/readelf/Makefile.am b/plugins/readelf/Makefile.am
index a5c34f8..d14429c 100644
--- a/plugins/readelf/Makefile.am
+++ b/plugins/readelf/Makefile.am
@@ -12,7 +12,9 @@ libreadelf_la_SOURCES =					\
 
 libreadelf_la_CFLAGS = $(AM_CFLAGS)
 
-libreadelf_la_LDFLAGS = -L$(top_srcdir)/plugins/fmtp/.libs -lfmtp
+libreadelf_la_LDFLAGS = -L$(top_srcdir)/plugins/fmtp/.libs -lfmtp \
+	-L$(top_srcdir)/src/.libs -lchrysacore
+
 
 AM_CPPFLAGS = $(LIBGTK_CFLAGS) $(LIBXML_CFLAGS) -I$(top_srcdir)/src -I$(top_srcdir)
 
diff --git a/plugins/readmc/Makefile.am b/plugins/readmc/Makefile.am
index 15462e6..9404d55 100644
--- a/plugins/readmc/Makefile.am
+++ b/plugins/readmc/Makefile.am
@@ -13,7 +13,9 @@ libreadmc_la_SOURCES =					\
 
 libreadmc_la_CFLAGS = $(AM_CFLAGS)
 
-libreadmc_la_LDFLAGS = -L$(top_srcdir)/plugins/fmtp/.libs -lfmtp
+libreadmc_la_LDFLAGS = -L$(top_srcdir)/plugins/fmtp/.libs -lfmtp \
+	-L$(top_srcdir)/src/.libs -lchrysacore
+
 
 AM_CPPFLAGS = $(LIBGTK_CFLAGS) $(LIBXML_CFLAGS) -I$(top_srcdir)/src -I$(top_srcdir)
 
diff --git a/plugins/ropgadgets/Makefile.am b/plugins/ropgadgets/Makefile.am
index fed8bd4..842ff13 100644
--- a/plugins/ropgadgets/Makefile.am
+++ b/plugins/ropgadgets/Makefile.am
@@ -11,6 +11,8 @@ libropgadgets_la_SOURCES =				\
 
 libropgadgets_la_CFLAGS = $(AM_CFLAGS)
 
+libropgadgets_la_LDFLAGS = -L$(top_srcdir)/src/.libs -lchrysacore
+
 
 AM_CPPFLAGS = $(LIBGTK_CFLAGS) $(LIBXML_CFLAGS) -I$(top_srcdir)/src
 
diff --git a/plugins/stackvars/Makefile.am b/plugins/stackvars/Makefile.am
index 527b75d..9db9d0e 100644
--- a/plugins/stackvars/Makefile.am
+++ b/plugins/stackvars/Makefile.am
@@ -7,6 +7,8 @@ libstackvars_la_SOURCES =				\
 
 libstackvars_la_CFLAGS = $(AM_CFLAGS)
 
+libstackvars_la_LDFLAGS = -L$(top_srcdir)/src/.libs -lchrysacore
+
 
 AM_CPPFLAGS = $(LIBGTK_CFLAGS) $(LIBXML_CFLAGS) -I$(top_srcdir)/src
 
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						\