From 3b4cdd10d6adf9155054989f41bb32759a9541c5 Mon Sep 17 00:00:00 2001
From: Cyrille Bagard <nocbos@gmail.com>
Date: Fri, 4 Dec 2015 19:08:06 +0100
Subject: Removed old rules producing noisy warnings with automake.

---
 .gitignore                   |  1 +
 ChangeLog                    | 11 +++++++++++
 plugins/pychrysa/Makefile.am | 27 ++-------------------------
 src/Makefile.am              |  2 +-
 4 files changed, 15 insertions(+), 26 deletions(-)

diff --git a/.gitignore b/.gitignore
index 210a8c2..f7ab09f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -28,6 +28,7 @@ m4/
 missing
 stamp-h
 stamp-h.in
+stamp-h1
 
 # Flex/Bison
 *_gram.[ch]
diff --git a/ChangeLog b/ChangeLog
index f950082..52cc5fa 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+15-12-04  Cyrille Bagard <nocbos@gmail.com>
+
+	* .gitignore:
+	Ignore the 'stamp-h1' file.
+
+	* plugins/pychrysa/Makefile.am:
+	Remove old rules producing noisy warnings with automake.
+
+	* src/Makefile.am:
+	Link libchrysadisass.so against $(LIBARCHIVE_LIBS).
+
 15-12-03  Cyrille Bagard <nocbos@gmail.com>
 
 	* .gitignore:
diff --git a/plugins/pychrysa/Makefile.am b/plugins/pychrysa/Makefile.am
index 59e876d..9616542 100644
--- a/plugins/pychrysa/Makefile.am
+++ b/plugins/pychrysa/Makefile.am
@@ -1,28 +1,6 @@
 
 pkglib_LTLIBRARIES = pychrysalide.la
 
-# -------- %< -------- %< -------- %< -------- %< --------
-pychrysa_la_SOURCES =					\
-	helpers.h helpers.c					\
-	plugin.h plugin.c					\
-	pychrysa.h pychrysa.c				\
-	quirks.h quirks.c
-
-pychrysa_la_LIBADD =					\
-	analysis/libpychrysaanalysis.la		\
-	arch/libpychrysaarch.la				\
-	debug/libpychrysadebug.la			\
-	format/libpychrysaformat.la			\
-	glibext/libpychrysaglibext.la		\
-	gtkext/libpychrysagtkext.la			\
-	gui/libpychrysagui.la
-
-pychrysa_la_LDFLAGS = -module -avoid-version $(LIBGTK_LIBS) $(LIBXML_LIBS) $(LIBPYTHON_LIBS) \
-	$(LIBPYGOBJECT_LIBS) \
-		-L../../src/.libs -L../../src/gui/.libs -lchrysagui -lchrysadisass -lchrysagtkext 	\
-	-L../../src/plugins/.libs -lplugins
-# -------- %< -------- %< -------- %< -------- %< --------
-
 pychrysalide_la_SOURCES =				\
 	helpers.h helpers.c					\
 	plugin.h plugin.c					\
@@ -40,13 +18,12 @@ pychrysalide_la_LIBADD =				\
 	gui/libpychrysagui.la
 
 pychrysalide_la_LDFLAGS = -module -avoid-version \
-	$(LIBPYTHON_LIBS) $(LIBSQLITE_LIBS) $(LIBARCHIVE_LIBS) \
+	$(LIBPYTHON_LIBS) $(LIBPYGOBJECT_LIBS) \
 	-L../../src/.libs -lchrysadisass -lchrysagui -lchrysagtkext -lchrysacore \
 	-L../../src/plugins/.libs -lplugins
 
 
-
-AM_CPPFLAGS = $(LIBGTK_CFLAGS) $(LIBXML_CFLAGS) $(LIBPYTHON_CFLAGS) $(LIBPYGOBJECT_CFLAGS) \
+AM_CPPFLAGS = $(LIBPYTHON_CFLAGS) $(LIBPYGOBJECT_CFLAGS) $(LIBGTK_CFLAGS) $(LIBXML_CFLAGS) \
 	-I../../src
 
 AM_CFLAGS = $(DEBUG_CFLAGS) $(WARNING_FLAGS) $(COMPLIANCE_FLAGS)
diff --git a/src/Makefile.am b/src/Makefile.am
index 30772c9..4940a6d 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -26,7 +26,7 @@ libchrysacore_la_LIBADD =				\
 
 libchrysadisass_la_SOURCES =
 
-libchrysadisass_la_LDFLAGS = $(LIBGTK_LIBS) $(LIBXML_LIBS)	\
+libchrysadisass_la_LDFLAGS = $(LIBGTK_LIBS) $(LIBXML_LIBS) $(LIBSQLITE_LIBS) $(LIBARCHIVE_LIBS) \
 	-Lcommon/.libs -lcommon -L.libs -lchrysaglibext -lrt
 
 libchrysadisass_la_LIBADD =				\
-- 
cgit v0.11.2-87-g4458