summaryrefslogtreecommitdiffstats
path: root/Makefile.am
diff options
context:
space:
mode:
authorme_desk <me_desk@fb96df88-216d-11de-830c-f3023f12d8ac>2012-08-23 18:46:35 +0000
committerme_desk <me_desk@fb96df88-216d-11de-830c-f3023f12d8ac>2012-08-23 18:46:35 +0000
commit9c2e9e45a5c743a93d6039548fa583e8eae04f04 (patch)
tree409e81c55d122210a50564c5750ff2fc1f8fc109 /Makefile.am
parenta85553073f2b0b3451f72ecd614740d638562821 (diff)
downloadpica-pica-9c2e9e45a5c743a93d6039548fa583e8eae04f04.tar.gz
pica-pica-9c2e9e45a5c743a93d6039548fa583e8eae04f04.zip
support for moc and uic named as uic-qt4 and moc-qt4
git-svn-id: svn://localhost/project_picapica/trunk@183 fb96df88-216d-11de-830c-f3023f12d8ac
Diffstat (limited to 'Makefile.am')
-rw-r--r--Makefile.am6
1 files changed, 3 insertions, 3 deletions
diff --git a/Makefile.am b/Makefile.am
index 9ba1d94..f7b604d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -110,10 +110,10 @@ moc_viewcertdialog.cpp \
ui_mainwindow.h
moc_%.cpp: pica-client/%.h
- moc $< -o $@
+ $(MOC) $< -o $@
moc_%.cpp: pica-client/dialogs/%.h
- moc $< -o $@
+ $(MOC) $< -o $@
pica-client/mainwindow.cpp: ui_mainwindow.h
@@ -121,7 +121,7 @@ pica-client/mainwindow.cpp: ui_mainwindow.h
# uic $(CPPFLAGS) $< -o $@
ui_%.h: pica-client/%.ui
- uic $(CPPFLAGS) $< -o $@
+ $(UIC) $(CPPFLAGS) $< -o $@
pica_client_pica_client_CPPFLAGS = -DPICA_INSTALLPREFIX=\"$(prefix)\" $(QT_DEPENDENCIES_CFLAGS)