X-Git-Url: http://git.maemo.org/git/?p=watersofshiloah;a=blobdiff_plain;f=Makefile;h=5026a49be01d7e629a6ddeb6f326858fe32b559e;hp=5f805c55c638e1003c67ed17be4451ed39b2fb7e;hb=9da62f6abb3598b315883bb4e7ef4c22e11888e2;hpb=89d90bff270529186ce3e4a8b21ba940146ec030

diff --git a/Makefile b/Makefile
index 5f805c5..5026a49 100644
--- a/Makefile
+++ b/Makefile
@@ -1,9 +1,10 @@
-PROJECT_NAME=MormonChannel
+PROJECT_NAME=WatersOfShiloah
 SOURCE_PATH=src
 SOURCE=$(shell find $(SOURCE_PATH) -iname "*.py")
-PROGRAM=$(SOURCE_PATH)/$(PROJECT_NAME).py
-DATA_TYPES=*.ini *.map *.glade *.png
-DATA=$(foreach type, $(DATA_TYPES), $(shell find $(SOURCE_PATH) -iname "$(type)"))
+PROGRAM=$(SOURCE_PATH)/watersofshiloah_gtk.py
+DATA_PATH=data
+DATA_TYPES=*.ini *.map *.glade *.png *.gif
+DATA=$(foreach type, $(DATA_TYPES), $(shell find $(DATA_PATH) -iname "$(type)")) data/COPYING
 OBJ=$(SOURCE:.py=.pyc)
 BUILD_PATH=./build
 TAG_FILE=~/.ctags/$(PROJECT_NAME).tags
@@ -25,7 +26,7 @@ CTAGS=ctags-exuberant
 all: test
 
 run: $(OBJ)
-	$(SOURCE_PATH)/$(PROJECT_NAME).py
+	$(PROGRAM)
 
 profile: $(OBJ)
 	$(PROFILE_GEN) $(PROGRAM)
@@ -44,12 +45,9 @@ package: $(OBJ)
 	cp $(SOURCE_PATH)/constants.py  $(BUILD_PATH)/generic
 	cp $(SOURCE_PATH)/$(PROJECT_NAME).py  $(BUILD_PATH)/generic
 	$(foreach file, $(DATA), cp $(file) $(BUILD_PATH)/generic/$(subst /,-,$(file)) ; )
-	$(foreach file, $(SOURCE), cp $(file) $(BUILD_PATH)/generic/$(subst /,-,$(file)) ; )
-	#$(foreach file, $(OBJ), cp $(file) $(BUILD_PATH)/generic/$(subst /,-,$(file)) ; )
+	$(foreach file, $(SOURCE) $(SOURCE_PATH)/LICENSE, cp $(file) $(BUILD_PATH)/generic/$(subst /,-,$(file)) ; )
 	cp support/$(PROJECT_NAME).desktop $(BUILD_PATH)/generic
-	cp support/icons/hicolor/26x26/hildon/$(PROJECT_NAME).png $(BUILD_PATH)/generic/26x26-$(PROJECT_NAME).png
-	cp support/icons/hicolor/64x64/hildon/$(PROJECT_NAME).png $(BUILD_PATH)/generic/64x64-$(PROJECT_NAME).png
-	cp support/icons/hicolor/scalable/hildon/$(PROJECT_NAME).png $(BUILD_PATH)/generic/scale-$(PROJECT_NAME).png
+	cp data/icon.png $(BUILD_PATH)/generic/48x48-$(PROJECT_NAME).png
 	cp support/builddeb.py $(BUILD_PATH)/generic
 	cp support/py2deb.py $(BUILD_PATH)/generic
 	cp support/fake_py2deb.py $(BUILD_PATH)/generic
@@ -65,9 +63,9 @@ package: $(OBJ)
 	cd $(BUILD_PATH)/debian ; python builddeb.py debian
 
 upload:
-	dput fremantle-extras-builder $(BUILD_PATH)/fremantle/$(PROJECT_NAME)*.changes
-	dput diablo-extras-builder $(BUILD_PATH)/diablo/$(PROJECT_NAME)*.changes
-	cp $(BUILD_PATH)/debian/*.deb ./www/$(PROJECT_NAME).deb
+	dput fremantle-extras-builder $(BUILD_PATH)/fremantle/watersofshiloah*.changes
+	dput diablo-extras-builder $(BUILD_PATH)/diablo/watersofshiloah*.changes
+	cp $(BUILD_PATH)/debian/*.deb ./www/watersofshiloah.deb
 
 lint: $(OBJ)
 	$(foreach file, $(SOURCE), $(LINT) $(file) ; )