Attachment #461732 for bug #607488

View | Details | Raw Unified | Return to bug 607488
Collapse All | Expand All

Lines 1-7 Link Here

(-)a/Makefile.am (-1 / +1 lines)
1	ACLOCAL_AMFLAGS = -I scripts/m4	1	ACLOCAL_AMFLAGS = -I scripts/m4
2	EXTRA_DIST = scripts/build-aux/config.rpath debian rpm doc	2	EXTRA_DIST = scripts/build-aux/config.rpath debian rpm doc
3		3
4	SUBDIRS=cardcomm/pkcs11/src doc/sdk/include/rsaref220 plugins_tools/util tests/unit plugins_tools/xpi plugins_tools/aboutmw/gtk plugins_tools/eid-viewer	4	SUBDIRS=cardcomm/pkcs11/src doc/sdk/include/rsaref220 plugins_tools/util tests/unit plugins_tools/xpi
5		5
6	xpipackage:	6	xpipackage:
7	$(MAKE) -C plugins_tools/xpi xpipackage	7	$(MAKE) -C plugins_tools/xpi xpipackage




	dialogs/dialogsgtk/single_dialog.c
endif

libexec_PROGRAMS = beid-askpin beid-changepin beid-badpin beid-askaccess beid-spr-askpin beid-spr-changepin

if P11KIT
dist_p11kitcf_DATA = beid.module
install-exec-hook:

		$(LN_S) $(libdir)/libbeidpkcs11.so.0 beidpkcs11.so
endif

beid_askpin_SOURCES = dialogs/dialogsgtk/parent.c dialogs/dialogsgtk/beid-askpin.c
beid_askpin_CPPFLAGS = -I$(srcdir)/dialogsgtk -I$(srcdir)/../common/src -I$(srcdir)/src @GTK_CFLAGS@
beid_askpin_LDADD = @GTK_LIBS@

beid_changepin_SOURCES = dialogs/dialogsgtk/parent.c dialogs/dialogsgtk/beid-changepin.c
beid_changepin_CPPFLAGS = -I$(dialogsdir)/dialogsgtk -I$(dialogsdir)/../common/dialogs -I$(dialogsdir)/dialogs @GTK_CFLAGS@
beid_changepin_LDADD = @GTK_LIBS@

beid_badpin_SOURCES = dialogs/dialogsgtk/parent.c dialogs/dialogsgtk/beid-badpin.c
beid_badpin_CPPFLAGS = -I$(dialogsdir)/dialogsgtk -I$(dialogsdir)/../common/dialogs -I$(dialogsdir)/dialogs @GTK_CFLAGS@
beid_badpin_LDADD = @GTK_LIBS@

beid_askaccess_SOURCES = dialogs/dialogsgtk/parent.c dialogs/dialogsgtk/beid-askaccess.c
beid_askaccess_CPPFLAGS = -I$(dialogsdir)/dialogsgtk -I$(dialogsdir)/../common/dialogs -I$(dialogsdir)/dialogs @GTK_CFLAGS@
beid_askaccess_LDADD = @GTK_LIBS@

beid_spr_askpin_SOURCES = dialogs/dialogsgtk/parent.c dialogs/dialogsgtk/beid-spr-askpin.c
beid_spr_askpin_CPPFLAGS = -I$(dialogsdir)/dialogsgtk -I$(dialogsdir)/../common/dialogs -I$(dialogsdir)/dialogs @GTK_CFLAGS@
beid_spr_askpin_LDADD = @GTK_LIBS@

beid_spr_changepin_SOURCES = dialogs/dialogsgtk/parent.c dialogs/dialogsgtk/beid-spr-changepin.c
beid_spr_changepin_CPPFLAGS = -I$(dialogsdir)/dialogsgtk -I$(dialogsdir)/../common/dialogs -I$(dialogsdir)/dialogs @GTK_CFLAGS@
beid_spr_changepin_LDADD = @GTK_LIBS@

pkgconfig_DATA=libbeidpkcs11.pc

Lines 59-72 fi Link Here

