tFix 'make dist' - 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 4a9355363529adbd869258b459906351b450f483
(DIR) parent 0e8ec04879eaee31c62c86da5e1b5a187ef045ff
(HTM) Author: Ben Webb <ben@salilab.org>
Date: Thu, 3 Dec 2020 21:10:16 -0800
Fix 'make dist'
Diffstat:
M Makefile.am | 16 ++++------------
M configure.ac | 3 ++-
M src/Makefile.am | 2 +-
3 files changed, 7 insertions(+), 14 deletions(-)
---
(DIR) diff --git a/Makefile.am b/Makefile.am
t@@ -3,17 +3,11 @@ DESKTOPDIR = ${DESTDIR}${datadir}/gnome/apps/Games
DESKTOP = dopewars.desktop
SCOREDIR = ${DESTDIR}${localstatedir}
SCORE = ${SCOREDIR}/dopewars.sco
-EXTRA_DIST = config.rpath config.rpath ABOUT-NLS LICENCE dopewars.desktop dopewars.spec.in depcomp \
- runindent.sh win32/Makefile win32/README win32/contid.h \
- win32/dialogs.rc win32/filelist win32/guifunc.c \
- win32/guifunc.h win32/makeinstall.c win32/setup.c \
- win32/setup.ico win32/setup.rc win32/uninstall.c \
- win32/uninstall.rc win32/util.c win32/util.h \
- win32/zlib/Makefile.nocygwin win32/zlib/README.zlib \
- win32/setup.manifest win32/uninstall.manifest \
- win32/bzlib/Makefile.nocygwin win32/bzlib/README.bzlib
+EXTRA_DIST = ABOUT-NLS LICENCE dopewars.desktop rpm/dopewars.spec.in \
+ runindent.sh win32/README.md win32/install.nsi.in README.md \
+ win32/mingw/Dockerfile
CLEANFILES = dopewars.sco dopewars-log.txt dopewars-config.txt
-DISTCLEANFILES = dopewars.spec
+DISTCLEANFILES = rpm/dopewars.spec
ACLOCAL_AMFLAGS= -I m4
install-data-local:
t@@ -27,5 +21,3 @@ install-data-local:
uninstall-local:
/bin/rm -f ${SCORE} ${DESKTOPDIR}/${DESKTOP}
-
-README: README.md
(DIR) diff --git a/configure.ac b/configure.ac
t@@ -9,7 +9,8 @@ AC_CANONICAL_TARGET
AC_USE_SYSTEM_EXTENSIONS
dnl Initialise automake
-AM_INIT_AUTOMAKE
+dnl 'foreign' because we have README.md instead of README
+AM_INIT_AUTOMAKE([foreign])
dnl Write configuration defines into config.h
AM_CONFIG_HEADER([src/config.h])
(DIR) diff --git a/src/Makefile.am b/src/Makefile.am
t@@ -29,7 +29,7 @@ dopewars_SOURCES = admin.c admin.h AIPlayer.c AIPlayer.h util.c util.h \
dopewars.c dopewars.h error.c error.h log.c log.h \
message.c message.h network.c network.h nls.h \
serverside.c serverside.h sound.c sound.h \
- tstring.c tstring.h winmain.c winmain.h
+ tstring.c tstring.h winmain.c winmain.h mac_helpers.h
AM_CPPFLAGS= -I${srcdir} @GLIB_CFLAGS@ @GTK_CFLAGS@ @LIBCURL_CPPFLAGS@
if APPLE
dopewars_SOURCES += mac_helpers.m