From 2c6e7b2f10c32ca0406ca6753e7701d83e6dea8f Mon Sep 17 00:00:00 2001 From: Simon Howard Date: Sat, 21 Nov 2009 03:56:59 +0000 Subject: Add Makefile to build Win32 packages. Subversion-branch: /trunk/chocolate-doom Subversion-revision: 1736 --- configure.in | 2 ++ 1 file changed, 2 insertions(+) (limited to 'configure.in') diff --git a/configure.in b/configure.in index f4a3f507..60610ea1 100644 --- a/configure.in +++ b/configure.in @@ -74,6 +74,7 @@ AC_SDL_MAIN_WORKAROUND([ ]) AC_CHECK_TOOL(WINDRES, windres, ) +AC_CHECK_TOOL(STRIP, strip, ) # Windows CE build? @@ -123,6 +124,7 @@ src/Makefile pcsound/Makefile pkg/Makefile pkg/wince/GNUmakefile +pkg/win32/GNUmakefile src/resource.rc src/doom-screensaver.desktop setup/setup-res.rc -- cgit v1.2.3 From afb95216afb043a56122a3f57292bf0ded5d7775 Mon Sep 17 00:00:00 2001 From: Simon Howard Date: Mon, 4 Jan 2010 22:11:11 +0000 Subject: Generate Info.plist and config.make in configure and remove temporary versions. Include config.h from top level. Subversion-branch: /trunk/chocolate-doom Subversion-revision: 1785 --- configure.in | 2 ++ 1 file changed, 2 insertions(+) (limited to 'configure.in') diff --git a/configure.in b/configure.in index 60610ea1..9e95c0f1 100644 --- a/configure.in +++ b/configure.in @@ -125,6 +125,8 @@ pcsound/Makefile pkg/Makefile pkg/wince/GNUmakefile pkg/win32/GNUmakefile +pkg/osx/config.make +pkg/osx/Info.plist src/resource.rc src/doom-screensaver.desktop setup/setup-res.rc -- cgit v1.2.3 From 860a17497bdc189f78f5a0bca000a0451d5ae624 Mon Sep 17 00:00:00 2001 From: Simon Howard Date: Tue, 5 Jan 2010 15:52:12 +0000 Subject: Move config.make up to pkg/ directory. Use static makefiles to generate all packages, rather than dynamically generated makefiles. Add pkg/osx to dist. Make OS X staging directory depend on top level documentation files. Generate CMDLINE as part of standard build if it is not already present. Set svn:ignore properties. Subversion-branch: /trunk/chocolate-doom Subversion-revision: 1790 --- configure.in | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'configure.in') diff --git a/configure.in b/configure.in index 9e95c0f1..8167462e 100644 --- a/configure.in +++ b/configure.in @@ -123,9 +123,7 @@ man/Makefile src/Makefile pcsound/Makefile pkg/Makefile -pkg/wince/GNUmakefile -pkg/win32/GNUmakefile -pkg/osx/config.make +pkg/config.make pkg/osx/Info.plist src/resource.rc src/doom-screensaver.desktop -- cgit v1.2.3 From 92eaebfb7a48f05f6f1b3c571b3a703274ac0111 Mon Sep 17 00:00:00 2001 From: Simon Howard Date: Tue, 12 Jan 2010 20:14:11 +0000 Subject: Rearrange order of Makefile generation to alphabetical order. Subversion-branch: /trunk/chocolate-doom Subversion-revision: 1809 --- configure.in | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'configure.in') diff --git a/configure.in b/configure.in index 8167462e..aa7ce09e 100644 --- a/configure.in +++ b/configure.in @@ -115,18 +115,18 @@ AC_DEFUN([AC_DATAROOTDIR_CHECKED]) AC_OUTPUT([ Makefile -wince/Makefile -textscreen/Makefile -textscreen/examples/Makefile -setup/Makefile man/Makefile -src/Makefile pcsound/Makefile pkg/Makefile pkg/config.make pkg/osx/Info.plist -src/resource.rc +src/Makefile src/doom-screensaver.desktop +src/resource.rc +setup/Makefile setup/setup-res.rc +textscreen/Makefile +textscreen/examples/Makefile +wince/Makefile ]) -- cgit v1.2.3 From 009c7a7dd68f00239889a2dd7d6ca41e6817f1f6 Mon Sep 17 00:00:00 2001 From: Simon Howard Date: Tue, 12 Jan 2010 20:16:25 +0000 Subject: Oops. Subversion-branch: /trunk/chocolate-doom Subversion-revision: 1811 --- configure.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'configure.in') diff --git a/configure.in b/configure.in index aa7ce09e..db76ebef 100644 --- a/configure.in +++ b/configure.in @@ -120,11 +120,11 @@ pcsound/Makefile pkg/Makefile pkg/config.make pkg/osx/Info.plist +setup/Makefile +setup/setup-res.rc src/Makefile src/doom-screensaver.desktop src/resource.rc -setup/Makefile -setup/setup-res.rc textscreen/Makefile textscreen/examples/Makefile wince/Makefile -- cgit v1.2.3 From f176ac404ad709e6c1254f8685f8d9fe7b995115 Mon Sep 17 00:00:00 2001 From: Simon Howard Date: Fri, 15 Jan 2010 18:13:05 +0000 Subject: Extend osx makefile to allow building of a working GNUstep application, for testing purposes. Add GNUstep version of Info.plist, remove app-skeleton directory and move contents up. Subversion-branch: /trunk/chocolate-doom Subversion-revision: 1813 --- configure.in | 1 + 1 file changed, 1 insertion(+) (limited to 'configure.in') diff --git a/configure.in b/configure.in index db76ebef..2296a654 100644 --- a/configure.in +++ b/configure.in @@ -120,6 +120,7 @@ pcsound/Makefile pkg/Makefile pkg/config.make pkg/osx/Info.plist +pkg/osx/Info-GNUstep.plist setup/Makefile setup/setup-res.rc src/Makefile -- cgit v1.2.3 From 893c8dbe922b5ee6ac14c3df3b5020817b6797b3 Mon Sep 17 00:00:00 2001 From: Simon Howard Date: Fri, 15 Jan 2010 19:14:02 +0000 Subject: Fix GNUstep info panel. Subversion-branch: /trunk/chocolate-doom Subversion-revision: 1816 --- configure.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'configure.in') diff --git a/configure.in b/configure.in index 2296a654..88a5e244 100644 --- a/configure.in +++ b/configure.in @@ -120,7 +120,7 @@ pcsound/Makefile pkg/Makefile pkg/config.make pkg/osx/Info.plist -pkg/osx/Info-GNUstep.plist +pkg/osx/Info-gnustep.plist setup/Makefile setup/setup-res.rc src/Makefile -- cgit v1.2.3 From 7f7a7354a5e72f1226f06f6109c0d1bc6cc30133 Mon Sep 17 00:00:00 2001 From: Simon Howard Date: Mon, 18 Jan 2010 19:14:54 +0000 Subject: Define project short description, copyright, maintainer and URL in configure.in. Use these for the Info-gnustep.plist file. Add generated .spec file for building RPM packages. Subversion-branch: /trunk/chocolate-doom Subversion-revision: 1821 --- configure.in | 14 ++++++++++++++ 1 file changed, 14 insertions(+) (limited to 'configure.in') diff --git a/configure.in b/configure.in index 88a5e244..05ea5d61 100644 --- a/configure.in +++ b/configure.in @@ -1,5 +1,11 @@ AC_INIT(Chocolate Doom, 1.2.1, fraggle@gmail.com, chocolate-doom) +PACKAGE_SHORTDESC="Conservative Doom source port" +PACKAGE_COPYRIGHT="Copyright (C) 1993-2010" +PACKAGE_LICENSE="GNU General Public License, version 2" +PACKAGE_MAINTAINER="Simon Howard" +PACKAGE_URL="http://www.chocolate-doom.org/" + AC_CONFIG_AUX_DIR(autotools) orig_CFLAGS="$CFLAGS" @@ -110,11 +116,19 @@ AC_SUBST(SDLNET_LIBS) AC_SUBST(ac_aux_dir) +AC_SUBST(PACKAGE_SHORTDESC) +AC_SUBST(PACKAGE_COPYRIGHT) +AC_SUBST(PACKAGE_LICENSE) +AC_SUBST(PACKAGE_MAINTAINER) +AC_SUBST(PACKAGE_URL) +AC_SUBST(PACKAGE_LONGDESC) + dnl Shut up the datarootdir warnings. AC_DEFUN([AC_DATAROOTDIR_CHECKED]) AC_OUTPUT([ Makefile +rpm.spec man/Makefile pcsound/Makefile pkg/Makefile -- cgit v1.2.3