Complete.Org: Mailing Lists: Archives: freeciv-dev: December 2003:
[Freeciv-Dev] (PR#7038) missing distributed files
Home

[Freeciv-Dev] (PR#7038) missing distributed files

[Top] [All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index] [Thread Index]
To: undisclosed-recipients: ;
Subject: [Freeciv-Dev] (PR#7038) missing distributed files
From: "Jason Short" <jdorje@xxxxxxxxxxxxxxxxxxxxx>
Date: Wed, 3 Dec 2003 21:15:26 -0800
Reply-to: rt@xxxxxxxxxxx

<URL: http://rt.freeciv.org/Ticket/Display.html?id=7038 >

In addition to server/handgen.h, there are two more files missing from 
the distribution: server/srv_main_gen.c and client/packhand.h.

In the case of server/srv_main_gen.c we have a problem.  This is not a 
.c file so it can't be added to SOURCES or it'll be compiled.  It should 
be renamed as a .h file and added to the sources.  Adding it to 
EXTRA_DIST should work, but (1) is a huge hack and (2) doesn't seem to 
work in practice (make still tries to build it).

The attached patch should work (but doesn't seem to).  To test, apply 
it, rerun autogen.sh, and run "make distcheck".  Or you can run "make 
dist", then take the resulting tarball (in the top-level source 
directory) and just try to build it.

Until this is fixed it isn't possible to create tarballs.  Very bad.

jason

Index: client/Makefile.am
===================================================================
RCS file: /home/freeciv/CVS/freeciv/client/Makefile.am,v
retrieving revision 1.51
diff -u -r1.51 Makefile.am
--- client/Makefile.am  2003/11/15 08:21:51     1.51
+++ client/Makefile.am  2003/12/04 05:13:42
@@ -164,6 +164,7 @@
        messagewin_common.h \
        packhand.c      \
        packhand.h      \
+       packhand_gen.h  \
        plrdlg_common.c \
        plrdlg_common.h \
        options.c       \
Index: server/Makefile.am
===================================================================
RCS file: /home/freeciv/CVS/freeciv/server/Makefile.am,v
retrieving revision 1.30
diff -u -r1.30 Makefile.am
--- server/Makefile.am  2003/12/04 00:44:32     1.30
+++ server/Makefile.am  2003/12/04 05:13:42
@@ -75,6 +75,9 @@
                unittools.c     \
                unittools.h
 
+# HACK HACK HACK: this is not really a .c file, so we can't add it to the
+# SOURCES list.  It should be a .h file.
+EXTRA_DIST = srv_main_gen.c
 
 civserver_DEPENDENCIES = ../common/libcivcommon.a ../ai/libcivai.a 
./libcivserver.a ../common/aicore/libaicore.a $(USER_DB_DEP)
 civserver_LDADD        = ../common/libcivcommon.a ../ai/libcivai.a 
./libcivserver.a @INTLLIBS@ ../common/libcivcommon.a ../ai/libcivai.a 
./libcivserver.a ../common/aicore/libaicore.a $(USER_DB_LIB) $(SERVER_LIBS)

[Prev in Thread] Current Thread [Next in Thread]
  • [Freeciv-Dev] (PR#7038) missing distributed files, Jason Short <=