Changed the way the program is built.

git-svn-id: svn://svn.gna.org/svn/chrysalide/trunk@62 abbe820e-26c8-41b2-8c08-b7b2b41f8b0a

10 files changed, 62 insertions, 37 deletions

diff --git a/src/Makefile.am b/src/Makefile.am
index 4f4aa1a..b7c2fa5 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,6 +1,49 @@
 
+lib_LTLIBRARIES = liboidadisass.la liboidagtkext.la
+
 bin_PROGRAMS=openida
 
+
+
+############################################################
+# Bibliothèques dynamiques
+############################################################
+
+#--- liboidadisas
+
+liboidadisass_la_SOURCES =
+
+liboidadisass_la_LDFLAGS = $(LIBGTK_LIBS) $(LIBXML_LIBS)	\
+	-Lcommon/.libs -lcommon
+
+liboidadisass_la_LIBADD =						\
+	analysis/libanalysis.la						\
+	arch/libarch.la								\
+	arch/x86/libarchx86.la						\
+	format/libformat.la							\
+	format/dwarf/libformatdwarf.la				\
+	format/elf/libformatelf.la					\
+	format/java/libformatjava.la				\
+	format/mangling/libformatmangling.la		\
+	format/pe/libformatpe.la
+
+
+#--- liboidagtkext
+
+liboidagtkext_la_SOURCES =
+
+liboidagtkext_la_LDFLAGS = $(LIBGTK_LIBS)		\
+	-L.libs -loidadisass
+
+liboidagtkext_la_LIBADD =						\
+	gtkext/libgtkext.la
+
+
+
+############################################################
+# Programme principal
+############################################################
+
 openida_SOURCES = 						\
 	dlg_sections.h dlg_sections.c		\
 	editor.c							\
@@ -20,28 +63,22 @@ AM_CFLAGS = $(DEBUG_CFLAGS) $(WARNING_FLAGS) $(COMPLIANCE_FLAGS)
 
 
 openida_LDFLAGS = $(LIBGTK_LIBS) -L/usr/X11R6/lib -ldl -lm $(LIBXML_LIBS) `pkg-config --libs gthread-2.0` $(LIBPYTHON_LIBS) $(LIBVTE_LIBS) \
-	-Larch/.libs -larch							\
+	-L.libs -loidadisass -loidagtkext			\
 	-Lcommon/.libs -lcommon						\
 	-Lpanel/.libs -lpanel						\
-	-Lgtkext/.libs -lgtkext						\
-	-Lanalysis/.libs -lanalysis					\
-	-Lformat/.libs -lformat						\
-	-Lformat/dwarf/.libs -lformatdwarf			\
-	-Lformat/elf/.libs -lformatelf				\
-	-Lformat/java/.libs -lformatjava			\
-	-Lformat/mangling/.libs -lformatmangling	\
-	-Lformat/pe/.libs -lformatpe				\
 	-Lplugins/.libs -lplugins
 
 
 openida_LDADD = $(LIBINTL) 				\
 	debug/libdebug.a					\
-	debug/ptrace/libdebugptrace.a		\
-	plugins/pyoida/libpyoida.a			\
-	common/libcommon.a
+	debug/ptrace/libdebugptrace.a
+
+
 
+############################################################
+# Le reste du monde
+############################################################
 
 # gtkext doit être traité en premier, à cause des marshals GLib
-# common doit être passé avant analysis
 
-SUBDIRS = arch format common analysis debug gtkext panel plugins
+SUBDIRS = gtkext analysis arch format common debug panel plugins
diff --git a/src/analysis/Makefile.am b/src/analysis/Makefile.am
index cc7675b..065704a 100755
--- a/src/analysis/Makefile.am
+++ b/src/analysis/Makefile.am
@@ -11,10 +11,7 @@ libanalysis_la_SOURCES =				\
 	prototype.h prototype.c				\
 	variable.h variable.c
 
-libanalysis_la_LDFLAGS = $(LIBGTK_LIBS)	$(LIBXML_LIBS) \
-	-L../common/.libs -lcommon			\
-	-L../format/.libs -lformat			\
-	-L../plugins/.libs -lplugins
+libanalysis_la_LDFLAGS = 
 
 
 INCLUDES = $(LIBGTK_CFLAGS) $(LIBXML_CFLAGS)
diff --git a/src/arch/Makefile.am b/src/arch/Makefile.am
index ad5e3c6..da522df 100644
--- a/src/arch/Makefile.am
+++ b/src/arch/Makefile.am
@@ -9,8 +9,7 @@ libarch_la_SOURCES =					\
 	processor-int.h						\
 	processor.h processor.c
 
-libarch_la_LIBADD =						\
-	x86/libarchx86.a
+libarch_la_LIBADD =	
 
 libarch_la_LDFLAGS = 
 
