X-Git-Url: http://git.draconx.ca/gitweb/dxcommon.git/blobdiff_plain/02e6afe4c4956fd667dfefc04e8f129b5b84f709..cc589a8b1539e9515985081d9498dda2b6b6caf7:/Makefile.am

diff --git a/Makefile.am b/Makefile.am
index e859c4d..f811cde 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -6,7 +6,14 @@
 
 ACLOCAL_AMFLAGS = -I m4
 
-AM_CPPFLAGS = -I$(top_srcdir)/src
+AM_CPPFLAGS = -I$(top_srcdir)/src $(STUB_INCLUDES)
+
+EXTRA_DIST = scripts/fix-gnulib.pl scripts/fix-ltdl.pl \
+             scripts/bake-config.awk scripts/gen-options.awk \
+             scripts/gen-strtab.awk scripts/gen-tree.awk scripts/join.awk \
+             scripts/pe-subsys.awk src/copysym.h src/help.h src/pack.h \
+             src/tap.h t/getopt/getopt.h t/nls/gettext.h t/nls/mbswidth.h \
+             tests/data/gnulib.mk
 
 check_LIBRARIES = t/libdummy.a t/libempty.a
 
@@ -17,22 +24,19 @@ t_packtests_SOURCES = t/packtests.c src/pack.c src/tap.c
 t_packtestu64_SOURCES = t/packtestu64.c src/pack.c src/tap.c
 t_packtests64_SOURCES = t/packtests64.c src/pack.c src/tap.c
 
-if HAVE_STRUCT_OPTION
 check_PROGRAMS += t/helpdesc t/helpopt t/helpopt2
-
 if HAVE_WCWIDTH
 check_PROGRAMS += t/helpopt3
 endif
-endif
 
 EXTRA_LIBRARIES = libglohelp.a
 libglohelp_a_SOURCES = src/help.c
-libglohelp_a_CPPFLAGS = -DHELP_GETOPT_LONG_ONLY
+libglohelp_a_CPPFLAGS = $(AM_CPPFLAGS) -DHELP_GETOPT_LONG_ONLY
 libglohelp_a_SHORTNAME = glo
 
 EXTRA_LIBRARIES += libnlshelp.a
 libnlshelp_a_SOURCES = src/help.c t/nls/mbswidth.c
-libnlshelp_a_CPPFLAGS = -DENABLE_NLS -I$(top_srcdir)/t/nls
+libnlshelp_a_CPPFLAGS = $(AM_CPPFLAGS) -DENABLE_NLS -I$(top_srcdir)/t/nls
 libnlshelp_a_SHORTNAME = nls
 
 t_helpdesc_SOURCES = t/helpdesc.c src/help.c src/tap.c
@@ -53,11 +57,10 @@ EXTRA_t_copysym_DEPENDENCIES = $(t_copysym_LDADD)
 
 EXTRA_LIBRARIES += libnlscopysym.a
 libnlscopysym_a_SOURCES = src/copysym.c
-libnlscopysym_a_CPPFLAGS = -DENABLE_NLS
+libnlscopysym_a_CPPFLAGS = $(AM_CPPFLAGS) -DENABLE_NLS
 libnlscopysym_a_SHORTNAME = nls
 
 DISTCLEANFILES =
-EXTRA_DIST =
 SUFFIXES =
 
 include $(top_srcdir)/snippet/autotest.mk