summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--src/Makefile.am4
2 files changed, 8 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 0fe93d3..7fcc79d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
13-06-08 Cyrille Bagard <nocbos@gmail.com>
+ * src/Makefile.am:
+ Fix parallel building of top targets using the .NOTPARALLEL keyword.
+
+13-06-08 Cyrille Bagard <nocbos@gmail.com>
+
* src/analysis/disass/disassembler.c:
* src/analysis/disass/fetch.c:
* src/analysis/disass/fetch.h:
diff --git a/src/Makefile.am b/src/Makefile.am
index 8eff972..20db26a 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -3,6 +3,8 @@ lib_LTLIBRARIES = libchrysaglibext.la libchrysadisass.la libchrysagtkext.la libc
bin_PROGRAMS = chrysalide
+.NOTPARALLEL: $(lib_LTLIBRARIES) $(bin_PROGRAMS)
+
############################################################
@@ -104,7 +106,7 @@ chrysalide_LDADD = $(LIBINTL) \
# Le reste du monde
############################################################
-# gtkext doit être traité en premier, à cause des marshals GLib
+# glibext doit être traité en premier, à cause des marshals GLib
SUBDIRS = glibext gtkext analysis arch format common debug decomp dialogs gui plugins