← Back to branch summary

~ubuntu-branches/ubuntu/karmic/gnupg2/karmic-security

« back to all changes in this revision

Viewing changes to common/Makefile.in

  • Committer: Bazaar Package Importer
  • Author(s): Soren Hansen
  • Date: 2009-08-04 12:27:49 UTC
  • mfrom: (1.1.12 upstream)
  • Revision ID: james.westby@ubuntu.com-20090804122749-q0j52zp6xmzvyall
Tags: 2.0.12-0ubuntu1
* New upstream release.
* Add 01-scd-pw2.patch, 03-opgp-writekey.patch, and 06-opgp-sign3072.patch
  from https://bugs.g10code.com/gnupg/issue1094 to make OpenPGP 2.0
  smartcards work.

Show diffs side-by-side

added added

removed removed

Lines of Context:
common/Makefile.in
132
132
        asshelp.h exechelp.c exechelp.h signal.c estream.c estream.h \
133
133
        estream-printf.c estream-printf.h audit.c audit.h srv.h \
134
134
        dns-cert.c dns-cert.h pka.c pka.h http.c http.h localename.c \
135
 
        helpfile.c srv.c
 
135
        helpfile.c get-passphrase.c get-passphrase.h srv.c
136
136
am__objects_1 = libcommon_a-i18n.$(OBJEXT) \
137
137
        libcommon_a-status.$(OBJEXT) libcommon_a-tlv.$(OBJEXT) \
138
138
        libcommon_a-init.$(OBJEXT) libcommon_a-sexputil.$(OBJEXT) \
151
151
        libcommon_a-pka.$(OBJEXT) libcommon_a-http.$(OBJEXT) \
152
152
        libcommon_a-localename.$(OBJEXT) \
153
153
        libcommon_a-helpfile.$(OBJEXT)
154
 
@USE_DNS_SRV_TRUE@am__objects_2 = libcommon_a-srv.$(OBJEXT)
155
 
am_libcommon_a_OBJECTS = $(am__objects_1) $(am__objects_2)
 
154
am__objects_2 = libcommon_a-get-passphrase.$(OBJEXT)
 
155
@USE_DNS_SRV_TRUE@am__objects_3 = libcommon_a-srv.$(OBJEXT)
 
156
am_libcommon_a_OBJECTS = $(am__objects_1) $(am__objects_2) \
 
157
        $(am__objects_3)
156
158
libcommon_a_OBJECTS = $(am_libcommon_a_OBJECTS)
157
159
libcommonpth_a_AR = $(AR) $(ARFLAGS)
158
160
libcommonpth_a_LIBADD =
166
168
        estream-printf.c estream-printf.h audit.c audit.h srv.h \
167
169
        dns-cert.c dns-cert.h pka.c pka.h http.c http.h localename.c \
168
170
        helpfile.c srv.c
169
 
am__objects_3 = libcommonpth_a-i18n.$(OBJEXT) \
 
171
am__objects_4 = libcommonpth_a-i18n.$(OBJEXT) \
170
172
        libcommonpth_a-status.$(OBJEXT) libcommonpth_a-tlv.$(OBJEXT) \
171
173
        libcommonpth_a-init.$(OBJEXT) \
172
174
        libcommonpth_a-sexputil.$(OBJEXT) \
192
194
        libcommonpth_a-http.$(OBJEXT) \
193
195
        libcommonpth_a-localename.$(OBJEXT) \
194
196
        libcommonpth_a-helpfile.$(OBJEXT)
195
 
@USE_DNS_SRV_TRUE@am__objects_4 = libcommonpth_a-srv.$(OBJEXT)
196
 
am_libcommonpth_a_OBJECTS = $(am__objects_3) $(am__objects_4)
 
197
@USE_DNS_SRV_TRUE@am__objects_5 = libcommonpth_a-srv.$(OBJEXT)
 
198
am_libcommonpth_a_OBJECTS = $(am__objects_4) $(am__objects_5)
197
199
libcommonpth_a_OBJECTS = $(am_libcommonpth_a_OBJECTS)
198
200
libgpgrl_a_AR = $(AR) $(ARFLAGS)
199
201
libgpgrl_a_LIBADD =
206
208
        libsimple_pwquery_a-asshelp.$(OBJEXT)
207
209
libsimple_pwquery_a_OBJECTS = $(am_libsimple_pwquery_a_OBJECTS)
208
210
am__EXEEXT_1 = t-convert$(EXEEXT) t-percent$(EXEEXT) \
209
 
        t-gettime$(EXEEXT) t-sysutils$(EXEEXT) t-sexputil$(EXEEXT)
 
211
        t-gettime$(EXEEXT) t-sysutils$(EXEEXT) t-sexputil$(EXEEXT) \
 
