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/osx/GNUmakefile | |
| 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/osx/GNUmakefile')
| -rw-r--r-- | pkg/osx/GNUmakefile | 24 |
1 files changed, 10 insertions, 14 deletions
diff --git a/pkg/osx/GNUmakefile b/pkg/osx/GNUmakefile index b060f483..92fc5b0f 100644 --- a/pkg/osx/GNUmakefile +++ b/pkg/osx/GNUmakefile @@ -1,19 +1,14 @@ -include config.make +include ../config.make CC=gcc STRIP=strip STAGING_DIR=staging DMG=$(PACKAGE_TARNAME)-$(PACKAGE_VERSION).dmg -DOC_FILES=\ - README \ - COPYING \ - ChangeLog \ - NEWS \ - BUGS \ - CMDLINE \ - TODO + +TOPLEVEL=../.. +TOPLEVEL_DOCS=$(patsubst %,../../%,$(DOC_FILES)) ifndef GNUSTEP_MAKEFILES @@ -30,20 +25,21 @@ endif APP_DIR=$(STAGING_DIR)/$(PACKAGE_NAME).app APP_BIN_DIR=$(APP_DIR)/Contents/MacOS/ -$(STAGING_DIR): launcher +$(STAGING_DIR): launcher $(TOPLEVEL_DOCS) rm -rf $(STAGING_DIR) mkdir $(STAGING_DIR) cp -R app-skeleton "$(APP_DIR)" + mkdir "$(APP_BIN_DIR)" cp Info.plist "$(APP_DIR)/Contents/" cp launcher "$(APP_BIN_DIR)/" - ./cp-with-libs ../../src/chocolate-doom "$(APP_BIN_DIR)" + ./cp-with-libs $(TOPLEVEL)/src/chocolate-doom "$(APP_BIN_DIR)" $(STRIP) "$(APP_BIN_DIR)/chocolate-doom" - ./cp-with-libs ../../setup/chocolate-setup "$(APP_BIN_DIR)" + ./cp-with-libs $(TOPLEVEL)/setup/chocolate-setup "$(APP_BIN_DIR)" $(STRIP) "$(APP_BIN_DIR)/chocolate-setup" - for d in $(DOC_FILES); do cp ../../$$d $(STAGING_DIR)/; done + for d in $(DOC_FILES); do cp $(TOPLEVEL)/$$d $(STAGING_DIR)/; done find $(STAGING_DIR) -name .svn -delete -exec rm -rf {} \; || true @@ -53,7 +49,7 @@ clean : launcher_clean # Launcher build: -CFLAGS = -Wall -I../.. +CFLAGS = -Wall -I$(TOPLEVEL) # Are we building using gs_make? |