diff options
| author | Simon Howard | 2010-01-05 15:52:12 +0000 |
|---|---|---|
| committer | Simon Howard | 2010-01-05 15:52:12 +0000 |
| commit | 860a17497bdc189f78f5a0bca000a0451d5ae624 (patch) | |
| tree | 9dfe693c8cf461a262e9aef89e4011d3e9e842af /pkg/win32 | |
| parent | 37325bbfc1f71111715cf2f4ef2918b6cc5c0ff1 (diff) | |
| download | chocolate-doom-860a17497bdc189f78f5a0bca000a0451d5ae624.tar.gz chocolate-doom-860a17497bdc189f78f5a0bca000a0451d5ae624.tar.bz2 chocolate-doom-860a17497bdc189f78f5a0bca000a0451d5ae624.zip | |
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
Diffstat (limited to 'pkg/win32')
| -rw-r--r-- | pkg/win32/GNUmakefile (renamed from pkg/win32/GNUmakefile.am) | 17 |
1 files changed, 4 insertions, 13 deletions
diff --git a/pkg/win32/GNUmakefile.am b/pkg/win32/GNUmakefile index ed86d2cc..93c6abe1 100644 --- a/pkg/win32/GNUmakefile.am +++ b/pkg/win32/GNUmakefile @@ -1,7 +1,9 @@ +include ../config.make + TOPLEVEL=../.. -EXE_FILES=$(TOPLEVEL)/src/@PACKAGE_TARNAME@.exe \ +EXE_FILES=$(TOPLEVEL)/src/$(PACKAGE_TARNAME).exe \ $(TOPLEVEL)/src/chocolate-server.exe \ $(TOPLEVEL)/setup/chocolate-setup.exe @@ -9,18 +11,7 @@ DLL_FILES=$(TOPLEVEL)/src/SDL.dll \ $(TOPLEVEL)/src/SDL_mixer.dll \ $(TOPLEVEL)/src/SDL_net.dll -DOC_FILES=README \ - COPYING \ - ChangeLog \ - NEWS \ - BUGS \ - CMDLINE \ - TODO - -EXTRA_DIST=README -noinst_DATA=@PACKAGE_TARNAME@-@PACKAGE_VERSION@-win32.zip - -@PACKAGE_TARNAME@-@PACKAGE_VERSION@-win32.zip : staging +$(PACKAGE_TARNAME)-$(PACKAGE_VERSION)-win32.zip : staging zip -j -r $@ staging/ staging: $(EXE_FILES) $(DLL_FILES) $(patsubst %,../../%,$(DOC_FILES)) |