212
        t-exechelp$(EXEEXT)
210
213
am__EXEEXT_2 = t-helpfile$(EXEEXT) t-b64$(EXEEXT)
211
214
PROGRAMS = $(noinst_PROGRAMS)
212
215
t_b64_SOURCES = t-b64.c
219
222
t_convert_SOURCES = t-convert.c
220
223
t_convert_OBJECTS = t-convert.$(OBJEXT)
221
224
t_convert_DEPENDENCIES = $(am__DEPENDENCIES_2)
 
225
t_exechelp_SOURCES = t-exechelp.c
 
226
t_exechelp_OBJECTS = t-exechelp.$(OBJEXT)
 
227
t_exechelp_DEPENDENCIES = $(am__DEPENDENCIES_2)
222
228
t_gettime_SOURCES = t-gettime.c
223
229
t_gettime_OBJECTS = t-gettime.$(OBJEXT)
224
230
t_gettime_DEPENDENCIES = $(am__DEPENDENCIES_2)
243
249
LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
244
250
SOURCES = $(libcommon_a_SOURCES) $(libcommonpth_a_SOURCES) \
245
251
        $(libgpgrl_a_SOURCES) $(libsimple_pwquery_a_SOURCES) t-b64.c \
246
 
        t-convert.c t-gettime.c t-helpfile.c t-percent.c t-sexputil.c \
247
 
        t-sysutils.c
 
252
        t-convert.c t-exechelp.c t-gettime.c t-helpfile.c t-percent.c \
 
253
        t-sexputil.c t-sysutils.c
248
254
DIST_SOURCES = $(am__libcommon_a_SOURCES_DIST) \
249
255
        $(am__libcommonpth_a_SOURCES_DIST) $(libgpgrl_a_SOURCES) \
250
 
        $(libsimple_pwquery_a_SOURCES) t-b64.c t-convert.c t-gettime.c \
251
 
        t-helpfile.c t-percent.c t-sexputil.c t-sysutils.c
 
256
        $(libsimple_pwquery_a_SOURCES) t-b64.c t-convert.c \
 
257
        t-exechelp.c t-gettime.c t-helpfile.c t-percent.c t-sexputil.c \
 
258
        t-sysutils.c
252
259
ETAGS = etags
253
260
CTAGS = ctags
254
261
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
497
504
        localename.c \
498
505
        helpfile.c
499
506
 
500
 
libcommon_a_SOURCES = $(common_sources) $(am__append_7)
 
507
 
 
508
# Sources only useful without PTH.
 
509
without_pth_sources = \
 
510
        get-passphrase.c get-passphrase.h
 
511
 
 
512
libcommon_a_SOURCES = $(common_sources) $(without_pth_sources) \
 
513
        $(am__append_7)
501
514
libcommon_a_CFLAGS = $(AM_CFLAGS) $(LIBASSUAN_CFLAGS) -DWITHOUT_GNU_PTH=1
502
515
libcommonpth_a_SOURCES = $(common_sources) $(am__append_8)
503
516
libcommonpth_a_CFLAGS = $(AM_CFLAGS) $(LIBASSUAN_PTH_CFLAGS) $(PTH_CFLAGS)
512
525
#
513
526
# Module tests
514
527
#
515
 
module_tests = t-convert t-percent t-gettime t-sysutils t-sexputil
 
528
module_tests = t-convert t-percent t-gettime t-sysutils t-sexputil t-exechelp
516
529
module_maint_tests = t-helpfile t-b64
517
530
t_common_ldadd = libcommon.a ../jnlib/libjnlib.a ../gl/libgnu.a \
518
531
                 $(LIBGCRYPT_LIBS) $(GPG_ERROR_LIBS) $(LIBINTL) $(LIBICONV)
524
537
t_helpfile_LDADD = $(t_common_ldadd)
525
538
t_sexputil_LDADD = $(t_common_ldadd)
526
539
t_b64_LDADD = $(t_common_ldadd)
 
540
t_exechelp_LDADD = $(t_common_ldadd)
527
541
all: $(BUILT_SOURCES)
528
542
        $(MAKE) $(AM_MAKEFLAGS) all-am
529
543
 
586
600
t-convert$(EXEEXT): $(t_convert_OBJECTS) $(t_convert_DEPENDENCIES) 
587
601
        @rm -f t-convert$(EXEEXT)
588
602
        $(LINK) $(t_convert_OBJECTS) $(t_convert_LDADD) $(LIBS)
 
603
t-exechelp$(EXEEXT): $(t_exechelp_OBJECTS) $(t_exechelp_DEPENDENCIES) 
 
604
        @rm -f t-exechelp$(EXEEXT)
 
