tWe play nice with automake now, so that "make dist" and "make distcheck" work. - vaccinewars - be a doctor and try to vaccinate the world
(HTM) git clone git://src.adamsgaard.dk/vaccinewars
(DIR) Log
(DIR) Files
(DIR) Refs
(DIR) README
(DIR) LICENSE
---
(DIR) commit 29d5b1410ef359cf013d0f12a8ee96663b291173
(DIR) parent f273079801ae34b77061dec4ea6eb50f3497d44b
(HTM) Author: Ben Webb <ben@salilab.org>
Date: Tue, 26 Feb 2002 19:46:33 +0000
We play nice with automake now, so that "make dist" and "make distcheck"
work.
Diffstat:
M Makefile.am | 5 +++--
M Makefile.in | 8 ++++++--
M doc/Makefile.am | 18 ++++++++++--------
M doc/Makefile.in | 12 +++++++-----
M src/Makefile.am | 17 ++++++++++-------
M src/Makefile.in | 17 ++++++++++-------
M src/curses_client/Makefile.am | 4 ++--
M src/curses_client/Makefile.in | 4 ++--
M src/gtkport/Makefile.am | 2 +-
M src/gtkport/Makefile.in | 2 +-
M src/gui_client/Makefile.am | 6 ++++--
M src/gui_client/Makefile.in | 7 +++++--
M src/nls.h | 6 +-----
13 files changed, 62 insertions(+), 46 deletions(-)
---
(DIR) diff --git a/Makefile.am b/Makefile.am
t@@ -1,9 +1,10 @@
SUBDIRS = intl src doc po
-DISTFILES = ABOUT-NLS
DESKTOPDIR = ${DESTDIR}${datadir}/gnome/apps/Games
DESKTOP = dopewars.desktop
SCOREDIR = ${DESTDIR}${datadir}
SCORE = ${SCOREDIR}/dopewars.sco
+EXTRA_DIST = ABOUT-NLS LICENCE dopewars.desktop dopewars.spec \
+ runindent.sh win32
install-data-local:
${mkinstalldirs} ${SCOREDIR}
t@@ -13,4 +14,4 @@ install-data-local:
chmod 0660 ${SCORE}
src/dopewars -C ${SCORE}
${mkinstalldirs} ${DESKTOPDIR}
- ${INSTALL} -m 0644 ${DESKTOP} ${DESKTOPDIR}
+ ${INSTALL} -m 0644 ${srcdir}/${DESKTOP} ${DESKTOPDIR}
(DIR) diff --git a/Makefile.in b/Makefile.in
t@@ -94,11 +94,13 @@ WNDRES = @WNDRES@
localedir = @localedir@
SUBDIRS = intl src doc po
-DISTFILES = ABOUT-NLS
DESKTOPDIR = ${DESTDIR}${datadir}/gnome/apps/Games
DESKTOP = dopewars.desktop
SCOREDIR = ${DESTDIR}${datadir}
SCORE = ${SCOREDIR}/dopewars.sco
+EXTRA_DIST = ABOUT-NLS LICENCE dopewars.desktop dopewars.spec \
+ runindent.sh win32
+
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
CONFIG_HEADER = config.h
t@@ -109,6 +111,8 @@ config.guess config.h.in config.sub configure configure.in install-sh \
missing mkinstalldirs
+DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
+
TAR = gtar
GZIP_ENV = --best
all: all-redirect
t@@ -391,7 +395,7 @@ install-data-local:
chmod 0660 ${SCORE}
src/dopewars -C ${SCORE}
${mkinstalldirs} ${DESKTOPDIR}
- ${INSTALL} -m 0644 ${DESKTOP} ${DESKTOPDIR}
+ ${INSTALL} -m 0644 ${srcdir}/${DESKTOP} ${DESKTOPDIR}
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
(DIR) diff --git a/doc/Makefile.am b/doc/Makefile.am
t@@ -1,12 +1,14 @@
-DOCPATH=${DESTDIR}${datadir}/doc/${PACKAGE}-${VERSION}/
-DOCS= aiplayer.html configfile.html index.html i18n.html server.html \
- clientplay.html credits.html installation.html \
- servercommands.html commandline.html developer.html \
- metaserver.html protocol.html windows.html
-man_MANS = dopewars.6
-EXTRA_DIST = ${man_MANS}
+DOCPATH = ${DESTDIR}${datadir}/doc/${PACKAGE}-${VERSION}/
+DOCS = aiplayer.html configfile.html index.html i18n.html server.html \
+ clientplay.html credits.html installation.html \
+ servercommands.html commandline.html developer.html \
+ metaserver.html protocol.html windows.html
+man_MANS = dopewars.6
+EXTRA_DIST = ${man_MANS} ${DOCS}
install-data-local:
${INSTALL} -d -m 0755 ${DOCPATH}
- ${INSTALL} -m 0644 ${DOCS} ${DOCPATH}
+ for doc in ${DOCS}; do \
+ ${INSTALL} -m 0644 ${srcdir}/$${doc} ${DOCPATH}; \
+ done
(DIR) diff --git a/doc/Makefile.in b/doc/Makefile.in
t@@ -95,12 +95,12 @@ localedir = @localedir@
DOCPATH = ${DESTDIR}${datadir}/doc/${PACKAGE}-${VERSION}/
DOCS = aiplayer.html configfile.html index.html i18n.html server.html \
- clientplay.html credits.html installation.html \
- servercommands.html commandline.html developer.html \
- metaserver.html protocol.html windows.html
+ clientplay.html credits.html installation.html \
+ servercommands.html commandline.html developer.html \
+ metaserver.html protocol.html windows.html
man_MANS = dopewars.6
-EXTRA_DIST = ${man_MANS}
+EXTRA_DIST = ${man_MANS} ${DOCS}
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
CONFIG_HEADER = ../config.h
CONFIG_CLEAN_FILES =
t@@ -252,7 +252,9 @@ mostlyclean distclean maintainer-clean
install-data-local:
${INSTALL} -d -m 0755 ${DOCPATH}
- ${INSTALL} -m 0644 ${DOCS} ${DOCPATH}
+ for doc in ${DOCS}; do \
+ ${INSTALL} -m 0644 ${srcdir}/$${doc} ${DOCPATH}; \
+ done
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
(DIR) diff --git a/src/Makefile.am b/src/Makefile.am
t@@ -18,16 +18,17 @@ dopewars_DEPENDENCIES = @INTLLIBS@ @WNDRES@ $(GUIDEP) $(CURSESDEP) $(GTKPORTDEP)
dopewars_LDADD = $(GUIDEP) $(CURSESDEP) $(GTKPORTDEP) @GTK_LIBS@ @INTLLIBS@ @WNDRES@
bin_PROGRAMS = dopewars
-dopewars_SOURCES = admin.c AIPlayer.c dopeos.c dopewars.c \
- error.c message.c network.c serverside.c \
- tstring.c winmain.c
-
-INCLUDES = -I.. -I. @GTK_CFLAGS@
+dopewars_SOURCES = admin.c admin.h AIPlayer.c AIPlayer.h dopeos.c dopeos.h \
+ dopewars.c dopewars.h error.c error.h message.c message.h \
+ network.c network.h nls.h serverside.c serverside.h \
+ tstring.c tstring.h winmain.c winmain.h
+INCLUDES = -I../intl -I${srcdir} -I.. @GTK_CFLAGS@
DEFS = @DEFS@ -DLOCALEDIR=\"${localedir}\"
PIXDIR = ${DESTDIR}${datadir}/pixmaps
-PIXMAPS = dopewars-pill.png dopewars-shot.png dopewars-weed.png
DOPEDIR = ${DESTDIR}${bindir}
DOPEBIN = ${DOPEDIR}/dopewars
+PIXMAPS = dopewars-pill.png dopewars-shot.png dopewars-weed.png
+EXTRA_DIST = ${PIXMAPS} pill.ico magic dopewars.rc
install-exec-hook:
@chgrp games ${DOPEBIN} || chgrp wheel ${DOPEBIN} || \
t@@ -37,7 +38,9 @@ install-exec-hook:
install-data-local:
${mkinstalldirs} ${PIXDIR}
- ${INSTALL} -m 0644 ${PIXMAPS} ${PIXDIR}
+ for pix in ${PIXMAPS}; do \
+ ${INSTALL} -m 0644 ${srcdir}/$${pix} ${PIXDIR}; \
+ done
%.res: %.rc
windres -O coff -o $@ $<
(DIR) diff --git a/src/Makefile.in b/src/Makefile.in
t@@ -107,17 +107,18 @@ dopewars_DEPENDENCIES = @INTLLIBS@ @WNDRES@ $(GUIDEP) $(CURSESDEP) $(GTKPORTDEP)
dopewars_LDADD = $(GUIDEP) $(CURSESDEP) $(GTKPORTDEP) @GTK_LIBS@ @INTLLIBS@ @WNDRES@
bin_PROGRAMS = dopewars
-dopewars_SOURCES = admin.c AIPlayer.c dopeos.c dopewars.c \
- error.c message.c network.c serverside.c \
- tstring.c winmain.c
+dopewars_SOURCES = admin.c admin.h AIPlayer.c AIPlayer.h dopeos.c dopeos.h \
+ dopewars.c dopewars.h error.c error.h message.c message.h \
+ network.c network.h nls.h serverside.c serverside.h \
+ tstring.c tstring.h winmain.c winmain.h
-
-INCLUDES = -I.. -I. @GTK_CFLAGS@
+INCLUDES = -I../intl -I${srcdir} -I.. @GTK_CFLAGS@
DEFS = @DEFS@ -DLOCALEDIR=\"${localedir}\"
PIXDIR = ${DESTDIR}${datadir}/pixmaps
-PIXMAPS = dopewars-pill.png dopewars-shot.png dopewars-weed.png
DOPEDIR = ${DESTDIR}${bindir}
DOPEBIN = ${DOPEDIR}/dopewars
+PIXMAPS = dopewars-pill.png dopewars-shot.png dopewars-weed.png
+EXTRA_DIST = ${PIXMAPS} pill.ico magic dopewars.rc
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
CONFIG_HEADER = ../config.h
CONFIG_CLEAN_FILES =
t@@ -444,7 +445,9 @@ install-exec-hook:
install-data-local:
${mkinstalldirs} ${PIXDIR}
- ${INSTALL} -m 0644 ${PIXMAPS} ${PIXDIR}
+ for pix in ${PIXMAPS}; do \
+ ${INSTALL} -m 0644 ${srcdir}/$${pix} ${PIXDIR}; \
+ done
%.res: %.rc
windres -O coff -o $@ $<
(DIR) diff --git a/src/curses_client/Makefile.am b/src/curses_client/Makefile.am
t@@ -1,6 +1,6 @@
noinst_LIBRARIES = libcursesclient.a
-libcursesclient_a_SOURCES = curses_client.c
+libcursesclient_a_SOURCES = curses_client.c curses_client.h
libcursesclient_a_DEPENDENCIES = @INTLLIBS@
-INCLUDES = -I.. -I../.. -I.
+INCLUDES = -I../../intl -I${srcdir} -I${srcdir}/.. -I../..
LDADD = @INTLLIBS@
DEFS = @DEFS@ -DLOCALEDIR=\"${localedir}\"
(DIR) diff --git a/src/curses_client/Makefile.in b/src/curses_client/Makefile.in
t@@ -94,9 +94,9 @@ WNDRES = @WNDRES@
localedir = @localedir@
noinst_LIBRARIES = libcursesclient.a
-libcursesclient_a_SOURCES = curses_client.c
+libcursesclient_a_SOURCES = curses_client.c curses_client.h
libcursesclient_a_DEPENDENCIES = @INTLLIBS@
-INCLUDES = -I.. -I../.. -I.
+INCLUDES = -I../../intl -I${srcdir} -I${srcdir}/.. -I../..
LDADD = @INTLLIBS@
DEFS = @DEFS@ -DLOCALEDIR=\"${localedir}\"
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
(DIR) diff --git a/src/gtkport/Makefile.am b/src/gtkport/Makefile.am
t@@ -1,6 +1,6 @@
noinst_LIBRARIES = libgtkport.a
libgtkport_a_SOURCES = gtkport.c gtkport.h
libgtkport_a_DEPENDENCIES = @INTLLIBS@
-INCLUDES = @GTK_CFLAGS@ -I.. -I../.. -I.
+INCLUDES = -I../../intl -I${srcdir} -I${srcdir}/.. -I../.. @GTK_CFLAGS@
LDADD = @GTK_LIBS@ @INTLLIBS@
DEFS = @DEFS@ -DLOCALEDIR=\"${localedir}\"
(DIR) diff --git a/src/gtkport/Makefile.in b/src/gtkport/Makefile.in
t@@ -96,7 +96,7 @@ localedir = @localedir@
noinst_LIBRARIES = libgtkport.a
libgtkport_a_SOURCES = gtkport.c gtkport.h
libgtkport_a_DEPENDENCIES = @INTLLIBS@
-INCLUDES = @GTK_CFLAGS@ -I.. -I../.. -I.
+INCLUDES = -I../../intl -I${srcdir} -I${srcdir}/.. -I../.. @GTK_CFLAGS@
LDADD = @GTK_LIBS@ @INTLLIBS@
DEFS = @DEFS@ -DLOCALEDIR=\"${localedir}\"
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
(DIR) diff --git a/src/gui_client/Makefile.am b/src/gui_client/Makefile.am
t@@ -1,6 +1,8 @@
noinst_LIBRARIES = libguiclient.a
-libguiclient_a_SOURCES = gtk_client.c optdialog.c newgamedia.c
+libguiclient_a_SOURCES = gtk_client.c gtk_client.h \
+ optdialog.c optdialog.h \
+ newgamedia.c newgamedia.h dopewars-pill.xpm
libguiclient_a_DEPENDENCIES = @INTLLIBS@
-INCLUDES = @GTK_CFLAGS@ -I.. -I../.. -I.
+INCLUDES = -I../../intl -I${srcdir} -I${srcdir}/.. -I../.. @GTK_CFLAGS@
LDADD = @GTK_LIBS@ @INTLLIBS@
DEFS = @DEFS@ -DLOCALEDIR=\"${localedir}\"
(DIR) diff --git a/src/gui_client/Makefile.in b/src/gui_client/Makefile.in
t@@ -94,9 +94,12 @@ WNDRES = @WNDRES@
localedir = @localedir@
noinst_LIBRARIES = libguiclient.a
-libguiclient_a_SOURCES = gtk_client.c optdialog.c newgamedia.c
+libguiclient_a_SOURCES = gtk_client.c gtk_client.h \
+ optdialog.c optdialog.h \
+ newgamedia.c newgamedia.h dopewars-pill.xpm
+
libguiclient_a_DEPENDENCIES = @INTLLIBS@
-INCLUDES = @GTK_CFLAGS@ -I.. -I../.. -I.
+INCLUDES = -I../../intl -I${srcdir} -I${srcdir}/.. -I../.. @GTK_CFLAGS@
LDADD = @GTK_LIBS@ @INTLLIBS@
DEFS = @DEFS@ -DLOCALEDIR=\"${localedir}\"
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
(DIR) diff --git a/src/nls.h b/src/nls.h
t@@ -29,11 +29,7 @@
#ifdef ENABLE_NLS
# include <locale.h>
-# ifdef HAVE_GETTEXT
-# include <libintl.h>
-# else
-# include "../intl/libintl.h"
-# endif
+# include <libintl.h>
# define _(String) gettext (String)
# ifdef gettext_noop
# define N_(String) gettext_noop (String)