diff options
| author | Kévin THIERRY <kevin.thierry@open.eurogiciel.org> | 2014-11-13 09:26:18 +0100 |
|---|---|---|
| committer | Kévin THIERRY <kevin.thierry@open.eurogiciel.org> | 2014-11-13 09:26:18 +0100 |
| commit | e87a22655de485af790db1d4c51f4bc166a2bbd6 (patch) | |
| tree | 93d088c2bc13d9a26e6f24b70936d998bd1404df /scd/Makefile.am | |
| parent | 6576640b55777bd811a12a188b9b1f3c63653799 (diff) | |
| download | gpg2-e87a22655de485af790db1d4c51f4bc166a2bbd6.tar.gz gpg2-e87a22655de485af790db1d4c51f4bc166a2bbd6.tar.bz2 gpg2-e87a22655de485af790db1d4c51f4bc166a2bbd6.zip | |
Imported Upstream version 2.0.26upstream/2.0.26
Diffstat (limited to 'scd/Makefile.am')
| -rw-r--r-- | scd/Makefile.am | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/scd/Makefile.am b/scd/Makefile.am index 58e2f9b..e883180 100644 --- a/scd/Makefile.am +++ b/scd/Makefile.am @@ -17,19 +17,24 @@ ## Process this file with automake to produce Makefile.in -bin_PROGRAMS = scdaemon -if ! HAVE_W32_SYSTEM -libexec_PROGRAMS = gnupg-pcsc-wrapper +if HAVE_W32_SYSTEM +libexec_PROGRAMS = scdaemon +else +libexec_PROGRAMS = scdaemon gnupg-pcsc-wrapper endif -EXTRA_DIST = ChangeLog-2011 +EXTRA_DIST = ChangeLog-2011 scdaemon-w32info.rc AM_CPPFLAGS = -I$(top_srcdir)/gl -I$(top_srcdir)/intl -I$(top_srcdir)/common include $(top_srcdir)/am/cmacros.am -AM_CFLAGS = $(LIBGCRYPT_CFLAGS) \ - $(KSBA_CFLAGS) $(LIBASSUAN_CFLAGS) $(PTH_CFLAGS) +if HAVE_W32_SYSTEM +resource_objs += scdaemon-w32info.o +endif + +AM_CFLAGS = $(GPG_ERROR_CFLAGS) $(LIBGCRYPT_CFLAGS) \ + $(KSBA_CFLAGS) $(LIBASSUAN_CFLAGS) $(PTH_CFLAGS) card_apps = app-openpgp.c app-nks.c app-dinsig.c app-p15.c app-geldkarte.c @@ -46,7 +51,7 @@ scdaemon_SOURCES = \ scdaemon_LDADD = $(libcommonpth) ../jnlib/libjnlib.a ../gl/libgnu.a \ $(LIBGCRYPT_LIBS) $(KSBA_LIBS) $(LIBASSUAN_LIBS) $(PTH_LIBS) \ $(LIBUSB_LIBS) $(GPG_ERROR_LIBS) \ - $(LIBINTL) $(DL_LIBS) $(NETLIBS) $(LIBICONV) + $(LIBINTL) $(DL_LIBS) $(NETLIBS) $(LIBICONV) $(resource_objs) # Removed for now: We need to decide whether it makes sense to # continue it at all, given that gpg has now all required |