Removed an unneeded function

[gc-dialer] / Makefile

diff --git a/Makefile b/Makefile
index b3686ba..5b97e77 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,10 +1,13 @@
 PROJECT_NAME=gc_dialer
-SOURCE_PATH=./gc_dialer
+SOURCE_PATH=src
 SOURCE=$(SOURCE_PATH)/gc_dialer.py $(SOURCE_PATH)/gcbackend.py $(SOURCE_PATH)/browser_emu.py
 OBJ=$(SOURCE:.py=.pyc)
+LINT_STATS_PATH=~/.pylint.d
+LINT_STATS=$(foreach file, $(addsuffix 1.stats,$(subst /,.,$(basename $(SOURCE)))), $(LINT_STATS_PATH)/$(file) )
 TEST_PATH=./tests
 TAG_FILE=~/.ctags/$(PROJECT_NAME).tags
 PYPACKAGE_FILE=./support/GrandcentralDialer.pypackager
+SDK_DISPLAY=:2
 
 PLATFORM=desktop
 ifeq ($(PLATFORM),os2007)
@@ -37,8 +40,17 @@ debug: $(SOURCE)
 test: $(SOURCE)
        cd $(SOURCE_PATH) ; ./gc_dialer.py -t
 
-lint: $(SOURCE_PATH)
-       $(foreach file, $(SOURCE_PATH), $(LINT) $(file) ; )
+xephyr:
+        Xephyr $(SDK_DISPLAY) -host-cursor -screen 800x480x16 -dpi 96 -ac
+
+sdk_start:
+       export DISPLAY=$(SDK_DISPLAY)
+       af-sb-ini.sh start
+
+sdk_stop:
+       af-sb-ini.sh stop
+
+lint: $(LINT_STATS)
 
 tags: $(TAG_FILE) 
 
@@ -72,7 +84,10 @@ package: build
        cp $(BUILD_PATH)/gc_dialer.desktop $(PACKAGE_PATH)/build/usr/share/applications/hildon
 
        cp $(BUILD_PATH)/gc_dialer.glade $(PACKAGE_PATH)/build/usr/local/lib
-       
+ifneq ($(PLATFORM),desktop)
+       sed -i 's/^[ \t]*//;s/GtkWindow/HildonWindow/' $(PACKAGE_PATH)/build/usr/local/lib/gc_dialer.glade
+endif
+
        cp $(BUILD_BIN) $(PACKAGE_PATH)/build/usr/local/bin
 
        cp $(PYPACKAGE_FILE) $(PACKAGE_PATH)
@@ -80,6 +95,7 @@ package: build
 clean:
        rm -Rf $(PACKAGE_PATH) $(BUILD_PATH)
        rm -Rf $(OBJ)
+       rm -Rf $(LINT_STATS_PATH)/*
 
 $(BUILD_BIN): $(SOURCE)
        mkdir -p $(dir $(BUILD_BIN))
@@ -87,11 +103,22 @@ $(BUILD_BIN): $(SOURCE)
        #Construct the program by cat-ing all the python files together
        echo "#!/usr/bin/python2.5" > $(BUILD_BIN)
        #echo "from __future__ import with_statement" >> $(PACKAGE_PATH)/usr/local/bin/gc_dialer.py
-       cat gc_dialer/gc_dialer.py gc_dialer/gcbackend.py gc_dialer/browser_emu.py | grep -e '^import ' | sort -u >> $(BUILD_BIN)
-       cat gc_dialer/browser_emu.py gc_dialer/gcbackend.py gc_dialer/gc_dialer.py | grep -v 'browser_emu' | grep -v 'gcbackend' | grep -v "#!" >> $(BUILD_BIN)
+       cat $(SOURCE_PATH)/gc_dialer.py $(SOURCE_PATH)/gcbackend.py $(SOURCE_PATH)/browser_emu.py | grep -e '^import ' | sort -u >> $(BUILD_BIN)
+       cat $(SOURCE_PATH)/browser_emu.py $(SOURCE_PATH)/gcbackend.py $(SOURCE_PATH)/gc_dialer.py | grep -v 'browser_emu' | grep -v 'gcbackend' | grep -v "#!" >> $(BUILD_BIN)
        chmod 755 $(BUILD_BIN)
 
 $(TAG_FILE): $(SOURCE)
        mkdir -p $(dir $(TAG_FILE))
        $(CTAGS) -o $(TAG_FILE) $(SOURCE)
 
+%1.stats: $(SOURCE)
+       @ #DESIRED DEPENDENCY: $(subst .,/,$(notdir $*)).py
+       @ #DESIRED COMMAND: $(LINT) $<
+       @ $(LINT) $(subst .,/,$(notdir $*)).py
+       @# echo $*
+       @# echo $?
+
+#Makefile Debugging
+#Target to print any variable, can be added to the dependencies of any other target
+#Userfule flags for make, -d, -p, -n
+print-%: ; @$(error $* is $($*) ($(value $*)) (from $(origin $*)))