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

---
 src/Makefile.am | 90 ++++++++++++++++++++++++++++++++++++++++-----------------
 1 file changed, 63 insertions(+), 27 deletions(-)

(limited to 'src/Makefile.am')

diff --git a/src/Makefile.am b/src/Makefile.am
index ac08e82..ed10e3f 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,6 +1,4 @@
-INCLUDES = \
-	-DKA_DATA_DIR=\""$(pkgdatadir)"\" \
-	-DLOCALE_DIR=\""$(localedir)/"\"
+NULL =
 
 bin_PROGRAMS = krb5-auth-dialog
 man_MANS = krb5-auth-dialog.1
@@ -10,12 +8,10 @@ autostart_in_files = krb5-auth-dialog.desktop.in
 autostart_DATA = $(autostart_in_files:.desktop.in=.desktop)
 @INTLTOOL_DESKTOP_RULE@
 
-schemadir = $(sysconfdir)/gconf/schemas
-schema_in_files = $(PACKAGE).schemas.in
+schemadir = $(GCONF_SCHEMA_FILE_DIR)
+schema_in_files = krb5-auth-dialog.schemas.in
 schema_DATA = $(schema_in_files:.schemas.in=.schemas)
-
-%.schemas: $(srcdir)/%.schemas.in
-	sed -e "s,::PACKAGE::,$(PACKAGE)," < $< > $@
+@INTLTOOL_SCHEMAS_RULE@
 
 servicedir       = $(datadir)/dbus-1/services
 service_in_files = org.gnome.KrbAuthDialog.service.in
@@ -37,21 +33,44 @@ krb5_auth_dialog_SOURCES =	\
 	krb5-auth-gconf-tools.h	\
 	krb5-auth-dbus.c	\
 	krb5-auth-dbus.h	\
-	dummy-strings.c
+	dummy-strings.c		\
+	$(NULL)
+
+krb5_auth_dialog_CPPFLAGS = \
+	-I$(top_srcdir)/gtksecentry \
+	-I$(top_srcdir)/secmem \
+	-DKA_DATA_DIR=\""$(pkgdatadir)"\" \
+	-DLOCALE_DIR=\""$(localedir)/"\" \
+	$(AM_CPPFLAGS) \
+	$(NULL)
+
+krb5_auth_dialog_CFLAGS = \
+	$(GTK_CFLAGS) \
+	$(DBUS_CFLAGS) \
+	$(GCONF_CFLAGS) \
+	$(KRB5_CFLAGS) \
+	$(NETWORK_MANAGER_CFLAGS) \
+	$(LIBNOTIFY_CFLAGS) \
+	$(WARN_CFLAGS) \
+	$(AM_CFLAGS) \
+	$(NULL)
 
 krb5_auth_dialog_LDADD = \
-			../gtksecentry/libgtksecentry.a \
-			../secmem/libsecmem.a \
-			@NETWORK_MANAGER_LIBS@ \
-			@KRB5_LIBS@ \
-			@LIBNOTIFY_LIBS@ \
-			@DBUS_LIBS@ \
-			@GCONF_LIBS@ \
-			@GLADE_LIBS@ \
-			@GTK_LIBS@
+	$(top_builddir)/gtksecentry/libgtksecentry.a \
+	$(top_builddir)/secmem/libsecmem.a \
+	$(NETWORK_MANAGER_LIBS) \
+	$(LIBCAP) \
+	$(KRB5_LIBS) \
+	$(LIBNOTIFY_LIBS) \
+	$(DBUS_LIBS) \
+	$(GCONF_LIBS) \
+	$(GIO_LIBS) \
+	$(GTK_LIBS) \
+	$(NULL)
 
 BUILT_SOURCES = \
-	krb5-auth-applet-dbus-glue.h
+	krb5-auth-applet-dbus-glue.h \
+	$(NULL)
 
 krb5-auth-applet-dbus-glue.h: $(srcdir)/krb5-auth-applet-dbus.xml
 	dbus-binding-tool                 \
@@ -59,21 +78,38 @@ krb5-auth-applet-dbus-glue.h: $(srcdir)/krb5-auth-applet-dbus.xml
 		--prefix=krb5_auth_dialog \
 		$< > $@
 
-AM_CPPFLAGS = -I $(top_srcdir)/gtksecentry/ -I $(top_srcdir)/secmem/
+AM_CPPFLAGS = \
+	-I $(top_srcdir)/gtksecentry/ \
+	-I $(top_srcdir)/secmem/ \
+	$(DISABLE_DEPRECATED) \
+	$(NULL)
 
 pkgdatadir = $(datadir)/krb5-auth-dialog
-pkgdata_DATA =			\
-	krb5-auth-dialog.glade
+pkgdata_DATA = \
+	krb5-auth-dialog.xml \
+	$(NULL)
 
-EXTRA_DIST =		\
-	$(pkgdata_DATA)   \
+EXTRA_DIST = \
+	$(pkgdata_DATA) \
 	$(schema_in_files) \
 	$(autostart_in_files) \
 	$(service_in_files) \
 	$(srcdir)/krb5-auth-applet-dbus.xml \
-	krb5-auth-dialog.1.in
+	krb5-auth-dialog.1.in \
+	$(NULL)
 
 CLEANFILES = $(schema_DATA) $(service_DATA)
 DISTCLEANFILES = \
-	krb5-auth-dialog.desktop 	\
-	krb5-auth-applet-dbus-glue.h
+	krb5-auth-dialog.desktop \
+	krb5-auth-applet-dbus-glue.h \
+	$(NULL)
+
+install-data-local: $(schema_DATA)
+if GCONF_SCHEMAS_INSTALL
+	if test -z "$(DESTDIR)" ; then \
+	for p in $^ ; do \
+		GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $$p 2>&1 > /dev/null; \
+	done \
+	fi
+endif
+
-- 
cgit