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 /src/Makefile.am | |
| 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 'src/Makefile.am')
| -rw-r--r-- | src/Makefile.am | 22 |
1 files changed, 15 insertions, 7 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index fd055cb..f2c7ba6 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -57,11 +57,11 @@ krb5_auth_dialog_SOURCES = \ ka-entry-buffer.h \ ka-entry-buffer.c \ dummy-strings.c \ + resources.c \ $(NULL) krb5_auth_dialog_CPPFLAGS = \ -I$(top_srcdir)/secmem \ - -DKA_DATA_DIR=\""$(pkgdatadir)"\" \ -DDATA_DIR=\""$(datadir)"\" \ -DLOCALE_DIR=\""$(localedir)/"\" \ -DBIN_DIR=\""$(bindir)/"\" \ @@ -93,29 +93,37 @@ krb5_auth_dialog_LDADD = \ AM_CPPFLAGS = \ -I $(top_srcdir)/secmem/ \ $(DISABLE_DEPRECATED) \ - $(NULL) - -pkgdatadir = $(datadir)/krb5-auth-dialog -pkgdata_DATA = \ - krb5-auth-dialog.ui \ + -DG_LOG_DOMAIN="\"KrbAuthDialog\"" \ $(NULL) EXTRA_DIST = \ - $(pkgdata_DATA) \ $(schema_in_files) \ $(autostart_in_files) \ $(service_in_files) \ $(appdata_in_files) \ org.gnome.KrbAuthDialog.gschema.xml \ krb5-auth-dialog.1.in \ + krb5-auth-dialog.gresource.xml \ + resources/ui/app-menu.ui \ + resources/ui/ka-main-window.ui \ + resources/ui/ka-preferences.ui \ + resources/ui/ka-pwdialog.ui \ $(NULL) CLEANFILES = $(schema_DATA) \ $(service_DATA) \ $(appdata_DATA) \ + resources.c \ $(NULL) DISTCLEANFILES = \ krb5-auth-dialog.desktop \ $(NULL) +BUILT_SOURCES = \ + resources.c \ + $(NULL) + +resources.c: krb5-auth-dialog.gresource.xml $(shell $(GLIB_COMPILE_RESOURCES) --sourcedir=$(srcdir)/resources --generate-dependencies $(srcdir)/krb5-auth-dialog.gresource.xml) + $(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) $(srcdir)/krb5-auth-dialog.gresource.xml \ + --target=$@ --sourcedir=$(srcdir)/resources --generate-source |