(-)a/configure.ac (-8 lines)
59		59
60	AC_DEFINE_UNQUOTED([HAVE_GTK], [$have_gtk], [Set to major version of libgtk])	60	AC_DEFINE_UNQUOTED([HAVE_GTK], [$have_gtk], [Set to major version of libgtk])
61		61
62	if test "$have_gtk" = "no"
63	then
64	AC_MSG_ERROR([At least one version of GTK is required.])
65	fi
66
67	PKG_CHECK_MODULES([XML2], [libxml-2.0])
68	PKG_CHECK_MODULES([libproxy], [libproxy-1.0])
69
70	###########################################################################	62	###########################################################################
71	####### read user-specific requests from --enable directives ######	63	####### read user-specific requests from --enable directives ######
72	###########################################################################	64	###########################################################################

Return to bug 607488

Lines 165-172 libbeidpkcs11_la_SOURCES += \ Link Here

(-)a/cardcomm/pkcs11/src/Makefile.am (-26 lines)
165	dialogs/dialogsgtk/single_dialog.c	165	dialogs/dialogsgtk/single_dialog.c
166	endif	166	endif
167		167
168	libexec_PROGRAMS = beid-askpin beid-changepin beid-badpin beid-askaccess beid-spr-askpin beid-spr-changepin
169
170	if P11KIT	168	if P11KIT
171	dist_p11kitcf_DATA = beid.module	169	dist_p11kitcf_DATA = beid.module
172	install-exec-hook:	170	install-exec-hook:
Lines 176-203 install-exec-hook: Link Here
176	$(LN_S) $(libdir)/libbeidpkcs11.so.0 beidpkcs11.so	174	$(LN_S) $(libdir)/libbeidpkcs11.so.0 beidpkcs11.so
177	endif	175	endif
178		176
179	beid_askpin_SOURCES = dialogs/dialogsgtk/parent.c dialogs/dialogsgtk/beid-askpin.c
180	beid_askpin_CPPFLAGS = -I$(srcdir)/dialogsgtk -I$(srcdir)/../common/src -I$(srcdir)/src @GTK_CFLAGS@
181	beid_askpin_LDADD = @GTK_LIBS@
182
183	beid_changepin_SOURCES = dialogs/dialogsgtk/parent.c dialogs/dialogsgtk/beid-changepin.c
184	beid_changepin_CPPFLAGS = -I$(dialogsdir)/dialogsgtk -I$(dialogsdir)/../common/dialogs -I$(dialogsdir)/dialogs @GTK_CFLAGS@
185	beid_changepin_LDADD = @GTK_LIBS@
186
187	beid_badpin_SOURCES = dialogs/dialogsgtk/parent.c dialogs/dialogsgtk/beid-badpin.c
188	beid_badpin_CPPFLAGS = -I$(dialogsdir)/dialogsgtk -I$(dialogsdir)/../common/dialogs -I$(dialogsdir)/dialogs @GTK_CFLAGS@
189	beid_badpin_LDADD = @GTK_LIBS@
190
191	beid_askaccess_SOURCES = dialogs/dialogsgtk/parent.c dialogs/dialogsgtk/beid-askaccess.c
192	beid_askaccess_CPPFLAGS = -I$(dialogsdir)/dialogsgtk -I$(dialogsdir)/../common/dialogs -I$(dialogsdir)/dialogs @GTK_CFLAGS@
193	beid_askaccess_LDADD = @GTK_LIBS@
194
195	beid_spr_askpin_SOURCES = dialogs/dialogsgtk/parent.c dialogs/dialogsgtk/beid-spr-askpin.c
196	beid_spr_askpin_CPPFLAGS = -I$(dialogsdir)/dialogsgtk -I$(dialogsdir)/../common/dialogs -I$(dialogsdir)/dialogs @GTK_CFLAGS@
197	beid_spr_askpin_LDADD = @GTK_LIBS@
198
199	beid_spr_changepin_SOURCES = dialogs/dialogsgtk/parent.c dialogs/dialogsgtk/beid-spr-changepin.c
200	beid_spr_changepin_CPPFLAGS = -I$(dialogsdir)/dialogsgtk -I$(dialogsdir)/../common/dialogs -I$(dialogsdir)/dialogs @GTK_CFLAGS@
201	beid_spr_changepin_LDADD = @GTK_LIBS@
202
203	pkgconfig_DATA=libbeidpkcs11.pc	177	pkgconfig_DATA=libbeidpkcs11.pc