Makefile: Clean up space/no-space handling in application name

* Remove some old commented targets
* Move the space-specific code to a single place

1 files changed, 15 insertions, 35 deletions

diff --git a/Makefile b/Makefile
index 09bb98e..1f9a691 100644
--- a/Makefile
+++ b/Makefile
@@ -1,11 +1,7 @@
-APP_NAME := Nospace
+APP_NAME := Base\ Windowed\ Application
 
 NBSP := $(shell perl -C -e 'print chr 0xfeff')
 APP_NAME_NOSPACE := $(subst \ ,$(NBSP),$(APP_NAME))
-NOSPACE_BUNDLE_FILES = $(shell find build/$(APP_NAME_NOSPACE).app -type f)
-testnospace:
-	echo $(APP_NAME_NOSPACE)
-
 
 SOURCES := $(shell find src -name '*.m')
 OBJECTS := $(SOURCES:%.m=%.o)
@@ -34,22 +30,6 @@ $(PRODUCT): $(OBJECTS) | build
 build:
 	mkdir -p build
 
-ifneq ($(APP_NAME),$(APP_NAME_NOSPACE))
-# build/$(APP_NAME).app: build/$(APP_NAME_NOSPACE).app
-# 	cp -R $< "${@}"
-build/$(APP_NAME).app: $(NOSPACE_BUNDLE_FILES)
-	rsync -rupE build/$(APP_NAME_NOSPACE).app/ "${@}/"
-
-build/$(APP_NAME).app/Contents/MacOS/$(APP_NAME): \
-build/$(APP_NAME_NOSPACE).app/Contents/MacOS/$(APP_NAME_NOSPACE)
-	cp -a "${<}" "${@}"
-	rm -f build/$(APP_NAME).app/Contents/MacOS/$(APP_NAME_NOSPACE)
-
-# build/$(APP_NAME_NOSPACE).app/Contents/MacOS/$(APP_NAME): \
-# build/$(APP_NAME_NOSPACE).app/Contents/MacOS/$(APP_NAME_NOSPACE)
-# 	mv $< "${@}"
-endif
-
 build/$(APP_NAME_NOSPACE).app: | build
 	mkdir -p build/$(APP_NAME_NOSPACE).app
 
@@ -66,12 +46,6 @@ build/$(APP_NAME_NOSPACE).app/Contents/MacOS/$(APP_NAME_NOSPACE): $(OBJECTS) \
 		-o "${@}" \
 		$^
 
-# build/$(APP_NAME_NOSPACE).app/Contents/Info.plist: Info.m4.plist \
-# | build/$(APP_NAME_NOSPACE).app/Contents
-# 	m4 \
-# 		--define='CF_BUNDLE_VERSION=$(CF_BUNDLE_VERSION)' \
-# 		$< \
-# 		> $@
 build/$(APP_NAME_NOSPACE).app/Contents/Info.plist: Info.plist \
 | build/$(APP_NAME_NOSPACE).app/Contents
 	cp $< "${@}"
@@ -79,24 +53,32 @@ build/$(APP_NAME_NOSPACE).app/Contents/Info.plist: Info.plist \
 build/$(APP_NAME_NOSPACE).app/Contents/Resources: | build/$(APP_NAME_NOSPACE).app/Contents
 	mkdir -p build/$(APP_NAME_NOSPACE).app/Contents/Resources
 
-# build/$(APP_NAME_NOSPACE).app/Contents/Resources/%.lproj/Localizable.strings: \
-# Internationalization/%.lproj/Localizable.strings \
-# | build/$(APP_NAME_NOSPACE).app/Contents/Resources
-# 	mkdir -p $(dir "${@}")
-# 	cp $< "${@}"
-
 build/$(APP_NAME_NOSPACE).app/Contents/Resources/%.lproj: \
 Internationalization/%.lproj \
 | build/$(APP_NAME_NOSPACE).app/Contents/Resources
 	cp -R $< "${@}"
 
+# Application name does not include spaces.
 ifeq ($(APP_NAME),$(APP_NAME_NOSPACE))
 .PHONY: app
 app: \
 build/$(APP_NAME_NOSPACE).app/Contents/MacOS/$(APP_NAME_NOSPACE) \
 build/$(APP_NAME_NOSPACE).app/Contents/Info.plist \
 $(subst Internationalization/,build/$(APP_NAME_NOSPACE).app/Contents/Resources/,$(LPROJS))
+
+# Application name does have spaces.
 else
+NOSPACE_BUNDLE_FILES = $(shell find build/$(APP_NAME_NOSPACE).app -type f)
+
+
+build/$(APP_NAME).app: $(NOSPACE_BUNDLE_FILES)
+	rsync -rupE build/$(APP_NAME_NOSPACE).app/ "${@}/"
+
+build/$(APP_NAME).app/Contents/MacOS/$(APP_NAME): \
+build/$(APP_NAME_NOSPACE).app/Contents/MacOS/$(APP_NAME_NOSPACE)
+	cp -a "${<}" "${@}"
+	rm -f build/$(APP_NAME).app/Contents/MacOS/$(APP_NAME_NOSPACE)
+
 .PHONY: app
 app: \
 build/$(APP_NAME_NOSPACE).app/Contents/MacOS/$(APP_NAME_NOSPACE) \
@@ -104,8 +86,6 @@ build/$(APP_NAME_NOSPACE).app/Contents/Info.plist \
 $(subst Internationalization/,build/$(APP_NAME_NOSPACE).app/Contents/Resources/,$(LPROJS)) \
 build/$(APP_NAME).app \
 build/$(APP_NAME).app/Contents/MacOS/$(APP_NAME)
-
-# $(subst Internationalization/,build/$(APP_NAME_NOSPACE).app/Contents/Resources/,$(LOCALIZABLE_STRINGS))
 endif