diff options
| author | Guido Günther <agx@sigxcpu.org> | 2014-10-27 20:14:06 +0100 |
|---|---|---|
| committer | Guido Günther <agx@sigxcpu.org> | 2014-10-27 20:14:06 +0100 |
| commit | c39fada698da5b17680af8d9e6958b07bfbdbdd3 (patch) | |
| tree | e9e2eae6977769d87736dd9c5a197c7b7e14a266 /plugins | |
| parent | Document changes and release 3.12.0-2 (diff) | |
| parent | New upstream version 3.15.1 (diff) | |
| download | krb5-auth-dialog-c39fada698da5b17680af8d9e6958b07bfbdbdd3.tar.gz krb5-auth-dialog-c39fada698da5b17680af8d9e6958b07bfbdbdd3.tar.bz2 krb5-auth-dialog-c39fada698da5b17680af8d9e6958b07bfbdbdd3.zip | |
Merge tag 'upstream/3.15.1' into experimental
Upstream version 3.15.1
# gpg: Signature made Mo 27 Okt 2014 20:14:03 CET
# gpg: using RSA key 0x07B8B7B0EA98120B
# gpg: please do a --check-trustdb
# gpg: Good signature from "Guido Günther <agx@sigxcpu.org>"
# gpg: aka "Guido Günther <gg@godiug.net>"
# gpg: aka "Guido Günther <agx@debian.org>"
Diffstat (limited to 'plugins')
| -rw-r--r-- | plugins/Makefile.am | 16 | ||||
| -rw-r--r-- | plugins/Makefile.in | 17 |
2 files changed, 23 insertions, 10 deletions
diff --git a/plugins/Makefile.am b/plugins/Makefile.am index 36e1ca3..7a8d281 100644 --- a/plugins/Makefile.am +++ b/plugins/Makefile.am @@ -8,6 +8,12 @@ else PAM_PLUGIN = endif +AM_CPPFLAGS = \ + -I$(top_srcdir)/src \ + $(DISABLE_DEPRECATED) \ + -DG_LOG_DOMAIN="\"KrbAuthDialog\"" \ + $(NULL) + pkglib_LTLIBRARIES = \ libka-plugin-dummy.la \ $(PAM_PLUGIN) \ @@ -22,8 +28,8 @@ libka_plugin_dummy_la_SOURCES = \ $(NULL) libka_plugin_dummy_la_CPPFLAGS = \ - $(GTK_CFLAGS) \ - -I$(top_srcdir)/src \ + $(AM_CPPFLAGS) \ + $(GTK_CFLAGS) \ $(NULL) libka_plugin_dummy_la_LDFLAGS = \ @@ -39,8 +45,8 @@ libka_plugin_pam_la_SOURCES = \ $(NULL) libka_plugin_pam_la_CPPFLAGS = \ + $(AM_CPPFLAGS) \ $(GTK_CFLAGS) \ - -I$(top_srcdir)/src \ $(NULL) libka_plugin_pam_la_LDFLAGS = \ @@ -57,8 +63,8 @@ libka_plugin_afs_la_SOURCES = \ $(NULL) libka_plugin_afs_la_CPPFLAGS = \ - $(GTK_CFLAGS) \ -I$(top_srcdir)/src \ + $(GTK_CFLAGS) \ $(NULL) libka_plugin_afs_la_LDFLAGS = \ @@ -73,8 +79,8 @@ libka_plugin_gnomelock_la_SOURCES = \ $(NULL) libka_plugin_gnomelock_la_CPPFLAGS = \ - $(GIO_CFLAGS) \ -I$(top_srcdir)/src \ + $(GIO_CFLAGS) \ $(NULL) libka_plugin_gnomelock_la_LDFLAGS = \ diff --git a/plugins/Makefile.in b/plugins/Makefile.in index 7951faa..690ce38 100644 --- a/plugins/Makefile.in +++ b/plugins/Makefile.in @@ -265,6 +265,7 @@ FGREP = @FGREP@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GIO_CFLAGS = @GIO_CFLAGS@ GIO_LIBS = @GIO_LIBS@ +GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@ GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GMODULE_CFLAGS = @GMODULE_CFLAGS@ GMODULE_LIBS = @GMODULE_LIBS@ @@ -415,6 +416,12 @@ top_srcdir = @top_srcdir@ NULL = @ENABLE_PAM_PLUGIN_FALSE@PAM_PLUGIN = @ENABLE_PAM_PLUGIN_TRUE@PAM_PLUGIN = libka-plugin-pam.la +AM_CPPFLAGS = \ + -I$(top_srcdir)/src \ + $(DISABLE_DEPRECATED) \ + -DG_LOG_DOMAIN="\"KrbAuthDialog\"" \ + $(NULL) + pkglib_LTLIBRARIES = \ libka-plugin-dummy.la \ $(PAM_PLUGIN) \ @@ -430,8 +437,8 @@ libka_plugin_dummy_la_SOURCES = \ $(NULL) libka_plugin_dummy_la_CPPFLAGS = \ - $(GTK_CFLAGS) \ - -I$(top_srcdir)/src \ + $(AM_CPPFLAGS) \ + $(GTK_CFLAGS) \ $(NULL) libka_plugin_dummy_la_LDFLAGS = \ @@ -447,8 +454,8 @@ libka_plugin_dummy_la_LDFLAGS = \ @ENABLE_PAM_PLUGIN_TRUE@ $(NULL) @ENABLE_PAM_PLUGIN_TRUE@libka_plugin_pam_la_CPPFLAGS = \ +@ENABLE_PAM_PLUGIN_TRUE@ $(AM_CPPFLAGS) \ @ENABLE_PAM_PLUGIN_TRUE@ $(GTK_CFLAGS) \ -@ENABLE_PAM_PLUGIN_TRUE@ -I$(top_srcdir)/src \ @ENABLE_PAM_PLUGIN_TRUE@ $(NULL) @ENABLE_PAM_PLUGIN_TRUE@libka_plugin_pam_la_LDFLAGS = \ @@ -465,8 +472,8 @@ libka_plugin_afs_la_SOURCES = \ $(NULL) libka_plugin_afs_la_CPPFLAGS = \ - $(GTK_CFLAGS) \ -I$(top_srcdir)/src \ + $(GTK_CFLAGS) \ $(NULL) libka_plugin_afs_la_LDFLAGS = \ @@ -482,8 +489,8 @@ libka_plugin_gnomelock_la_SOURCES = \ $(NULL) libka_plugin_gnomelock_la_CPPFLAGS = \ - $(GIO_CFLAGS) \ -I$(top_srcdir)/src \ + $(GIO_CFLAGS) \ $(NULL) libka_plugin_gnomelock_la_LDFLAGS = \ |