From 3c47bb093c3ad3c332b2f7eb6f2c440be6aaafb8 Mon Sep 17 00:00:00 2001 From: martin Date: Wed, 21 Sep 2005 12:52:36 +0000 Subject: [PATCH] Fix makefiles git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@2611 c6295689-39f2-0310-b995-f0e70906c6a9 --- Makefile.am | 4 ++-- configure.in | 1 - src/pkcs11/Makefile.mak | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/Makefile.am b/Makefile.am index 0dd8402d..38779b18 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,7 +1,7 @@ # Process this file with automake to create Makefile.in -SUBDIRS = . aclocal etc macos man src win32 -DIST_SUBDIRS = . aclocal doc etc macos man src win32 +SUBDIRS = . aclocal etc man src win32 +DIST_SUBDIRS = . aclocal doc etc man src win32 EXTRA_DIST = CodingStyle QUICKSTART \ bootstrap Makefile.mak depcomp \ diff --git a/configure.in b/configure.in index d346e3b4..617d271c 100644 --- a/configure.in +++ b/configure.in @@ -370,7 +370,6 @@ aclocal/Makefile doc/Makefile doc/old/Makefile etc/Makefile -macos/Makefile man/Makefile src/Makefile src/common/Makefile diff --git a/src/pkcs11/Makefile.mak b/src/pkcs11/Makefile.mak index 4f63a3db..6fb4e4f4 100644 --- a/src/pkcs11/Makefile.mak +++ b/src/pkcs11/Makefile.mak @@ -26,5 +26,5 @@ $(TARGET): $(OBJECTS) ..\libopensc\opensc.lib ..\scconf\scconf.lib ..\pkcs15init $(TARGET2): $(OBJECTS2) lib /nologo /machine:ix86 /out:$(TARGET2) $(OBJECTS2) $(LIBLTDL_LIB) -$(TARGET3): $(OBJECTS3) ..\libopensc\opensc.lib ..\scconf\scconf.lib +$(TARGET3): $(OBJECTS3) ..\libopensc\opensc.lib link $(LINKFLAGS) /dll /out:$(TARGET3) $(OBJECTS3) ..\libopensc\opensc.lib ..\scconf\scconf.lib $(OPENSSL_LIB) $(LIBLTDL_LIB) gdi32.lib advapi32.lib