* A lot of Makefile.am updates to try to get 'make dist' and 'make distcheck'

  to work as expected.

3 files changed, 25 insertions, 12 deletions

diff --git a/src/pacman/Makefile.am b/src/pacman/Makefile.am
index 9d82bf4c..ee03372d 100644
--- a/src/pacman/Makefile.am
+++ b/src/pacman/Makefile.am
@@ -1,25 +1,36 @@
+SUBDIRS = po
+
 bin_PROGRAMS = pacman
 
 if LINKSTATIC
 bin_PROGRAMS += pacman.static
 endif
 
-SUBDIRS = po
-
 localedir = $(datadir)/locale
 DEFS = -DLOCALEDIR=\"$(localedir)\" @DEFS@
-
-AM_CFLAGS = -D_GNU_SOURCE -I$(top_srcdir)/lib/libalpm $(CFLAGS) 
-
-pacman_SOURCES = util.c log.c package.c downloadprog.c trans.c add.c \
-	remove.c upgrade.c query.c sync.c conf.c deptest.c pacman.c
-
-pacman_static_SOURCES = $(pacman_SOURCES)
+INCLUDES = -I$(top_srcdir)/lib/libalpm
+
+AM_CFLAGS = -D_GNU_SOURCE $(CFLAGS) 
+
+pacman_SOURCES = \
+	add.h add.c \
+	conf.h conf.c \
+	deptest.h deptest.c \
+	downloadprog.h downloadprog.c \
+	log.h log.c \
+	package.h package.c \
+	pacman.c \
+	query.h query.c \
+	remove.h remove.c \
+	sync.h sync.c \
+	trans.h trans.c \
+	upgrade.h upgrade.c \
+	util.h util.c
 
 pacman_LDADD = $(top_builddir)/lib/libalpm/.libs/libalpm.la \
 			   -ldownload
 
+pacman_static_SOURCES = $(pacman_SOURCES)
+pacman_static_LDFLAGS = $(LDFLAGS) -all-static
 pacman_static_LDADD = $(top_builddir)/lib/libalpm/.libs/libalpm.la \
 					  -ldownload
-
-pacman_static_LDFLAGS = $(LDFLAGS) -all-static
diff --git a/src/pacman/log.h b/src/pacman/log.h
index 01a507c3..3317709e 100644
--- a/src/pacman/log.h
+++ b/src/pacman/log.h
@@ -21,6 +21,8 @@
 #ifndef _PM_LOG_H
 #define _PM_LOG_H
 
+/* TODO these are illegal in ISO C, thus the reason -pedantic was never used
+ * as a compile flag for the pacman side of things (named variadic macros) */
 #define MSG(line, fmt, args...) pm_fprintf(stdout, line, fmt, ##args)
 #define ERR(line, fmt, args...) do { \
 	pm_fprintf(stderr, line, _("error: ")); \
diff --git a/src/util/Makefile.am b/src/util/Makefile.am
index 8f3a98bd..b0319694 100644
--- a/src/util/Makefile.am
+++ b/src/util/Makefile.am
@@ -1,6 +1,6 @@
 bin_PROGRAMS = vercmp testpkg
 
-AM_CFLAGS = -I$(top_srcdir)/lib/libalpm
+INCLUDES = -I$(top_srcdir)/lib/libalpm
 
 vercmp_SOURCES = vercmp.c
 vercmp_LDADD = $(top_builddir)/lib/libalpm/.libs/libalpm.so