From d911517dc2f9c4c3ce57529ac4d64c17185544e9 Mon Sep 17 00:00:00 2001
From: Guido Günther <agx@sigxcpu.org>
Date: Mon, 25 May 2009 18:39:27 +0200
Subject: Imported Upstream version 0.10

---
 preferences/Makefile.am | 37 ++++++++++++++++++++++---------------
 1 file changed, 22 insertions(+), 15 deletions(-)

(limited to 'preferences/Makefile.am')

diff --git a/preferences/Makefile.am b/preferences/Makefile.am
index 83541ea..56d93cb 100644
--- a/preferences/Makefile.am
+++ b/preferences/Makefile.am
@@ -1,26 +1,33 @@
 NULL =
 
-INCLUDES = \
-	-I $(top_srcdir)/src/ \
-	-DKA_DATA_DIR=\""$(pkgdatadir)"\" \
-	-DLOCALE_DIR=\""$(localedir)/"\" \
-	$(NULL)
-
 bin_PROGRAMS = krb5-auth-dialog-preferences
 
-schemadir = $(sysconfdir)/gconf/schemas
-
 krb5_auth_dialog_preferences_SOURCES = \
 	krb5-auth-dialog-preferences.c \
-	../src/krb5-auth-gconf-tools.c \
-	../src/krb5-auth-gconf-tools.h \
+	$(top_srcdir)/src/krb5-auth-gconf-tools.c \
+	$(top_srcdir)/src/krb5-auth-gconf-tools.h \
 	$(NULL)
 
+krb5_auth_dialog_preferences_CPPFLAGS = \
+	-I$(top_srcdir)/src \
+	-DKA_DATA_DIR=\""$(pkgdatadir)"\" \
+	-DLOCALE_DIR=\""$(localedir)/"\"
+	$(AM_CPPFLAGS)
+
+krb5_auth_dialog_preferences_CFLAGS = \
+	$(GTK_CFLAGS) \
+	$(GCONF_CFLAGS) \
+	$(AM_CFLAGS)
+
+
 krb5_auth_dialog_preferences_LDADD = \
-			@GCONF_LIBS@ \
-			@GLADE_LIBS@ \
-			@GTK_LIBS@ \
-			$(NULL)
+	$(GCONF_LIBS) \
+	$(GTK_LIBS) \
+	$(NULL)
+
+AM_CPPFLAGS = \
+	$(DISABLE_DEPRECATED) \
+	$(NULL)
 
 desktopdir       = $(datadir)/applications
 desktop_in_files = krb5-auth-dialog-preferences.desktop.in
@@ -30,7 +37,7 @@ desktop_DATA     = $(desktop_in_files:.desktop.in=.desktop)
 
 pkgdatadir = $(datadir)/krb5-auth-dialog
 pkgdata_DATA =			\
-	krb5-auth-dialog-preferences.glade
+	krb5-auth-dialog-preferences.xml
 
 CLEANFILES = \
 	$(desktop_DATA) \
-- 
cgit