9 files changed, 19 insertions, 29 deletions
diff --git a/plugins/imklog/Makefile.am b/plugins/imklog/Makefile.am
index 23530758..11e00962 100644
--- a/plugins/imklog/Makefile.am
+++ b/plugins/imklog/Makefile.am
@@ -1,8 +1,6 @@
 pkglib_LTLIBRARIES = imklog.la
 
-imklog_la_SOURCES = imklog.c module.h ksym.c ksyms.h ksym_mod.c ../../module-template.h
-imklog_la_CPPFLAGS = -I$(srcdir)/../.. $(pthreads_cflags)
+imklog_la_SOURCES = imklog.c imklog.h module.h ksym.c ksyms.h ksym_mod.c
+imklog_la_CPPFLAGS = -I$(top_srcdir) $(pthreads_cflags)
 imklog_la_LDFLAGS = -module -avoid-version
 imklog_la_LIBADD = 
-
-EXTRA_DIST = 
diff --git a/plugins/immark/Makefile.am b/plugins/immark/Makefile.am
index 7a53d594..3dc0e408 100644
--- a/plugins/immark/Makefile.am
+++ b/plugins/immark/Makefile.am
@@ -1,8 +1,6 @@
 pkglib_LTLIBRARIES = immark.la
 
-immark_la_SOURCES = immark.c immark.h ../../module-template.h
-immark_la_CPPFLAGS = -I$(srcdir)/../.. $(pthreads_cflags)
+immark_la_SOURCES = immark.c immark.h
+immark_la_CPPFLAGS = -I$(top_srcdir) $(pthreads_cflags)
 immark_la_LDFLAGS = -module -avoid-version
 immark_la_LIBADD = 
-
-EXTRA_DIST = 
diff --git a/plugins/imtcp/Makefile.am b/plugins/imtcp/Makefile.am
index e6076cb9..fe43cd98 100644
--- a/plugins/imtcp/Makefile.am
+++ b/plugins/imtcp/Makefile.am
@@ -1,8 +1,6 @@
 pkglib_LTLIBRARIES = imtcp.la
 
-imtcp_la_SOURCES = imtcp.c ../../module-template.h
-imtcp_la_CPPFLAGS = -I$(srcdir)/../.. $(pthreads_cflags)
+imtcp_la_SOURCES = imtcp.c
+imtcp_la_CPPFLAGS = -I$(top_srcdir) $(pthreads_cflags)
 imtcp_la_LDFLAGS = -module -avoid-version
 imtcp_la_LIBADD = 
-
-EXTRA_DIST = 
diff --git a/plugins/imudp/Makefile.am b/plugins/imudp/Makefile.am
index 6e83dc9f..53fdad16 100644
--- a/plugins/imudp/Makefile.am
+++ b/plugins/imudp/Makefile.am
@@ -1,8 +1,6 @@
 pkglib_LTLIBRARIES = imudp.la
 
-imudp_la_SOURCES = imudp.c ../../module-template.h
-imudp_la_CPPFLAGS = -I$(srcdir)/../.. $(pthreads_cflags)
+imudp_la_SOURCES = imudp.c
+imudp_la_CPPFLAGS = -I$(top_srcdir) $(pthreads_cflags)
 imudp_la_LDFLAGS = -module -avoid-version
 imudp_la_LIBADD = 
-
-EXTRA_DIST = 
diff --git a/plugins/imuxsock/Makefile.am b/plugins/imuxsock/Makefile.am
index 4b885090..e165bb7d 100644
--- a/plugins/imuxsock/Makefile.am
+++ b/plugins/imuxsock/Makefile.am
@@ -1,8 +1,6 @@
 pkglib_LTLIBRARIES = imuxsock.la
 
-imuxsock_la_SOURCES = imuxsock.c ../../module-template.h
-imuxsock_la_CPPFLAGS = -I$(srcdir)/../.. $(pthreads_cflags)
+imuxsock_la_SOURCES = imuxsock.c
+imuxsock_la_CPPFLAGS = -I$(top_srcdir) $(pthreads_cflags)
 imuxsock_la_LDFLAGS = -module -avoid-version
 imuxsock_la_LIBADD = 
-
-EXTRA_DIST = 
diff --git a/plugins/omgssapi/Makefile.am b/plugins/omgssapi/Makefile.am
index 3b568d3d..5280a1ce 100644
--- a/plugins/omgssapi/Makefile.am
+++ b/plugins/omgssapi/Makefile.am
@@ -1,6 +1,6 @@
 pkglib_LTLIBRARIES = omgssapi.la
 
-omgssapi_la_SOURCES = omgssapi.c omgssapi.h ../../module-template.h
-omgssapi_la_CPPFLAGS = $(pgsql_cflags) -I$(srcdir)/../..
+omgssapi_la_SOURCES = omgssapi.c
+omgssapi_la_CPPFLAGS = -I$(top_srcdir) $(pthreads_cflags)
 omgssapi_la_LDFLAGS = -module -avoid-version
 omgssapi_la_LIBADD = $(gss_libs)
diff --git a/plugins/ommysql/Makefile.am b/plugins/ommysql/Makefile.am
index 6397de5b..3b4e6d75 100644
--- a/plugins/ommysql/Makefile.am
+++ b/plugins/ommysql/Makefile.am
@@ -1,7 +1,7 @@
 pkglib_LTLIBRARIES = ommysql.la
 
-ommysql_la_SOURCES = ommysql.c ommysql.h ../../module-template.h
-ommysql_la_CPPFLAGS = $(mysql_cflags) -I$(srcdir)/../.. $(pthreads_cflags)
+ommysql_la_SOURCES = ommysql.c ommysql.h
+ommysql_la_CPPFLAGS = -I$(top_srcdir) $(mysql_cflags) $(pthreads_cflags)
 ommysql_la_LDFLAGS = -module -avoid-version
 ommysql_la_LIBADD = $(mysql_libs)
 
diff --git a/plugins/ompgsql/Makefile.am b/plugins/ompgsql/Makefile.am
index 5206b36d..b2e3effa 100644
--- a/plugins/ompgsql/Makefile.am
+++ b/plugins/ompgsql/Makefile.am
@@ -1,7 +1,7 @@
 pkglib_LTLIBRARIES = ompgsql.la
 
-ompgsql_la_SOURCES = ompgsql.c ompgsql.h ../../module-template.h
-ompgsql_la_CPPFLAGS = $(pgsql_cflags) -I$(srcdir)/../..
+ompgsql_la_SOURCES = ompgsql.c ompgsql.h
+ompgsql_la_CPPFLAGS = -I$(top_srcdir) $(pgsql_cflags)
 ompgsql_la_LDFLAGS = -module -avoid-version
 ompgsql_la_LIBADD = $(pgsql_libs)
 
diff --git a/plugins/omtesting/Makefile.am b/plugins/omtesting/Makefile.am
index d7c9663b..7e376683 100644
--- a/plugins/omtesting/Makefile.am
+++ b/plugins/omtesting/Makefile.am
@@ -1,6 +1,6 @@
 pkglib_LTLIBRARIES = omtesting.la
 
-omtesting_la_SOURCES = omtesting.c omtesting.h ../../module-template.h
-omtesting_la_CPPFLAGS = $(mysql_cflags) -I$(srcdir)/../.. $(pthreads_cflags)
+omtesting_la_SOURCES = omtesting.c
+omtesting_la_CPPFLAGS = -I$(top_srcdir) $(pthreads_cflags)
 omtesting_la_LDFLAGS = -module -avoid-version
-omtesting_la_LIBADD = $(mysql_libs)
+omtesting_la_LIBADD =