Attachment #699318 for bug #782097

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




endif


if HAVE_DARWIN_SYSTEM
lib_LTLIBRARIES = libscute.la
else
lib_LTLIBRARIES = scute.la
endif

if HAVE_W32_SYSTEM



endif

libscute_la_LDFLAGS =

if !HAVE_DARWIN_SYSTEM
libscute_la_LDFLAGS += -module
endif

libscute_la_LDFLAGS += $(scute_res_ldflag) $(no_undefined) -avoid-version $(export_symbols) \
	$(scute_version_script_cmd) -version-info \
	@LIBSCUTE_LT_CURRENT@:@LIBSCUTE_LT_REVISION@:@LIBSCUTE_LT_AGE@

libscute_la_DEPENDENCIES = @LTLIBOBJS@ $(srcdir)/libscute.vers $(scute_deps)
libscute_la_LIBADD = $(scute_libadd) \
	@LTLIBOBJS@ @LIBASSUAN_LIBS@ @GPG_ERROR_LIBS@

libscute_la_CPPFLAGS = -I$(srcdir)/../include \
	@LIBASSUAN_CFLAGS@ @GPG_ERROR_CFLAGS@
libscute_la_SOURCES = $(sources)
else
scute_la_LDFLAGS = $(scute_res_ldflag) $(no_undefined) -module -avoid-version $(export_symbols) \
	$(scute_version_script_cmd) -version-info \
	@LIBSCUTE_LT_CURRENT@:@LIBSCUTE_LT_REVISION@:@LIBSCUTE_LT_AGE@
scute_la_DEPENDENCIES = @LTLIBOBJS@ $(srcdir)/libscute.vers $(scute_deps)
# scute_libadd must come BEFORE libassuan and gpg-error, because we
# override it on Windows targets.
libscute_la_LIBADD = $(scute_libadd) \
	@LTLIBOBJS@ @LIBASSUAN_LIBS@ @GPG_ERROR_LIBS@ $(scute_w32_extra_libs)

libscute_la_CPPFLAGS = -I$(srcdir)/../include \
	@LIBASSUAN_CFLAGS@ @GPG_ERROR_CFLAGS@

libscute_la_SOURCES = $(sources)

Lines 32-42 EXTRA_DIST = clean-socketdir Link Here

(-)a/tests/Makefile.am (-4 lines)
32	TESTS_ENVIRONMENT = GNUPGHOME=`/bin/pwd` GPG_AGENT_INFO= LC_ALL=C	32	TESTS_ENVIRONMENT = GNUPGHOME=`/bin/pwd` GPG_AGENT_INFO= LC_ALL=C
33		33
34	AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/src	34	AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/src
35	if HAVE_DARWIN_SYSTEM
36	LDADD = ../src/libscute.la	35	LDADD = ../src/libscute.la
37	else
38	LDADD = ../src/scute.la
39	endif
40		36
41	clean-local:	37	clean-local:
42	$(TESTS_ENVIRONMENT) $(srcdir)/clean-socketdir	38	$(TESTS_ENVIRONMENT) $(srcdir)/clean-socketdir

Return to bug 782097

Lines 59-69 scute_version_script_cmd = Link Here

(-)a/src/Makefile.am (-20 / +12 lines)
59	endif	59	endif
60		60
61		61
62	if HAVE_DARWIN_SYSTEM
63	lib_LTLIBRARIES = libscute.la	62	lib_LTLIBRARIES = libscute.la
64	else
65	lib_LTLIBRARIES = scute.la
66	endif
67		63
68	if HAVE_W32_SYSTEM	64	if HAVE_W32_SYSTEM
69		65
Lines 118-145 scute_libadd = Link Here
118		114
119	endif	115	endif
120		116
121	if HAVE_DARWIN_SYSTEM	117	libscute_la_LDFLAGS =
122	libscute_la_LDFLAGS = $(scute_res_ldflag) $(no_undefined) -avoid-version $(export_symbols) \	118
		119	if !HAVE_DARWIN_SYSTEM
		120	libscute_la_LDFLAGS += -module
		121	endif
		122
		123	libscute_la_LDFLAGS += $(scute_res_ldflag) $(no_undefined) -avoid-version $(export_symbols) \
123	$(scute_version_script_cmd) -version-info \	124	$(scute_version_script_cmd) -version-info \
124	@LIBSCUTE_LT_CURRENT@:@LIBSCUTE_LT_REVISION@:@LIBSCUTE_LT_AGE@	125	@LIBSCUTE_LT_CURRENT@:@LIBSCUTE_LT_REVISION@:@LIBSCUTE_LT_AGE@
		126
125	libscute_la_DEPENDENCIES = @LTLIBOBJS@ $(srcdir)/libscute.vers $(scute_deps)	127	libscute_la_DEPENDENCIES = @LTLIBOBJS@ $(srcdir)/libscute.vers $(scute_deps)
126	libscute_la_LIBADD = $(scute_libadd) \
127	@LTLIBOBJS@ @LIBASSUAN_LIBS@ @GPG_ERROR_LIBS@
128		128
129	libscute_la_CPPFLAGS = -I$(srcdir)/../include \
130	@LIBASSUAN_CFLAGS@ @GPG_ERROR_CFLAGS@
131	libscute_la_SOURCES = $(sources)
132	else
133	scute_la_LDFLAGS = $(scute_res_ldflag) $(no_undefined) -module -avoid-version $(export_symbols) \
134	$(scute_version_script_cmd) -version-info \
135	@LIBSCUTE_LT_CURRENT@:@LIBSCUTE_LT_REVISION@:@LIBSCUTE_LT_AGE@
136	scute_la_DEPENDENCIES = @LTLIBOBJS@ $(srcdir)/libscute.vers $(scute_deps)
137	# scute_libadd must come BEFORE libassuan and gpg-error, because we	129	# scute_libadd must come BEFORE libassuan and gpg-error, because we
138	# override it on Windows targets.	130	# override it on Windows targets.
139	scute_la_LIBADD = $(scute_libadd) \	131	libscute_la_LIBADD = $(scute_libadd) \
140	@LTLIBOBJS@ @LIBASSUAN_LIBS@ @GPG_ERROR_LIBS@ $(scute_w32_extra_libs)	132	@LTLIBOBJS@ @LIBASSUAN_LIBS@ @GPG_ERROR_LIBS@ $(scute_w32_extra_libs)
141		133
142	scute_la_CPPFLAGS = -I$(srcdir)/../include \	134	libscute_la_CPPFLAGS = -I$(srcdir)/../include \
143	@LIBASSUAN_CFLAGS@ @GPG_ERROR_CFLAGS@	135	@LIBASSUAN_CFLAGS@ @GPG_ERROR_CFLAGS@
144	scute_la_SOURCES = $(sources)	136
145	endif	137	libscute_la_SOURCES = $(sources)