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

[Jason Short <jdorje@xxxxxxxxxxxxxxxxxxxxx>]

Per I. Mathisen wrote:
> On Tue, 30 Apr 2002, Jason Short wrote:
>
> > To fix CVS, try this patch.
>
>  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)
>
> Why not just use ESD_FILES, SDL_FILES and WINMM_FILES in the above? ie why
> introduce the ALL_* constants, which is just the same thing?
Those macros are only initialized at all if the configure check has 
determined they should be compiled.  In fact, they're already included 
in civclient_SOURCES, which is why a tarball you build will contain the 
files from the sound modules your system does support.  But if you're on 
a aystem without the appropriate dev packages, these macros will be empty.
> (BTW, this was already fixed this in freeciv-test...)
Yes, the problem was encountered (and fixed, I thought) some time ago in 
freeciv-test.  I wonder why the fix never made it back into the patch 
that was applied...
The fix I suggested there was functionally identical to this one: just 
add the files to EXTRA_DIST.  The only difference here is that the file 
names aren't duplicated, but ALL_***_FILES macros are used instead.
jason