From 18b5390a33e7f3eeacf1d2dfc748dbc668414e56 Mon Sep 17 00:00:00 2001 From: Gergely Polonkai Date: Tue, 10 Sep 2013 02:52:03 +0200 Subject: [PATCH] Made some more tweaks so `make dist` generates a working distribution --- Makefile.am | 2 +- configure.ac | 2 ++ src/Makefile.am | 2 +- swe/Makefile.am | 1 + swe/doc/Makefile.am | 1 + swe/src/Makefile.am | 21 +++++++++++++++++++++ 6 files changed, 27 insertions(+), 2 deletions(-) create mode 100644 swe/Makefile.am create mode 100644 swe/doc/Makefile.am diff --git a/Makefile.am b/Makefile.am index 4466714..3e1f27e 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,5 +1,5 @@ ACLOCAL_AMFLAGS = -I m4 -SUBDIRS = swe/src src po docs/reference/swe-glib data +SUBDIRS = swe swe/src swe/doc src po docs/reference/swe-glib data DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc diff --git a/configure.ac b/configure.ac index 09597f1..5f1af6f 100644 --- a/configure.ac +++ b/configure.ac @@ -41,7 +41,9 @@ AC_SUBST(LIBSWE_GLIB_LIBS) AC_CONFIG_FILES([ Makefile + swe/Makefile swe/src/Makefile + swe/doc/Makefile src/Makefile data/Makefile po/Makefile.in diff --git a/src/Makefile.am b/src/Makefile.am index 15c900f..f1f4ff4 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -22,7 +22,7 @@ BUILT_SOURCES = gswe-enumtypes.c gswe-enumtypes.h CLEANFILES = $(BUILT_SOURCES) -EXTRA_DIST = gswe-enumtypes.h.template gswe-enumtypes.c.template +EXTRA_DIST = gswe-enumtypes.h.template gswe-enumtypes.c.template swe-glib-private.h gswe-enumtypes.h: $(gswe_headers) gswe-enumtypes.h.template $(GLIB_MKENUMS) --template $(filter %.template,$^) $(filter-out %.template,$^) > \ diff --git a/swe/Makefile.am b/swe/Makefile.am new file mode 100644 index 0000000..952fde6 --- /dev/null +++ b/swe/Makefile.am @@ -0,0 +1 @@ +EXTRA_DIST = README diff --git a/swe/doc/Makefile.am b/swe/doc/Makefile.am new file mode 100644 index 0000000..bd511bf --- /dev/null +++ b/swe/doc/Makefile.am @@ -0,0 +1 @@ +EXTRA_DIST = swephprg.pdf swisseph.pdf diff --git a/swe/src/Makefile.am b/swe/src/Makefile.am index ac4d367..7082208 100644 --- a/swe/src/Makefile.am +++ b/swe/src/Makefile.am @@ -2,3 +2,24 @@ lib_LTLIBRARIES = libswe-1.75.la libswe_1_75_la_SOURCES = swedate.c swehouse.c swejpl.c swemmoon.c swemplan.c swepcalc.c sweph.c swepdate.c swephlib.c swecl.c swehel.c libswe_1_75_la_CFLAGS = $(CFLAGS) -Wall libswe_1_75_la_LIBADD = $(LIBS) + +EXTRA_DIST = \ + LICENSE \ + README \ + swemptab.c \ + swedate.h \ + swedll.h \ + swehouse.h \ + swejpl.h \ + swenut2000a.h \ + sweodef.h \ + swepcalc.h \ + swephexp.h \ + sweph.h \ + swephlib.h \ + fixstars.cat \ + sedeltat.txt.inactive \ + sefstars.txt \ + seleapsec.txt \ + seorbel.txt \ + $(NULL)