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
---
 pkg/osx/.gitignore     |  5 +++++
 pkg/osx/GNUmakefile    | 24 ++++++++++--------------
 pkg/osx/config.make.in |  9 ---------
 3 files changed, 15 insertions(+), 23 deletions(-)
 create mode 100644 pkg/osx/.gitignore
 delete mode 100644 pkg/osx/config.make.in

(limited to 'pkg/osx')

diff --git a/pkg/osx/.gitignore b/pkg/osx/.gitignore
new file mode 100644
index 00000000..5b7a16ef
--- /dev/null
+++ b/pkg/osx/.gitignore
@@ -0,0 +1,5 @@
+Info.plist
+launcher
+*.o
+*.d
+staging
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?
 
diff --git a/pkg/osx/config.make.in b/pkg/osx/config.make.in
deleted file mode 100644
index 67f1c968..00000000
--- a/pkg/osx/config.make.in
+++ /dev/null
@@ -1,9 +0,0 @@
-# File included by the main makefile that contains details
-# about the package name, generated by configure.
-
-PACKAGE = @PACKAGE@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-
-- 
cgit v1.2.3