X-Git-Url: http://git.maemo.org/git/?p=theonering;a=blobdiff_plain;f=Makefile;h=0ba6f784e47e4b32dd1a94a0742746c14b4e4283;hp=1bfbe22ae3326e19704e492fbd9f76d1579b625a;hb=ecddbf102cb0a26d02712f41740c1c16c12c7d0f;hpb=af99e138505877d6528005e3576246b88b34de46

diff --git a/Makefile b/Makefile
index 1bfbe22..0ba6f78 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
 PROJECT_NAME=theonering
 SOURCE_PATH=src
 SOURCE=$(shell find $(SOURCE_PATH) -iname "*.py")
-PROGRAM=$(SOURCE_PATH)/$(PROJECT_NAME).py
+PROGRAM=$(SOURCE_PATH)/telepathy-$(PROJECT_NAME)
 DATA_TYPES=*.ini *.map *.glade *.png
 DATA=$(foreach type, $(DATA_TYPES), $(shell find $(SOURCE_PATH) -iname "$(type)"))
 OBJ=$(SOURCE:.py=.pyc)
@@ -25,7 +25,7 @@ CTAGS=ctags-exuberant
 all: test
 
 run: $(OBJ)
-	$(SOURCE_PATH)/dc_glade.py
+	$(SOURCE_PATH)/telepathy-theonering
 
 profile: $(OBJ)
 	$(PROFILE_GEN) $(PROGRAM)
@@ -42,18 +42,17 @@ package: $(OBJ)
 
 	mkdir -p $(BUILD_PATH)/generic
 	cp $(SOURCE_PATH)/constants.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, $(DATA), cp $(file) $(BUILD_PATH)/generic/$(subst /,!,$(file)) ; )
+	$(foreach file, $(SOURCE), cp $(file) $(BUILD_PATH)/generic/$(subst /,!,$(file)) ; )
+	cp $(SOURCE_PATH)/telepathy-theonering $(BUILD_PATH)/generic/
 	cp support/$(PROJECT_NAME).manager $(BUILD_PATH)/generic
+	cp support/$(PROJECT_NAME).profile.* $(BUILD_PATH)/generic
 	cp support/org.freedesktop.Telepathy.ConnectionManager.$(PROJECT_NAME).service $(BUILD_PATH)/generic
-	cp support/icons/*-$(PROJECT_NAME).png $(BUILD_PATH)/generic/
+	cp support/icons/*-tor_*.png $(BUILD_PATH)/generic/
 	cp support/builddeb.py $(BUILD_PATH)/generic
 	cp support/py2deb.py $(BUILD_PATH)/generic
 	cp support/fake_py2deb.py $(BUILD_PATH)/generic
 
-	mkdir -p $(BUILD_PATH)/chinook
-	cp -R $(BUILD_PATH)/generic/* $(BUILD_PATH)/chinook
-	cd $(BUILD_PATH)/chinook ; python builddeb.py chinook
 	mkdir -p $(BUILD_PATH)/diablo
 	cp -R $(BUILD_PATH)/generic/* $(BUILD_PATH)/diablo
 	cd $(BUILD_PATH)/diablo ; python builddeb.py diablo
@@ -63,11 +62,14 @@ package: $(OBJ)
 	mkdir -p $(BUILD_PATH)/mer
 	cp -R $(BUILD_PATH)/generic/* $(BUILD_PATH)/mer
 	cd $(BUILD_PATH)/mer ; python builddeb.py mer
-
-upload: package
-	dput fremantle-extras-builder $(BUILD_PATH)/fremantle/$(PROJECT_NAME)*.changes
-	dput diablo-extras-builder $(BUILD_PATH)/diablo/$(PROJECT_NAME)*.changes
-	dput chinook-extras-builder $(BUILD_PATH)/chinook/$(PROJECT_NAME)*.changes
+	mkdir -p $(BUILD_PATH)/debian
+	cp -R $(BUILD_PATH)/generic/* $(BUILD_PATH)/debian
+	cd $(BUILD_PATH)/debian ; python builddeb.py debian
+
+upload:
+	dput fremantle-extras-builder $(BUILD_PATH)/fremantle/telepathy-$(PROJECT_NAME)*.changes
+	dput diablo-extras-builder $(BUILD_PATH)/diablo/telepathy-$(PROJECT_NAME)*.changes
+	cp $(BUILD_PATH)/debian/*.deb www/telepathy-$(PROJECT_NAME).deb
 
 lint: $(OBJ)
 	$(foreach file, $(SOURCE), $(LINT) $(file) ; )