Some more build cleanups
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@3462 c6295689-39f2-0310-b995-f0e70906c6a9
This commit is contained in:
parent
376139d1f1
commit
6e65efb257
|
@ -58,7 +58,7 @@ libopensc_la_LIBADD += -lws2_32
|
||||||
endif
|
endif
|
||||||
libopensc_la_LDFLAGS = $(AM_LDFLAGS) \
|
libopensc_la_LDFLAGS = $(AM_LDFLAGS) \
|
||||||
-version-info @OPENSC_LT_CURRENT@:@OPENSC_LT_REVISION@:@OPENSC_LT_AGE@ \
|
-version-info @OPENSC_LT_CURRENT@:@OPENSC_LT_REVISION@:@OPENSC_LT_AGE@ \
|
||||||
-export-symbols $(srcdir)/libopensc.exports \
|
-export-symbols "$(srcdir)/libopensc.exports" \
|
||||||
-no-undefined
|
-no-undefined
|
||||||
|
|
||||||
versioninfo.rc:
|
versioninfo.rc:
|
||||||
|
|
|
@ -29,7 +29,7 @@ nodist_opensc_pkcs11_la_SOURCES = versioninfo.rc
|
||||||
endif
|
endif
|
||||||
opensc_pkcs11_la_LIBADD = $(OPENSC_PKCS11_LIBS)
|
opensc_pkcs11_la_LIBADD = $(OPENSC_PKCS11_LIBS)
|
||||||
opensc_pkcs11_la_LDFLAGS = $(AM_LDFLAGS) \
|
opensc_pkcs11_la_LDFLAGS = $(AM_LDFLAGS) \
|
||||||
-export-symbols $(srcdir)/opensc-pkcs11.exports \
|
-export-symbols "$(srcdir)/opensc-pkcs11.exports" \
|
||||||
-module -avoid-version -no-undefined
|
-module -avoid-version -no-undefined
|
||||||
|
|
||||||
onepin_opensc_pkcs11_la_SOURCES = $(OPENSC_PKCS11_SRC) $(OPENSC_PKCS11_INC) hack-enabled.c
|
onepin_opensc_pkcs11_la_SOURCES = $(OPENSC_PKCS11_SRC) $(OPENSC_PKCS11_INC) hack-enabled.c
|
||||||
|
@ -38,7 +38,7 @@ nodist_onepin_opensc_pkcs11_la_SOURCES = versioninfo.rc
|
||||||
endif
|
endif
|
||||||
onepin_opensc_pkcs11_la_LIBADD = $(OPENSC_PKCS11_LIBS)
|
onepin_opensc_pkcs11_la_LIBADD = $(OPENSC_PKCS11_LIBS)
|
||||||
onepin_opensc_pkcs11_la_LDFLAGS = $(AM_LDFLAGS) \
|
onepin_opensc_pkcs11_la_LDFLAGS = $(AM_LDFLAGS) \
|
||||||
-export-symbols $(srcdir)/opensc-pkcs11.exports \
|
-export-symbols "$(srcdir)/opensc-pkcs11.exports" \
|
||||||
-module -avoid-version -no-undefined
|
-module -avoid-version -no-undefined
|
||||||
|
|
||||||
|
|
||||||
|
@ -48,7 +48,7 @@ nodist_pkcs11_spy_la_SOURCES = versioninfo.rc
|
||||||
endif
|
endif
|
||||||
pkcs11_spy_la_LIBADD = $(OPTIONAL_OPENSSL_LIBS) $(LTLIB_LIBS) libpkcs11.la
|
pkcs11_spy_la_LIBADD = $(OPTIONAL_OPENSSL_LIBS) $(LTLIB_LIBS) libpkcs11.la
|
||||||
pkcs11_spy_la_LDFLAGS = $(AM_LDFLAGS) \
|
pkcs11_spy_la_LDFLAGS = $(AM_LDFLAGS) \
|
||||||
-export-symbols $(srcdir)/pkcs11-spy.exports \
|
-export-symbols "$(srcdir)/pkcs11-spy.exports" \
|
||||||
-module -avoid-version -no-undefined
|
-module -avoid-version -no-undefined
|
||||||
|
|
||||||
jar-dir:
|
jar-dir:
|
||||||
|
|
|
@ -43,7 +43,7 @@ libpkcs15init_la_LIBADD = $(OPTIONAL_OPENSSL_LIBS) $(LTLIB_LIBS) \
|
||||||
$(top_builddir)/src/common/libcompat.la
|
$(top_builddir)/src/common/libcompat.la
|
||||||
libpkcs15init_la_LDFLAGS = $(AM_LDFLAGS) \
|
libpkcs15init_la_LDFLAGS = $(AM_LDFLAGS) \
|
||||||
-version-info @OPENSC_LT_CURRENT@:@OPENSC_LT_REVISION@:@OPENSC_LT_AGE@ \
|
-version-info @OPENSC_LT_CURRENT@:@OPENSC_LT_REVISION@:@OPENSC_LT_AGE@ \
|
||||||
-export-symbols $(srcdir)/pkcs15init.exports \
|
-export-symbols "$(srcdir)/pkcs15init.exports" \
|
||||||
-no-undefined
|
-no-undefined
|
||||||
|
|
||||||
versioninfo.rc:
|
versioninfo.rc:
|
||||||
|
|
|
@ -21,7 +21,7 @@ endif
|
||||||
libscconf_la_LIBADD = $(top_builddir)/src/common/libcompat.la
|
libscconf_la_LIBADD = $(top_builddir)/src/common/libcompat.la
|
||||||
libscconf_la_LDFLAGS = $(AM_LDFLAGS) \
|
libscconf_la_LDFLAGS = $(AM_LDFLAGS) \
|
||||||
-version-info @OPENSC_LT_CURRENT@:@OPENSC_LT_REVISION@:@OPENSC_LT_AGE@ \
|
-version-info @OPENSC_LT_CURRENT@:@OPENSC_LT_REVISION@:@OPENSC_LT_AGE@ \
|
||||||
-export-symbols $(srcdir)/scconf.exports \
|
-export-symbols "$(srcdir)/scconf.exports" \
|
||||||
-no-undefined
|
-no-undefined
|
||||||
|
|
||||||
test_conf_SOURCES = test-conf.c
|
test_conf_SOURCES = test-conf.c
|
||||||
|
|
|
@ -16,7 +16,7 @@ opensc_signer_la_SOURCES = opensc-crypto.c opensc-support.c signer.c stubs.c dia
|
||||||
opensc_signer_la_LIBADD = $(OPENSSL_LIBS) $(LIBASSUAN_LIBS) \
|
opensc_signer_la_LIBADD = $(OPENSSL_LIBS) $(LIBASSUAN_LIBS) \
|
||||||
$(top_builddir)/src/libopensc/libopensc.la
|
$(top_builddir)/src/libopensc/libopensc.la
|
||||||
opensc_signer_la_LDFLAGS = $(AM_LDFLAGS) \
|
opensc_signer_la_LDFLAGS = $(AM_LDFLAGS) \
|
||||||
-export-symbols $(srcdir)/signer.exports \
|
-export-symbols "$(srcdir)/signer.exports" \
|
||||||
-module -avoid-version -no-undefined
|
-module -avoid-version -no-undefined
|
||||||
|
|
||||||
if ENABLE_NSPLUGIN
|
if ENABLE_NSPLUGIN
|
||||||
|
|
|
@ -5,8 +5,8 @@ RCCOMPILE = $(RC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
|
||||||
LTRCCOMPILE = $(LIBTOOL) --mode=compile --tag=RC $(RCCOMPILE)
|
LTRCCOMPILE = $(LIBTOOL) --mode=compile --tag=RC $(RCCOMPILE)
|
||||||
|
|
||||||
.rc.lo:
|
.rc.lo:
|
||||||
$(LTRCCOMPILE) -i $< -o $@
|
$(LTRCCOMPILE) -i "$<" -o "$@"
|
||||||
|
|
||||||
.rc.o:
|
.rc.o:
|
||||||
$(RCCOMPILE) -i $< -o $@
|
$(RCCOMPILE) -i "$<" -o "$@"
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue