[Freeciv-Dev] patch: fix "make dist"

[David Pfitzner <dwp@xxxxxxxxxxxxxx>]

I was going to put the goto-cursor xbm files into 
client/include/Makefile.am to make sure that they get
included in the distribution created by "make dist" ...

... But I ran into trouble when I found out there is no
such file as client/include/Makefile.am, and "make dist" 
is currently broken: the resulting dist is missing 
client/incude, and has only one of client/gui-xaw or
client/gui-gtk (whichever is currently configured).

The following patch fixes this.  (A bit awkwardly, but
I couldn't work out better, and at least this works.)
Also a few other .h files were missing from the dist.

-- David

diff -u -r --exclude-from exclude_auto -N freeciv-cvs/client/Makefile.am 
fc-adv/client/Makefile.am
--- freeciv-cvs/client/Makefile.am      Mon Apr 26 19:29:10 1999
+++ fc-adv/client/Makefile.am   Wed May 12 23:05:49 1999
@@ -1,6 +1,24 @@
 ## Process this file with automake to produce Makefile.in
 
-SUBDIRS = @gui_sources@
+## Below used to be just 
+##    SUBDIRS = @gui_sources@
+## but that doesn't work properly for "make dist"
+
+if CLIENT_GUI_GTK
+GUI_SUBDIR = gui-gtk
+else
+GUI_SUBDIR = gui-xaw
+endif
+
+## This is always false, so "include" is never recursed into 
+## by 'make', but is included in the dist.
+if CLIENT_INCLUDE_DIST
+CLI_INCLUDE = include
+else
+CLI_INCLUDE = 
+endif
+
+SUBDIRS = $(GUI_SUBDIR) $(CLI_INCLUDE)
 
 bin_PROGRAMS = civclient
 
diff -u -r --exclude-from exclude_auto -N 
freeciv-cvs/client/gui-gtk/Makefile.am fc-adv/client/gui-gtk/Makefile.am
--- freeciv-cvs/client/gui-gtk/Makefile.am      Tue Apr 20 21:34:25 1999
+++ fc-adv/client/gui-gtk/Makefile.am   Wed May 12 22:51:18 1999
@@ -41,6 +41,7 @@
        menu.h          \
        messagedlg.c    \
        messagewin.c    \
+       optiondlg.h     \
        plrdlg.c        \
        repodlgs.c      \
        repodlgs.h      \
diff -u -r --exclude-from exclude_auto -N 
freeciv-cvs/client/gui-xaw/Makefile.am fc-adv/client/gui-xaw/Makefile.am
--- freeciv-cvs/client/gui-xaw/Makefile.am      Tue Apr 20 21:34:25 1999
+++ fc-adv/client/gui-xaw/Makefile.am   Wed May 12 22:51:44 1999
@@ -63,6 +63,7 @@
        optiondlg.h     \
        pixcomm.c       \
        pixcomm.h       \
+       pixcommp.h      \
        plrdlg.c        \
        ratesdlg.c      \
        repodlgs.c      \
diff -u -r --exclude-from exclude_auto -N 
freeciv-cvs/client/include/Makefile.am fc-adv/client/include/Makefile.am
--- freeciv-cvs/client/include/Makefile.am      Thu Jan  1 10:00:00 1970
+++ fc-adv/client/include/Makefile.am   Wed May 12 21:45:54 1999
@@ -0,0 +1,20 @@
+## Process this file with automake to produce Makefile.in
+
+EXTRA_DIST = \
+       cityicon.ico    \
+       freeciv.ico     \
+       goto_cursor.xbm \
+       goto_cursor_mask.xbm    \
+       cityrep.h       \
+       civclient.h     \
+       climisc.h       \
+       finddlg.h       \
+       helpdlg.h       \
+       inteldlg.h      \
+       messagedlg.h    \
+       meswindlg.h     \
+       options.h       \
+       packhand.h      \
+       plrdlg.h        \
+       ratesdlg.h
+
diff -u -r --exclude-from exclude_auto -N freeciv-cvs/configure.in 
fc-adv/configure.in
--- freeciv-cvs/configure.in    Wed Apr 14 18:05:33 1999
+++ fc-adv/configure.in Wed May 12 22:41:36 1999
@@ -188,6 +188,8 @@
 AC_SUBST(gui_sources)
 AC_SUBST(CLIENT_CFLAGS)
 AC_SUBST(CLIENT_LIBS)
+AM_CONDITIONAL(CLIENT_GUI_GTK, test "$gui_sources" = "gui-gtk")
+AM_CONDITIONAL(CLIENT_INCLUDE_DIST, test "x" = "y")
 
 dnl Checks for non-X libraries:
 if test x$server = xtrue; then
@@ -246,4 +248,4 @@
 FC_EXPAND_DIR(FREECIV_DATADIR, "$datadir/freeciv")
 AC_DEFINE_UNQUOTED(FREECIV_DATADIR, "$FREECIV_DATADIR")
 
-AC_OUTPUT(Makefile data/Makefile data/default/Makefile data/civ1/Makefile 
data/classic/Makefile common/Makefile ai/Makefile client/Makefile 
client/gui-gtk/Makefile client/gui-xaw/Makefile server/Makefile undep.sh, [ 
chmod +x undep.sh ; ./undep.sh ])
+AC_OUTPUT(Makefile data/Makefile data/default/Makefile data/civ1/Makefile 
data/classic/Makefile common/Makefile ai/Makefile client/Makefile 
client/include/Makefile client/gui-gtk/Makefile client/gui-xaw/Makefile 
server/Makefile undep.sh, [ chmod +x undep.sh ; ./undep.sh ])