summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorTomás Touceda <chiiph@leap.se>2013-06-28 14:25:19 -0300
committerTomás Touceda <chiiph@leap.se>2013-06-28 14:25:19 -0300
commit5b975799ce9b7a6e0a88be4bcb48bdfb90800bb3 (patch)
treebda674a79b1aeccb37b67609517bc4761db7ae07 /Makefile
parent9cea9c8a34343f8792d65b96f93ae22bd8685878 (diff)
parentc088a1544a5f7a51359d2802019c0740aab0cc5b (diff)
Merge branch 'release-0.2.2'0.2.2
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile44
1 files changed, 21 insertions, 23 deletions
diff --git a/Makefile b/Makefile
index 8d63232f..81db6886 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,3 @@
-SHELL := /bin/zsh
# ################################
# Makefile for compiling resources
# files.
@@ -9,7 +8,8 @@ SHELL := /bin/zsh
#Directory with ui and resource files
RESOURCE_DIR = data/resources
-
+UI_DIR = src/leap/gui/ui
+
#Directory for compiled resources
COMPILED_DIR = src/leap/gui
@@ -18,52 +18,50 @@ TRANSLAT_DIR = data/translations
#Project file, used for translations
PROJFILE = data/leap_client.pro
-
+
#UI files to compile
-# UI_FILES = foo.ui
-UI_FILES =
+UI_FILES = loggerwindow.ui mainwindow.ui wizard.ui login.ui statuspanel.ui
#Qt resource files to compile
-#images.qrc
-RESOURCES = mainwindow.qrc locale.qrc
-
+RESOURCES = locale.qrc loggerwindow.qrc mainwindow.qrc icons.qrc
+
#pyuic4 and pyrcc4 binaries
-PYUIC = pyuic4
-PYRCC = pyrcc4
+PYUIC = pyside-uic
+PYRCC = pyside-rcc
PYLUP = pylupdate4
LRELE = lrelease
-
+
#################################
# DO NOT EDIT FOLLOWING
-
+
COMPILED_UI = $(UI_FILES:%.ui=$(COMPILED_DIR)/ui_%.py)
COMPILED_RESOURCES = $(RESOURCES:%.qrc=$(COMPILED_DIR)/%_rc.py)
DEBVER = $(shell dpkg-parsechangelog | sed -ne 's,Version: ,,p')
#
-
-all : resources ui
-
-resources : $(COMPILED_RESOURCES)
-
+
+all : resources ui
+
+resources : $(COMPILED_RESOURCES)
+
ui : $(COMPILED_UI)
translations:
$(PYLUP) $(PROJFILE)
$(LRELE) $(TRANSLAT_DIR)/*.ts
-
-$(COMPILED_DIR)/ui_%.py : $(RESOURCE_DIR)/%.ui
+
+$(COMPILED_DIR)/ui_%.py : $(UI_DIR)/%.ui
$(PYUIC) $< -o $@
-
+
$(COMPILED_DIR)/%_rc.py : $(RESOURCE_DIR)/%.qrc
$(PYRCC) $< -o $@
manpages:
- rst2man docs/man/leap-client.1.rst docs/man/leap-client.1
+ rst2man docs/man/leap.1.rst docs/man/leap.1
apidocs:
@sphinx-apidoc -o docs/api src/leap
-clean :
- $(RM) $(COMPILED_UI) $(COMPILED_RESOURCES) $(COMPILED_UI:.py=.pyc) $(COMPILED_RESOURCES:.py=.pyc)
+clean :
+ $(RM) $(COMPILED_UI) $(COMPILED_RESOURCES) $(COMPILED_UI:.py=.pyc) $(COMPILED_RESOURCES:.py=.pyc)