From 0512e111bbfc52df4959234ffe10031a731a2bec Mon Sep 17 00:00:00 2001
From: David Edmundson <david@davidedmundson.co.uk>
Date: Sat, 21 May 2011 20:26:22 +0100
Subject: Fixed up makefiles to reflect directory change

---
 configure.ac                                 |  3 ++-
 liblightdm-qt/Makefile.am                    |  5 +++++
 liblightdm-qt/QLightDM/Makefile.am           |  8 ++++----
 liblightdm-qt/QLightDM/liblightdm-qt-0.pc.in | 14 ++++++++++++++
 liblightdm-qt/liblightdm-qt-0.pc.in          | 14 --------------
 5 files changed, 25 insertions(+), 19 deletions(-)
 create mode 100644 liblightdm-qt/Makefile.am
 create mode 100644 liblightdm-qt/QLightDM/liblightdm-qt-0.pc.in
 delete mode 100644 liblightdm-qt/liblightdm-qt-0.pc.in

diff --git a/configure.ac b/configure.ac
index b48825cb..b3585e87 100644
--- a/configure.ac
+++ b/configure.ac
@@ -268,8 +268,9 @@ greeters/vala-gtk/Makefile
 liblightdm-gobject/liblightdm-gobject-0.pc
 liblightdm-gobject/Makefile
 liblightdm-gobject/lightdm/Makefile
-liblightdm-qt/liblightdm-qt-0.pc
 liblightdm-qt/Makefile
+liblightdm-qt/QLightDM/liblightdm-qt-0.pc
+liblightdm-qt/QLightDM/Makefile
 po/Makefile.in
 src/Makefile
 themes/Makefile
diff --git a/liblightdm-qt/Makefile.am b/liblightdm-qt/Makefile.am
new file mode 100644
index 00000000..8d56a28d
--- /dev/null
+++ b/liblightdm-qt/Makefile.am
@@ -0,0 +1,5 @@
+SUBDIRS = QLightDM
+
+DISTCLEANFILES = \
+        Makefile.in
+
diff --git a/liblightdm-qt/QLightDM/Makefile.am b/liblightdm-qt/QLightDM/Makefile.am
index 61d1cba8..2bc281e0 100644
--- a/liblightdm-qt/QLightDM/Makefile.am
+++ b/liblightdm-qt/QLightDM/Makefile.am
@@ -15,10 +15,10 @@ liblightdm_qt_0include_HEADERS = \
 	language.h \
 	sessionsmodel.h \
 	user.h \
-	QLightDM/Greeter \
-	QLightDM/Language \
-	QLightDM/SessionsModel \
-	QLightDM/User
+	Greeter \
+	Language \
+	SessionsModel \
+	User
 liblightdm_qt_0includedir=$(includedir)/lightdm-qt-0/lightdm
 
 liblightdm_qt_0_la_LIBADD = $(LIBLIGHTDM_QT_LIBS)
diff --git a/liblightdm-qt/QLightDM/liblightdm-qt-0.pc.in b/liblightdm-qt/QLightDM/liblightdm-qt-0.pc.in
new file mode 100644
index 00000000..d779ebc1
--- /dev/null
+++ b/liblightdm-qt/QLightDM/liblightdm-qt-0.pc.in
@@ -0,0 +1,14 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+
+themedir=@THEME_DIR@
+greeterdir=@libexecdir@
+
+Name: liblightdm-qt
+Description: LightDM client library
+Version: @VERSION@
+Requires: QtCore QtGui
+Libs: -L${libdir} -llightdm-qt-0
+Cflags: -I${includedir}/lightdm-qt-0
diff --git a/liblightdm-qt/liblightdm-qt-0.pc.in b/liblightdm-qt/liblightdm-qt-0.pc.in
deleted file mode 100644
index d779ebc1..00000000
--- a/liblightdm-qt/liblightdm-qt-0.pc.in
+++ /dev/null
@@ -1,14 +0,0 @@
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-libdir=@libdir@
-includedir=@includedir@
-
-themedir=@THEME_DIR@
-greeterdir=@libexecdir@
-
-Name: liblightdm-qt
-Description: LightDM client library
-Version: @VERSION@
-Requires: QtCore QtGui
-Libs: -L${libdir} -llightdm-qt-0
-Cflags: -I${includedir}/lightdm-qt-0
-- 
cgit v1.2.1