diff options
| author | Werner Koch <wk@gnupg.org> | 2010-06-07 15:33:02 +0200 |
|---|---|---|
| committer | Werner Koch <wk@gnupg.org> | 2010-06-07 15:33:02 +0200 |
| commit | bbe388b5db35be6ffece8ebd42f11372af016763 (patch) | |
| tree | 73e1fe9697b969be66bd89953125010e5721efe1 /tools/Makefile.am | |
| parent | Print --version etc via estream (diff) | |
| download | gnupg2-bbe388b5db35be6ffece8ebd42f11372af016763.tar.xz gnupg2-bbe388b5db35be6ffece8ebd42f11372af016763.zip | |
Add unfinished gpgtar.
Collected changes and ports of bug fixes from stable.
Diffstat (limited to 'tools/Makefile.am')
| -rw-r--r-- | tools/Makefile.am | 26 |
1 files changed, 17 insertions, 9 deletions
diff --git a/tools/Makefile.am b/tools/Makefile.am index 5c3766bcd..fc9725a72 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -42,13 +42,19 @@ else symcryptrun = endif +if BUILD_GPGTAR + gpgtar = gpgtar +else + gpgtar = +endif + # Fixme: We should remove the gpgkey2ssh tool. bin_PROGRAMS = gpgconf gpg-connect-agent ${symcryptrun} if !HAVE_W32_SYSTEM bin_PROGRAMS += watchgnupg gpgparsemail endif if !HAVE_W32CE_SYSTEM -bin_PROGRAMS += gpgkey2ssh +bin_PROGRAMS += gpgkey2ssh ${gpgtar} endif if !DISABLE_REGEX @@ -60,6 +66,7 @@ noinst_PROGRAMS = clean-sat mk-tdata make-dns-cert gpgsplit endif common_libs = $(libcommon) ../gl/libgnu.a +commonpth_libs = $(libcommonpth) ../gl/libgnu.a if HAVE_W32CE_SYSTEM pwquery_libs = else @@ -114,14 +121,15 @@ gpg_check_pattern_LDADD = $(common_libs) $(LIBGCRYPT_LIBS) $(GPG_ERROR_LIBS) \ $(LIBINTL) $(LIBICONV) $(W32SOCKLIBS) endif -#gpgtar_SOURCES = \ -# gpgtar.c gpgtar.h \ -# gpgtar-create.c \ -# gpgtar-extract.c \ -# gpgtar-list.c \ -# no-libgcrypt.c -#gpgtar_LDADD = $(common_libs) -# +gpgtar_SOURCES = \ + gpgtar.c gpgtar.h \ + gpgtar-create.c \ + gpgtar-extract.c \ + gpgtar-list.c \ + no-libgcrypt.c +gpgtar_CFLAGS = $(GPG_ERROR_CFLAGS) $(PTH_CFLAGS) +gpgtar_LDADD = $(commonpth_libs) $(PTH_LIBS) $(GPG_ERROR_LIBS) + # Make sure that all libs are build before we use them. This is # important for things like make -j2. |