6 files changed, 20 insertions, 21 deletions
diff --git a/plugins/checksum/Makefile.am b/plugins/checksum/Makefile.am
index 419c762f..4e911f28 100644
--- a/plugins/checksum/Makefile.am
+++ b/plugins/checksum/Makefile.am
@@ -2,6 +2,6 @@ libdir = $(hexchatlibdir)
 
 lib_LTLIBRARIES = checksum.la
 checksum_la_SOURCES = checksum.c
-checksum_la_LDFLAGS = -avoid-version -module 
-checksum_la_LIBADD = 
-AM_CPPFLAGS = $(COMMON_CFLAGS) -I$(srcdir)/../../src/common
+checksum_la_LDFLAGS = $(PLUGIN_LDFLAGS) -module
+checksum_la_LIBADD = $(GLIB_LIBS)
+checksum_la_CFLAGS = $(GLIB_CFLAGS) -I$(top_srcdir)/src/common
diff --git a/plugins/doat/Makefile.am b/plugins/doat/Makefile.am
index abfca29e..10b38cc6 100644
--- a/plugins/doat/Makefile.am
+++ b/plugins/doat/Makefile.am
@@ -2,7 +2,7 @@ libdir = $(hexchatlibdir)
 
 lib_LTLIBRARIES = doat.la
 doat_la_SOURCES = doat.c
-doat_la_LDFLAGS = -avoid-version -module 
+doat_la_LDFLAGS = $(PLUGIN_LDFLAGS) -module
 doat_la_LIBADD = 
-AM_CPPFLAGS = $(COMMON_CFLAGS) -I$(srcdir)/../../src/common
+doat_la_CFLAGS = -I$(top_srcdir)/src/common
 
diff --git a/plugins/fishlim/Makefile.am b/plugins/fishlim/Makefile.am
index 255ea0c3..c57a4de9 100644
--- a/plugins/fishlim/Makefile.am
+++ b/plugins/fishlim/Makefile.am
@@ -4,6 +4,6 @@ libdir = $(hexchatlibdir)
 
 lib_LTLIBRARIES = fishlim.la
 fishlim_la_SOURCES = fish.c irc.c keystore.c misc.c plugin_hexchat.c
-fishlim_la_LDFLAGS = -avoid-version -module 
-fishlim_la_LIBADD = 
-AM_CPPFLAGS = $(COMMON_CFLAGS) -I$(srcdir)/../../src/common
+fishlim_la_LDFLAGS = $(PLUGIN_LDFLAGS) -module
+fishlim_la_LIBADD = $(GLIB_LIBS) $(OPENSSL_LIBS)
+fishlim_la_CFLAGS = $(GLIB_CFLAGS) $(OPENSSL_CFLAGS) -I$(top_srcdir)/src/common
diff --git a/plugins/perl/Makefile.am b/plugins/perl/Makefile.am
index 79621549..7e7bbe68 100644
--- a/plugins/perl/Makefile.am
+++ b/plugins/perl/Makefile.am
@@ -6,12 +6,13 @@ libdir = $(hexchatlibdir)
 
 lib_LTLIBRARIES = perl.la
 perl_la_SOURCES = perl.c
-perl_la_LDFLAGS = -avoid-version -module 
-perl_la_LIBADD = $(PERL_LDFLAGS)
+perl_la_LDFLAGS = $(PERL_LDFLAGS) $(PLUGIN_LDFLAGS) -module
+perl_la_LIBADD = $(PERL_LIBS)
+perl_la_CFLAGS = $(PERL_CFLAGS) -I$(top_srcdir)/src/common
+
 BUILT_SOURCES = hexchat.pm.h irc.pm.h
-#CFLAGS = @CFLAGS@ -Wno-unused
-AM_CPPFLAGS = $(PERL_CFLAGS) $(COMMON_CFLAGS) -I$(srcdir)/../../src/common
-CLEANFILES = hexchat.pm.h irc.pm.h
+CLEANFILES = $(BUILT_SOURCES)
+
 hexchat.pm.h irc.pm.h: lib/HexChat.pm lib/Xchat.pm lib/HexChat/Embed.pm \
 	lib/HexChat/List/Network.pm lib/HexChat/List/Network/Entry.pm \
 	lib/HexChat/List/Network/AutoJoin.pm lib/IRC.pm
diff --git a/plugins/python/Makefile.am b/plugins/python/Makefile.am
index 259f2a0f..063f2009 100644
--- a/plugins/python/Makefile.am
+++ b/plugins/python/Makefile.am
@@ -1,10 +1,8 @@
-EXTRA_DIST = 
-
 libdir = $(hexchatlibdir)
 
 lib_LTLIBRARIES = python.la
 python_la_SOURCES = python.c
-python_la_LDFLAGS = -avoid-version -module 
-python_la_LIBADD = $(PY_LIBS)
-AM_CPPFLAGS = $(PY_CFLAGS) $(COMMON_CFLAGS) -I$(srcdir)/../../src/common
+python_la_LDFLAGS = $(PLUGIN_LDFLAGS) -module
+python_la_LIBADD = $(PY_LIBS) $(GLIB_LIBS)
+python_la_CFLAGS = $(PY_CFLAGS) $(GLIB_CFLAGS) -I$(top_srcdir)/src/common
 
diff --git a/plugins/sysinfo/Makefile.am b/plugins/sysinfo/Makefile.am
index 3e7ef1aa..4ac9c016 100644
--- a/plugins/sysinfo/Makefile.am
+++ b/plugins/sysinfo/Makefile.am
@@ -2,6 +2,6 @@ libdir = $(hexchatlibdir)
 
 lib_LTLIBRARIES = sysinfo.la
 sysinfo_la_SOURCES = match.c parse.c pci.c xsys.c
-sysinfo_la_LDFLAGS = -avoid-version -module
-sysinfo_la_LIBADD = -lpci
-AM_CPPFLAGS = $(COMMON_CFLAGS) -I$(srcdir)/../../src/common
+sysinfo_la_LDFLAGS = $(PLUGIN_LDFLAGS) -module
+sysinfo_la_LIBADD = $(LIBPCI_LIBS) $(GLIB_LIBS)
+sysinfo_la_CFLAGS = $(LIBPCI_CFLAGS) $(GLIB_CFLAGS) -I$(srcdir)/../../src/common