From fccd88b94fcd76bcb966cc4434231dd1a26e3126 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20W=C3=A4ckerlin?= <marc@mrw.sh>
Date: Sat, 14 Mar 2015 14:25:16 +0000
Subject: [PATCH] build fixed

---
 examples/makefile.am | 7 -------
 src/cardgui.hxx      | 2 +-
 src/makefile.am      | 2 +-
 src/password.hxx     | 2 +-
 4 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/examples/makefile.am b/examples/makefile.am
index d7301b3..c2b71af 100644
--- 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
diff --git a/src/cardgui.hxx b/src/cardgui.hxx
index 7cdfd76..15701b5 100644
--- 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>
diff --git a/src/makefile.am b/src/makefile.am
index 9835a61..2803fe2 100644
--- 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}
diff --git a/src/password.hxx b/src/password.hxx
index b9ce238..c7b08ca 100644
--- 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 {