From bad0b32e8290bf4fbbf50f4bd25a1b04ad4afdd0 Mon Sep 17 00:00:00 2001 From: epage Date: Sat, 2 Aug 2008 02:53:44 +0000 Subject: [PATCH] Some makefile cleanups and tested the package installation on desktop git-svn-id: file:///svnroot/gc-dialer/trunk@117 c39d3808-3fe2-4d86-a59f-b7f623ee9f21 --- Makefile | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/Makefile b/Makefile index 7df357d..4f14b5b 100644 --- a/Makefile +++ b/Makefile @@ -30,9 +30,9 @@ COVERAGE_TEST=figleaf PROFILER=pyprofiler CTAGS=ctags-exuberant -.PHONY: all run debug test lint tags build pre_package hand_package clean +.PHONY: all run debug test lint tags build package clean -all: test tags hand_package +all: test tags package run: $(SOURCE) cd $(SOURCE_PATH) ; ./gc_dialer.py @@ -57,7 +57,11 @@ lint: $(LINT_STATS) tags: $(TAG_FILE) -build: $(BUILD_BIN) +build: $(BUILD_PATH) + +package: $(DEB_PACKAGE) + +$(BUILD_PATH): $(BUILD_BIN) mkdir -p $(BUILD_PATH) cp $(SOURCE_PATH)/gc_dialer_256.png $(BUILD_PATH) @@ -70,7 +74,7 @@ build: $(BUILD_BIN) cp $(SOURCE_PATH)/gc_dialer.glade $(BUILD_PATH) -pre_package: build +$(PRE_PACKAGE_PATH): $(BUILD_PATH) mkdir -p $(PRE_PACKAGE_PATH)/build/usr/share/icons/hicolor/scalable/hildon mkdir -p $(PRE_PACKAGE_PATH)/build/usr/share/icons/hicolor/26x26/hildon mkdir -p $(PRE_PACKAGE_PATH)/build/usr/share/icons/hicolor/64x64/hildon @@ -99,9 +103,7 @@ ifeq ($(PLATFORM),desktop) sed -i 's/, python2.5-hildon//' $(PRE_PACKAGE_PATH)/build/DEBIAN/control endif -hand_package: $(DEB_PACKAGE) - -$(DEB_PACKAGE): pre_package +$(DEB_PACKAGE): $(PRE_PACKAGE_PATH) mkdir -p $(PACKAGE_PATH) dpkg-deb -b $(PRE_PACKAGE_PATH)/build/ $(DEB_PACKAGE) -- 1.7.9.5