- Win32 build fixes. Should work now.

git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@669 c6295689-39f2-0310-b995-f0e70906c6a9

src/common/Makefile.mak

@@ -1,11 +1,12 @@
 TOPDIR = ..\..
 
 HEADERS = getopt.h
+HEADERSDIR = $(TOPDIR)\src\include
 TARGET = common.lib
 OBJECTS = getopt.obj getopt1.obj getpass.obj
 
 
-all: $(TARGET) install-headers
+all: install-headers $(TARGET)
 
 $(TARGET): $(OBJECTS)
 	lib /nologo /machine:ix86 /out:$(TARGET) $(OBJECTS)

src/libopensc/Makefile.mak

@@ -7,6 +7,8 @@ HEADERS			= opensc.h pkcs15.h emv.h \
 			  errors.h types.h \
 			  cardctl.h asn1.h log.h
 
+HEADERSDIR		= $(TOPDIR)\src\include\opensc
+
 OBJECTS			= sc.obj ctx.obj module.obj asn1.obj log.obj base64.obj \
 			  errors.obj sec.obj card.obj iso7816.obj dir.obj \
 			  pkcs15.obj pkcs15-cert.obj pkcs15-pin.obj \
@@ -16,7 +18,7 @@ OBJECTS			= sc.obj ctx.obj module.obj asn1.obj log.obj base64.obj \
 			  card-setcos.obj card-miocos.obj card-flex.obj card-gpk.obj \
 			  card-etoken.obj card-tcos.obj card-emv.obj card-default.obj 
 
-all: $(TARGET) install-headers
+all: install-headers $(TARGET)
 
 !INCLUDE $(TOPDIR)\win32\Make.rules.mak
 

src/scconf/Makefile.mak

@@ -2,11 +2,12 @@ TOPDIR = ..\..
 
 TARGET = scconf.lib
 HEADERS = scconf.h
+HEADERSDIR = $(TOPDIR)\src\include\opensc
 OBJECTS = parse.obj scconf.obj write.obj lex-parse.obj
 
 .SUFFIXES : .l
 
-all: $(TARGET) install-headers
+all: install-headers $(TARGET)
 
 lex-parse.c: lex-parse.l
 	flex -olex-parse.c < lex-parse.l

win32/Make.rules.mak

@@ -4,7 +4,7 @@ LINKFLAGS = /DEBUG /NOLOGO /INCREMENTAL:NO /MACHINE:IX86
 
 install-headers:
 	@for %i in ( $(HEADERS) ) do \
-		@xcopy /d /q /y %i ..\include > nul
+		@xcopy /d /q /y %i $(HEADERSDIR) > nul
 
 .c.obj::
 	cl $(COPTS) /c $<