build fixed

9 years ago · fccd88b94f
parent 3aaa9f4e27
commit fccd88b94f
4 changed files with 3 additions and 10 deletions
--- a/examples/makefile.am
+++ b/examples/makefile.am
@ -41,12 +41,5 @@ noinst_PROGRAMS += suisse-id-demo
 noinst_HEADERS = suisse-id-demo.hxx
 suisse_id_demo_SOURCES = suisse-id-demo.cxx
 endif
-
-%_ui.hxx: %.ui
-	@UIC@ -o $@ $<
-
-moc_%.cxx: %.hxx
-	@MOC@ -o $@ $<
-
 CLEANFILES = ${BUILT_SOURCES}
 MAINTAINERCLEANFILES = makefile.in
--- a/src/cardgui.hxx
+++ b/src/cardgui.hxx
@ -9,7 +9,7 @@
 #define CARDGUI_HXX

 #include <cardgui-model.hxx>
-#include <cardgui_ui.hxx>
+#include <ui_cardgui.hxx>
 #include <password.hxx>

 #include <QtCore/QProcess>
--- a/src/makefile.am
+++ b/src/makefile.am
@ -46,7 +46,7 @@ if HAVE_QTGUI
 bin_PROGRAMS = cardgui
 cardgui_SOURCES = cardgui.cxx cardgui.hxx password.hxx cardgui-model.hxx \
                  cardgui.ui password.ui
-nodist_cardgui_SOURCES = cardgui_ui.hxx password_ui.hxx \
+nodist_cardgui_SOURCES = ui_cardgui.hxx ui_password.hxx \
                         moc_cardgui.cxx moc_password.cxx moc_cardgui-model.cxx
 BUILT_SOURCES = ${nodist_cardgui_SOURCES}
 cardgui_LDADD = libpcscxx.la ${libpcscxx_la_LIBADD}
--- a/src/password.hxx
+++ b/src/password.hxx
@ -8,7 +8,7 @@
 #ifndef PASSWORD_HXX
 #define PASSWORD_HXX

-#include <password_ui.hxx>
+#include <ui_password.hxx>

 class Password: public QDialog, protected Ui_Password {