[Freeciv-Dev] Re: make dist in incoming/

[Jason Short <jdorje@xxxxxxxxxxxxxxxxxxxxx>]

Thanasis Kinias wrote:
> scripsit Mike Kaufman:
>
> > a 'make dist'ed tarball.
> >
> > ftp://ftp.freeciv.org/freeciv/incoming/freeciv-1.12.1-043002.tar.bz2
>
> Thanks much!  Whew, I call that service!
>
> Unfortunately, now it won't build :(
>
> 'make all' craps out here:
>
> [snip]
> ./../intl -I./../gui-gtk -I/usr/X11R6/include/gtk-1.2
> -I/usr/include/glib-1.2 -I/usr/lib/glib/include -I/usr/X11R6/include
> -I/usr/X11R6/include -I/usr/X11R6/include    -g -O2 -Wall -c cma_fec.c
> rm -f libagents.a
> ar cru libagents.a agents.o cma_core.o cma_fec.o 
> ranlib libagents.a
> make[3]: Leaving directory
> `/usr/src/f/freeciv-1.12.1-devel/client/agents'
> make[3]: Entering directory `/usr/src/f/freeciv-1.12.1-devel/client'
> make[3]: *** No rule to make target `audio_esd.c', needed by
> `audio_esd.o'.  Stop.
> make[3]: Leaving directory `/usr/src/f/freeciv-1.12.1-devel/client'
> make[2]: *** [all-recursive] Error 1
> make[2]: Leaving directory `/usr/src/f/freeciv-1.12.1-devel/client'
> make[1]: *** [all-recursive] Error 1
> make[1]: Leaving directory `/usr/src/f/freeciv-1.12.1-devel'
> make: *** [all-recursive-am] Error 2
>
> There doesn't seem to be a configure option to omit sound, which would
> let me build around this.
Indeed; I had just noticed that this was never fixed in the sound patch. 
 Specifically, "make dist" doesn't know to distribute the sound files 
if that type of sound isn't configured in.  This is clearly wrong.
The temporary workaround is just to grab the missing files from CVS and 
add them to the directory: in this case client/audio_esd.[ch].  A 
slightly more convoluted solution would be to uninstall the esd-devel 
packages from your system.  Or you could just downgrade autoconf, and 
build CVS...
To fix CVS, try this patch.

jason

Index: client/Makefile.am
===================================================================
RCS file: /home/freeciv/CVS/freeciv/client/Makefile.am,v
retrieving revision 1.40
diff -u -r1.40 Makefile.am
--- client/Makefile.am  2002/04/25 12:32:49     1.40
+++ client/Makefile.am  2002/04/30 22:29:49
@@ -23,15 +23,18 @@
 GUI_SUBDIR = gui-win32
 endif
 
+ALL_ESD_FILES=audio_esd.c audio_esd.h
+ALL_SDL_FILES=audio_sdl.c audio_sdl.h
+ALL_WINMM_FILES=audio_winmm.c audio_winmm.h
+
 if ESD
-ESD_FILES=audio_esd.c audio_esd.h
+ESD_FILES=$(ALL_ESD_FILES)
 endif
 if SDL
-SDL_FILES=audio_sdl.c audio_sdl.h
+SDL_FILES=$(ALL_SDL_FILES)
 endif
-
 if WINMM
-WINMM_FILES=audio_winmm.c audio_winmm.h
+WINMM_FILES=$(ALL_WINMM_FILES)
 endif
 
 EXTRA_DIST=    gui-mui/autogroupclass.c         \
@@ -96,7 +99,11 @@
                gui-mui/wldlg.c                  \
                gui-mui/wldlg.h                  \
                gui-mui/worklistclass.c          \
-               gui-mui/worklistclass.h
+               gui-mui/worklistclass.h          \
+               \
+               $(ALL_ESD_FILES)                 \
+               $(ALL_SDL_FILES)                 \
+               $(ALL_WINMM_FILES)
 
 
 ## This is usually false, so "include" is not recursed into