summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCyrille Bagard <nocbos@gmail.com>2010-07-17 14:52:52 (GMT)
committerCyrille Bagard <nocbos@gmail.com>2010-07-17 14:52:52 (GMT)
commitf150f36ee0297b4499a41bbbfc06699cd2f72db5 (patch)
tree430391621adea21385a6d8919c05e63dd05bbad3
parentbd8c461d2dcdc14fd9b2969cc832c33792fd38cd (diff)
Reorganized the debug directories.
git-svn-id: svn://svn.gna.org/svn/chrysalide/trunk@174 abbe820e-26c8-41b2-8c08-b7b2b41f8b0a
-rw-r--r--ChangeLog8
-rw-r--r--src/Makefile.am12
-rwxr-xr-xsrc/debug/Makefile.am6
-rw-r--r--src/debug/ptrace/Makefile.am4
-rw-r--r--src/debug/remgdb/Makefile.am6
5 files changed, 22 insertions, 14 deletions
diff --git a/ChangeLog b/ChangeLog
index 3ecbcc9..1b9f663 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
10-07-17 Cyrille Bagard <nocbos@gmail.com>
+ * src/debug/Makefile.am:
+ * src/debug/ptrace/Makefile.am:
+ * src/debug/remgdb/Makefile.am:
+ * src/Makefile.am:
+ Reorganize the debug directories.
+
+10-07-17 Cyrille Bagard <nocbos@gmail.com>
+
* src/glibext/gcodebuffer.c:
* src/glibext/gcodebuffer.h:
* src/gtkext/gtkblockview.c:
diff --git a/src/Makefile.am b/src/Makefile.am
index e848c2b..6d3bac1 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -16,9 +16,12 @@ liboidadisass_la_SOURCES =
liboidadisass_la_LDFLAGS = $(LIBGTK_LIBS) $(LIBXML_LIBS) \
-Lcommon/.libs -lcommon
-liboidadisass_la_LIBADD = \
- analysis/libanalysis.la \
- arch/libarch.la \
+liboidadisass_la_LIBADD = \
+ analysis/libanalysis.la \
+ arch/libarch.la \
+ debug/libdebug.la \
+ debug/remgdb/libdebugremgdb.la \
+ debug/ptrace/libdebugptrace.la \
format/libformat.la
@@ -96,9 +99,6 @@ openida_LDFLAGS = $(LIBGTK_LIBS) -L/usr/X11R6/lib -ldl -lm $(LIBXML_LIBS) `pkg-c
openida_LDADD = $(LIBINTL) \
- debug/libdebug.a \
- debug/remgdb/libdebugremgdb.a \
- debug/ptrace/libdebugptrace.a \
dialogs/libdialogs.a
diff --git a/src/debug/Makefile.am b/src/debug/Makefile.am
index 3f98a9a..7a19221 100755
--- a/src/debug/Makefile.am
+++ b/src/debug/Makefile.am
@@ -1,10 +1,10 @@
-lib_LIBRARIES = libdebug.a
+noinst_LTLIBRARIES = libdebug.la
-libdebug_a_SOURCES = \
+libdebug_la_SOURCES = \
debuggers.h debuggers.c
-libdebug_a_CFLAGS = $(AM_CFLAGS)
+libdebug_la_CFLAGS = $(AM_CFLAGS)
INCLUDES = $(LIBGTK_CFLAGS) $(LIBXML_CFLAGS)
diff --git a/src/debug/ptrace/Makefile.am b/src/debug/ptrace/Makefile.am
index 0512721..9e03407 100644
--- a/src/debug/ptrace/Makefile.am
+++ b/src/debug/ptrace/Makefile.am
@@ -1,7 +1,7 @@
-lib_LIBRARIES = libdebugptrace.a
+noinst_LTLIBRARIES = libdebugptrace.la
-libdebugptrace_a_SOURCES = \
+libdebugptrace_la_SOURCES = \
options.h options.c \
ptrace.h ptrace.c
diff --git a/src/debug/remgdb/Makefile.am b/src/debug/remgdb/Makefile.am
index ab6715d..b2829c9 100644
--- a/src/debug/remgdb/Makefile.am
+++ b/src/debug/remgdb/Makefile.am
@@ -1,14 +1,14 @@
-lib_LIBRARIES = libdebugremgdb.a
+noinst_LTLIBRARIES = libdebugremgdb.la
-libdebugremgdb_a_SOURCES = \
+libdebugremgdb_la_SOURCES = \
gdb.h gdb.c \
packet.h packet.c \
stream-int.h \
stream.h stream.c \
tcp.h tcp.c
-libdebugremgdb_a_CFLAGS = $(AM_CFLAGS)
+libdebugremgdb_la_CFLAGS = $(AM_CFLAGS)
INCLUDES = $(LIBGTK_CFLAGS) $(LIBXML_CFLAGS)