605
        $(LINK) $(t_exechelp_OBJECTS) $(t_exechelp_LDADD) $(LIBS)
589
606
t-gettime$(EXEEXT): $(t_gettime_OBJECTS) $(t_gettime_DEPENDENCIES) 
590
607
        @rm -f t-gettime$(EXEEXT)
591
608
        $(LINK) $(t_gettime_OBJECTS) $(t_gettime_LDADD) $(LIBS)
618
635
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libcommon_a-estream-printf.Po@am__quote@
619
636
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libcommon_a-estream.Po@am__quote@
620
637
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libcommon_a-exechelp.Po@am__quote@
 
638
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libcommon_a-get-passphrase.Po@am__quote@
621
639
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libcommon_a-gettime.Po@am__quote@
622
640
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libcommon_a-helpfile.Po@am__quote@
623
641
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libcommon_a-homedir.Po@am__quote@
675
693
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsimple_pwquery_a-simple-pwquery.Po@am__quote@
676
694
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/t-b64.Po@am__quote@
677
695
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/t-convert.Po@am__quote@
 
696
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/t-exechelp.Po@am__quote@
678
697
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/t-gettime.Po@am__quote@
679
698
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/t-helpfile.Po@am__quote@
680
699
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/t-percent.Po@am__quote@
1115
1134
@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
1116
1135
@am__fastdepCC_FALSE@   $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommon_a_CFLAGS) $(CFLAGS) -c -o libcommon_a-helpfile.obj `if test -f 'helpfile.c'; then $(CYGPATH_W) 'helpfile.c'; else $(CYGPATH_W) '$(srcdir)/helpfile.c'; fi`
1117
1136
 
 
1137
libcommon_a-get-passphrase.o: get-passphrase.c
 
1138
@am__fastdepCC_TRUE@    $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommon_a_CFLAGS) $(CFLAGS) -MT libcommon_a-get-passphrase.o -MD -MP -MF $(DEPDIR)/libcommon_a-get-passphrase.Tpo -c -o libcommon_a-get-passphrase.o `test -f 'get-passphrase.c' || echo '$(srcdir)/'`get-passphrase.c
 
1139
@am__fastdepCC_TRUE@    mv -f $(DEPDIR)/libcommon_a-get-passphrase.Tpo $(DEPDIR)/libcommon_a-get-passphrase.Po
 
1140
@AMDEP_TRUE@@am__fastdepCC_FALSE@       source='get-passphrase.c' object='libcommon_a-get-passphrase.o' libtool=no @AMDEPBACKSLASH@
 
1141
@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 
1142
@am__fastdepCC_FALSE@   $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommon_a_CFLAGS) $(CFLAGS) -c -o libcommon_a-get-passphrase.o `test -f 'get-passphrase.c' || echo '$(srcdir)/'`get-passphrase.c
 
1143
 
 
1144
libcommon_a-get-passphrase.obj: get-passphrase.c
 
1145
@am__fastdepCC_TRUE@    $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommon_a_CFLAGS) $(CFLAGS) -MT libcommon_a-get-passphrase.obj -MD -MP -MF $(DEPDIR)/libcommon_a-get-passphrase.Tpo -c -o libcommon_a-get-passphrase.obj `if test -f 'get-passphrase.c'; then $(CYGPATH_W) 'get-passphrase.c'; else $(CYGPATH_W) '$(srcdir)/get-passphrase.c'; fi`
 
1146
@am__fastdepCC_TRUE@    mv -f $(DEPDIR)/libcommon_a-get-passphrase.Tpo $(DEPDIR)/libcommon_a-get-passphrase.Po
 
1147
@AMDEP_TRUE@@am__fastdepCC_FALSE@       source='get-passphrase.c' object='libcommon_a-get-passphrase.obj' libtool=no @AMDEPBACKSLASH@
 
1148
@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 
1149
@am__fastdepCC_FALSE@   $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommon_a_CFLAGS) $(CFLAGS) -c -o libcommon_a-get-passphrase.obj `if test -f 'get-passphrase.c'; then $(CYGPATH_W) 'get-passphrase.c'; else $(CYGPATH_W) '$(srcdir)/get-passphrase.c'; fi`
 
1150
 
1118
1151
libcommon_a-srv.o: srv.c
1119
1152
@am__fastdepCC_TRUE@    $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommon_a_CFLAGS) $(CFLAGS) -MT libcommon_a-srv.o -MD -MP -MF $(DEPDIR)/libcommon_a-srv.Tpo -c -o libcommon_a-srv.o `test -f 'srv.c' || echo '$(srcdir)/'`srv.c
1120
1153
@am__fastdepCC_TRUE@    mv -f $(DEPDIR)/libcommon_a-srv.Tpo $(DEPDIR)/libcommon_a-srv.Po