[Freeciv-Dev] Re: (PR#9703) Dist more files & other minor makefile clean
[Top] [All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index] [Thread Index]
|
To: |
undisclosed-recipients: ; |
|
Subject: |
[Freeciv-Dev] Re: (PR#9703) Dist more files & other minor makefile cleanups |
|
From: |
"Marko Lindqvist" <marko.lindqvist@xxxxxxxxxxx> |
|
Date: |
Tue, 17 Aug 2004 11:23:18 -0700 |
|
Reply-to: |
rt@xxxxxxxxxxx |
<URL: http://rt.freeciv.org/Ticket/Display.html?id=9703 >
Jason Short wrote:
> I'd suggest renaming it (along with references to it) as
> README.scorelog, and writing an intro that explains what the scorelog
> _does_ (since I have little idea).
Reference was in generated scorelog file itself. Attached patch
scorelog_reference.diff makes it to point into file named
README.scorelog. Can't help with document contents.
Earlier Jason also said:
> Note that a bunch of files are intentionally not distributed.
Indeed. Even after I did "grep -v" for obvious cvs directory and
distribution differences, there were lots of false positives.
In addition to adding files to distribution, attached patch fixes some
other small Makefile.am problems.
- I expected that scorelog-v2 is renamed to README.ruleset before this
patch is committed, so it tries to distribute latter.
- I did nothing to problems in gettext directories. It uses no
automake and digging those Makefile.in's for such a small gains was too
much for me. Also, we probably update gettext someday, anyway. Problems
related to these directories were that 1) po/check_po.pl is not
distributed and 2) intl/plural.c causes problems for 'make distcheck'
- 'make discheck' found out that tests/check-output was not cleaned, I
decided that that even 'make clean' should be enought to remove it
- (See #8662) I also found out that since target 'check' is prereq to
some other automake targets, our sourcechekcs get run at weird times.
I've also seen increasing number of project documents to mention 'make
check', so there is also increasing number of people who have clear
expectations what 'make check' should do. So I renamed 'check' target
into 'src-check', accesible from both top_builddir and subdir tests.
- What is status of (not distributed) directory structure
data/graphics? Is it even maintained? At least there is no worker graphics.
- Maybe client/gui-sdl/README.SDLClient should be among other READMEs
in doc and renamed as README.sdl
- There is both 'BUGS' and 'BUGS.fr' in doc/fr, I guess that one of
them is in error. I added 'BUGS.fr' into distribution as it is at least
correctly named.
- While files are usually in alphabetical order, I decided that
README.fr is before README.cma.fr (they are in alphabetical order when
language suffix is ignored)
Files I still left out of distribution:
- data/graphics -directory structure
- common/fciconv.c & .h
- debian -directory (I've understood that it's currently out of date,
but should it be included when upto date?)
- doc/fr/BUGS
- m4/x.m4 (generated file, anybody unable to to create has no use for it)
- po/check_po.pl
- stamp-h.in (for such a simple file this has surprising number of
commits. And lots of functionality too, if you believe that last commit
comment :-)
- utility/fciconv.c & .h
- win32 -directory
- Caz
diff -Nurd freeciv/server/report.c freeciv/server/report.c
--- freeciv/server/report.c 2004-08-15 02:08:48.859375000 +0300
+++ freeciv/server/report.c 2004-08-17 19:35:27.406250000 +0300
@@ -950,8 +950,8 @@
fprintf(fp, "%s%s\n", scorelog_magic, VERSION_STRING);
fprintf(fp,
"\n"
- "# For a specification of the format of this see doc/scorelog-v2
or \n"
- "# <http://www.freeciv.org/lxr/source/doc/scorelog-v2?v=cvs>.\n"
+ "# For a specification of the format of this see
doc/README.scorelog or \n"
+ "#
<http://www.freeciv.org/lxr/source/doc/README.scorelog?v=cvs>.\n"
"\n");
fprintf(fp, "id %s\n", game.id);
diff -Nurd freeciv/Makefile.am freeciv/Makefile.am
--- freeciv/Makefile.am 2004-08-15 22:17:02.890625000 +0300
+++ freeciv/Makefile.am 2004-08-17 19:32:26.734375000 +0300
@@ -31,8 +31,10 @@
amiga/amigaclient.c \
amiga/amigaserver.c \
amiga/config.h \
+ amiga/declgate.h \
amiga/gettext.c \
amiga/libintl.h \
+ amiga/myregargs.h \
amiga/ReadMe \
amiga/ReadMe.2Amigas \
amiga/ReadMe.developer \
@@ -79,3 +81,9 @@
vms/imlib_config.h_vms \
vms/readme.vms \
vms/vms_build.com
+
+src-check:
+ cd tests && $(MAKE) $(AM_MAKEFLAGS) src-check
+
+.PHONY: src-check
+
diff -Nurd freeciv/client/gui-sdl/Makefile.am freeciv/client/gui-sdl/Makefile.am
--- freeciv/client/gui-sdl/Makefile.am 2004-08-15 02:08:03.265625000 +0300
+++ freeciv/client/gui-sdl/Makefile.am 2004-08-17 19:32:26.734375000 +0300
@@ -96,7 +96,5 @@
SDL_ttf.c \
SDL_ttf.h \
mmx.h
-
-
-
+EXTRA_DIST = README.SDLClient
diff -Nurd freeciv/data/Makefile.am freeciv/data/Makefile.am
--- freeciv/data/Makefile.am 2004-08-15 02:08:37.171875000 +0300
+++ freeciv/data/Makefile.am 2004-08-17 19:32:26.734375000 +0300
@@ -9,7 +9,8 @@
trident_shields.tilespec \
helpdata.txt \
civ1.serv \
- civ2.serv
+ civ2.serv \
+ history.serv
EXTRA_DIST = $(pkgdata_DATA)
diff -Nurd freeciv/doc/Makefile.am freeciv/doc/Makefile.am
--- freeciv/doc/Makefile.am 2004-08-15 02:08:41.093750000 +0300
+++ freeciv/doc/Makefile.am 2004-08-17 19:33:10.015625000 +0300
@@ -13,9 +13,11 @@
README.agents \
README.attributes \
README.cma \
+ README.delta \
README.effects \
README.ftwl \
README.graphics \
README.rulesets \
+ README.scorelog \
README.sound \
TODO
diff -Nurd freeciv/doc/fr/Makefile.am freeciv/doc/fr/Makefile.am
--- freeciv/doc/fr/Makefile.am 2004-08-15 02:08:40.515625000 +0300
+++ freeciv/doc/fr/Makefile.am 2004-08-17 19:32:26.734375000 +0300
@@ -1,6 +1,8 @@
## Process this file with automake to produce Makefile.in
EXTRA_DIST = \
+ BUGS.fr \
HOWTOPLAY.fr \
INSTALL.fr \
- README.fr
+ README.fr \
+ README.cma.fr
diff -Nurd freeciv/tests/Makefile.am freeciv/tests/Makefile.am
--- freeciv/tests/Makefile.am 2004-08-15 02:08:50.359375000 +0300
+++ freeciv/tests/Makefile.am 2004-08-17 19:32:26.750000000 +0300
@@ -1,16 +1,20 @@
## Process this file with automake to produce Makefile.in
-SUBDIRS = .
-
-# Currently the "check" directive creates a check-output file containing the
-# results of the checks. It might be better to actually fail the make run
+# Currently the "src-check" directive creates a check-output file containing
+# the results of the checks. It might be better to actually fail the make run
# if the check fails.
-check:
+src-check:
rm -f check-output
$(srcdir)/header_guard.sh $(top_srcdir) >> check-output
$(srcdir)/va_list.sh $(top_srcdir) >> check-output
$(srcdir)/copyright.sh $(top_srcdir) >> check-output
cat check-output | sed "s\\$(top_srcdir)/\\\\" > check-output
-check_SCRIPTS = header_guard.sh \
+.PHONY: src-check
+
+CLEANFILES = check-output
+
+dist_noinst_SCRIPTS = \
+ copyright.sh \
+ header_guard.sh \
va_list.sh
diff -Nurd freeciv/utility/ftwl/Makefile.am freeciv/utility/ftwl/Makefile.am
--- freeciv/utility/ftwl/Makefile.am 2004-08-15 02:08:50.968750000 +0300
+++ freeciv/utility/ftwl/Makefile.am 2004-08-17 19:32:44.765625000 +0300
@@ -13,8 +13,8 @@
ALL_BACKEND_SDL_FILES=$(BACKEND_COMMON_FILES) be_sdl.c
ALL_OTHER_FILES= \
back_end.h \
- common_types.h \
common_types.c \
+ common_types.h \
widget_p.h \
widget.h \
widget_timeout.c \
@@ -25,9 +25,11 @@
widget_list.c \
widget_slider.c \
text_renderer.c \
+ text_renderer.h \
widget_core.c \
widget_window.c \
- theme_engine.c
+ theme_engine.c \
+ theme_engine.h
if FTWL_X11
BACKEND_X11_FILES=$(ALL_BACKEND_X11_FILES)
|
|
