diff options
Diffstat (limited to 'g10/Makefile.am')
| -rw-r--r-- | g10/Makefile.am | 24 |
1 files changed, 11 insertions, 13 deletions
diff --git a/g10/Makefile.am b/g10/Makefile.am index cd5307e10..e275aaa7f 100644 --- a/g10/Makefile.am +++ b/g10/Makefile.am @@ -1,3 +1,4 @@ +# Makefile.am - g10 # Copyright (C) 1998, 1999, 2000, 2001, 2002, # 2003, 2006, 2010 Free Software Foundation, Inc. # @@ -19,10 +20,9 @@ ## Process this file with automake to produce Makefile.in EXTRA_DIST = distsigkey.gpg \ - ChangeLog-2011 \ - gpg-w32info.rc gpg.w32-manifest.in \ - gpgv-w32info.rc gpgv.w32-manifest.in \ - test.c t-keydb-keyring.kbx \ + gpg-w32info.rc gpg.w32-manifest.in \ + gpgv-w32info.rc gpgv.w32-manifest.in \ + ChangeLog-2011 test.c t-keydb-keyring.kbx \ t-keydb-get-keyblock.gpg t-stutter-data.asc \ all-tests.scm @@ -90,13 +90,11 @@ endif if HAVE_W32_SYSTEM -gpg_robjs = $(resource_objs) gpg-w32info.o -gpgv_robjs = $(resource_objs) gpgv-w32info.o -gpg-w32info.o : gpg.w32-manifest -gpgv-w32info.o : gpgv.w32-manifest -else -gpg_robjs = -gpgv_robjs = +gpg_rc_objs = gpg-w32info.o +gpgv_rc_objs = gpgv-w32info.o + +gpg-w32info.o : gpg.w32-manifest ../common/w32info-rc.h +gpgv-w32info.o : gpgv.w32-manifest ../common/w32info-rc.h endif common_source = \ @@ -183,11 +181,11 @@ LDADD = $(needed_libs) ../common/libgpgrl.a \ $(ZLIBS) $(LIBINTL) $(CAPLIBS) gpg_LDADD = $(LDADD) $(LIBGCRYPT_LIBS) $(SQLITE3_LIBS) $(LIBREADLINE) \ $(LIBASSUAN_LIBS) $(GPG_ERROR_LIBS) $(NETLIBS) \ - $(LIBICONV) $(gpg_robjs) $(extra_sys_libs) + $(LIBICONV) $(gpg_rc_objs) $(extra_sys_libs) gpg_LDFLAGS = $(extra_bin_ldflags) gpgv_LDADD = $(LDADD) $(LIBGCRYPT_LIBS) \ $(GPG_ERROR_LIBS) $(NETLIBS) \ - $(LIBICONV) $(gpgv_robjs) $(extra_sys_libs) + $(LIBICONV) $(gpgv_rc_objs) $(extra_sys_libs) gpgv_LDFLAGS = $(extra_bin_ldflags) gpgcompose_LDADD = $(LDADD) $(SQLITE3_LIBS) $(LIBGCRYPT_LIBS) $(LIBREADLINE) \ |