diff --git a/src/arch/x86/Makefile.am b/src/arch/x86/Makefile.am
index e2847ab..95298b9 100644
--- a/src/arch/x86/Makefile.am
+++ b/src/arch/x86/Makefile.am
@@ -1,7 +1,7 @@
 
-lib_LIBRARIES = libarchx86.a
+lib_LTLIBRARIES = libarchx86.la
 
-libarchx86_a_SOURCES =					\
+libarchx86_la_SOURCES =					\
 	instruction.h						\
 	op_adc.c							\
 	op_add.c							\
@@ -40,7 +40,7 @@ libarchx86_a_SOURCES =					\
 	operand.h operand.c					\
 	processor.h processor.c
 
-libarchx86_a_CFLAGS = $(AM_CFLAGS)
+libarchx86_la_CFLAGS = $(AM_CFLAGS)
 
 
 INCLUDES = $(LIBGTK_CFLAGS)
diff --git a/src/format/Makefile.am b/src/format/Makefile.am
index 41d7120..cad15c5 100644
--- a/src/format/Makefile.am
+++ b/src/format/Makefile.am
@@ -7,12 +7,7 @@ libformat_la_SOURCES =					\
 	dbg_format.h dbg_format.c			\
 	dbg_format-int.h
 
-libformat_la_LDFLAGS = $(LIBGTK_LIBS)	\
-	-Ldwarf/.libs -lformatdwarf			\
-	-Lelf/.libs -lformatelf				\
-	-Ljava/.libs -lformatjava			\
-	-Lmangling/.libs -lformatmangling	\
-	-Lpe/.libs -lformatpe
+libformat_la_LDFLAGS = 
 
 
 INCLUDES = $(LIBGTK_CFLAGS)
diff --git a/src/format/elf/Makefile.am b/src/format/elf/Makefile.am
index c64fc5c..680afd7 100644
--- a/src/format/elf/Makefile.am
+++ b/src/format/elf/Makefile.am
@@ -8,9 +8,7 @@ libformatelf_la_SOURCES =				 \
 	strings.h strings.c					\
 	symbol.h symbol.c
 
-libformatelf_la_LDFLAGS = $(LIBGTK_LIBS)	\
-	-L../../common/.libs -common			\
-	-L../../arch/.libs -larch
+libformatelf_la_LDFLAGS = 
 
 
 INCLUDES = $(LIBGTK_CFLAGS)
diff --git a/src/format/java/Makefile.am b/src/format/java/Makefile.am
index 9f59f61..133eae0 100755
--- a/src/format/java/Makefile.am
+++ b/src/format/java/Makefile.am
@@ -9,7 +9,7 @@ libformatjava_la_SOURCES =				\
 	method.h method.c					\
 	pool.h pool.c
 
-libformatjava_la_LDFLAGS = $(LIBGTK_LIBS)
+libformatjava_la_LDFLAGS = 
 
 
 INCLUDES = $(LIBGTK_CFLAGS)
diff --git a/src/format/mangling/Makefile.am b/src/format/mangling/Makefile.am
index 0823ffc..a52a174 100644
--- a/src/format/mangling/Makefile.am
+++ b/src/format/mangling/Makefile.am
@@ -11,7 +11,7 @@ libformatmangling_la_SOURCES =			\
 	itanium_gram.y						\
 	itanium_tok.l
 
-libformatmangling_la_LDFLAGS = $(LIBGTK_LIBS)
+libformatmangling_la_LDFLAGS = 
 
 
 INCLUDES = $(LIBGTK_CFLAGS)
diff --git a/src/format/pe/Makefile.am b/src/format/pe/Makefile.am
index 9167577..c70a80f 100755
--- a/src/format/pe/Makefile.am
+++ b/src/format/pe/Makefile.am
@@ -5,7 +5,7 @@ libformatpe_la_SOURCES =				\
 	e_pe.h e_pe.c						\
 	pe-int.h
 
-libformatpe_la_LDFLAGS = $(LIBGTK_LIBS)
+libformatpe_la_LDFLAGS = 
 
 
 INCLUDES = 
diff --git a/src/gtkext/Makefile.am b/src/gtkext/Makefile.am
index dbf1fbc..4df0ffe 100644
--- a/src/gtkext/Makefile.am
+++ b/src/gtkext/Makefile.am
@@ -13,8 +13,7 @@ libgtkext_la_SOURCES =					\
 	iodamarshal.h iodamarshal.c			\
 	support.h support.c
 
-libgtkext_la_LDFLAGS = $(LIBGTK_LIBS)	\
-	-L../analysis/.libs -lanalysis
+libgtkext_la_LDFLAGS = 
 
 
 INCLUDES = $(LIBGTK_CFLAGS)