- backed out AM_LDFLAGS change

git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@1022 c6295689-39f2-0310-b995-f0e70906c6a9
OpenSC · Apr 16, 2003 · 138346a · 138346a
1 parent 1714b31
commit 138346a
Show file tree

Hide file tree

Showing 8 changed files with 13 additions and 13 deletions.
diff --git a/src/openscd/Makefile.am b/src/openscd/Makefile.am
@@ -3,7 +3,7 @@
 MAINTAINERCLEANFILES = Makefile.in
 
 INCLUDES = @CFLAGS_OPENSC@
-AM_LDFLAGS = @LDFLAGS@ @LIBOPENSC@
+LDFLAGS = @LDFLAGS@ @LIBOPENSC@
 
 bin_PROGRAMS = openscd
 

diff --git a/src/pam/Makefile.am b/src/pam/Makefile.am
@@ -6,7 +6,7 @@ MAINTAINERCLEANFILES = Makefile.in
 
 INCLUDES = -I${top_srcdir}/src/scam
 
-AM_LDFLAGS = @LDFLAGS@ @LIBDL@ @LIBPAM@ ${top_builddir}/src/scam/libscam.la
+LDFLAGS = @LDFLAGS@ @LIBDL@ @LIBPAM@ ${top_builddir}/src/scam/libscam.la
 
 SRC = pam_opensc.c pam_support.c pam_support.h
 

diff --git a/src/pkcs11/Makefile.am b/src/pkcs11/Makefile.am
@@ -8,7 +8,7 @@ SUBDIRS = . rsaref
 
 INCLUDES = @CFLAGS_OPENSC@ -I../pkcs15init
 
-AM_LDFLAGS = @LDFLAGS@ @LIBDL@ @LIBOPENSC@ ../pkcs15init/libpkcs15init.la \
+LDFLAGS = @LDFLAGS@ @LIBDL@ @LIBOPENSC@ ../pkcs15init/libpkcs15init.la \
 	  ../scrandom/libscrandom.a
 
 SRC = pkcs11-global.c pkcs11-session.c pkcs11-object.c misc.c slot.c \

diff --git a/src/pkcs15init/Makefile.am b/src/pkcs15init/Makefile.am
@@ -5,7 +5,7 @@ includedir = ${prefix}/include/opensc
 MAINTAINERCLEANFILES = Makefile.in
 
 INCLUDES = @CFLAGS_OPENSC@ -DSC_PKCS15_PROFILE_DIRECTORY=\"$(pkgdatadir)\"
-AM_LDFLAGS = @LDFLAGS@ @LIBOPENSC@
+LDFLAGS = @LDFLAGS@ @LIBOPENSC@
 
 EXTRA_DIST = flex.profile gpk.profile miocos.profile etoken.profile \
 	     pkcs15.profile

diff --git a/src/scam/Makefile.am b/src/scam/Makefile.am
@@ -13,13 +13,13 @@ if HAVE_SSL
 SSL_LIB = @LIBCRYPTO@
 endif
 # Temporary
-# if HAVE_SCIDI
-# SCIDI_LIB = @LIBSSP@
-# SCIDI_SRC = ../../../scam/sp.c
-# SCIDI_INC = @CFLAGS_SSP@
-# endif
+if HAVE_SCIDI
+SCIDI_LIB = @LIBSSP@
+SCIDI_SRC = ../../../scam/sp.c
+SCIDI_INC = @CFLAGS_SSP@
+endif
 
-AM_LDFLAGS = @LIBOPENSC@ @LIBSCRANDOM@ $(LDAP_LIB) $(SSL_LIB) $(SCIDI_LIB)
+LDFLAGS = @LIBOPENSC@ @LIBSCRANDOM@ $(LDAP_LIB) $(SSL_LIB) $(SCIDI_LIB)
 EXTRAINC = $(SCIDI_INC)
 
 SRC = scam.c scam.h p15_eid.c p15_ldap.c $(SCIDI_SRC)

diff --git a/src/sia/Makefile.am b/src/sia/Makefile.am
@@ -6,7 +6,7 @@ MAINTAINERCLEANFILES = Makefile.in
 
 INCLUDES = -I../scam
 
-AM_LDFLAGS = @LDFLAGS@ @LIBDL@ ../scam/libscam.la
+LDFLAGS = @LDFLAGS@ @LIBDL@ ../scam/libscam.la
 
 SRC = sia_opensc.c sia_support.c sia_support.h
 

diff --git a/src/tests/Makefile.am b/src/tests/Makefile.am
@@ -3,7 +3,7 @@
 MAINTAINERCLEANFILES = Makefile.in
 
 INCLUDES = @CFLAGS_OPENSC@
-AM_LDFLAGS = @LDFLAGS@ @LIBOPENSC@
+LDFLAGS = @LDFLAGS@ @LIBOPENSC@
 
 noinst_PROGRAMS = base64 lottery p15dump pintest prngtest
 

diff --git a/src/tools/Makefile.am b/src/tools/Makefile.am
@@ -5,7 +5,7 @@ MAINTAINERCLEANFILES = Makefile.in
 EXTRA_DIST = Makefile.mak
 
 INCLUDES = @CFLAGS_OPENSC@
-AM_LDFLAGS = @LDFLAGS@ @LIBOPENSC@
+LDFLAGS = @LDFLAGS@ @LIBOPENSC@
 
 if HAVE_SSL
 PROGRAMS_SSL = cryptoflex-tool pkcs15-init