diff options
Diffstat (limited to 'win32/Makefile.msvc')
| -rw-r--r-- | win32/Makefile.msvc | 50 |
1 files changed, 11 insertions, 39 deletions
diff --git a/win32/Makefile.msvc b/win32/Makefile.msvc index b1d8869e..362f41e8 100644 --- a/win32/Makefile.msvc +++ b/win32/Makefile.msvc @@ -30,7 +30,6 @@ AUTOCONF = .\configure.txt #XMLSEC_MINOR_VERSION = 0 # set this to the right value. #XMLSEC_MICRO_VERSION = 0 # set this to the right value. #WITH_XMLSEC_DEBUG = 1 -#UNICODE = 1 #DEBUG = 0 #WITH_CRYPTO=openssl #WITH_CRYPTO=openssl @@ -61,33 +60,28 @@ APP_NAME = xmlseca.exe !else APP_NAME = xmlsec.exe !endif -APP_NAME_MANIFEST = $(APP_NAME).manifest XMLSEC_NAME = xmlsec XMLSEC_BASENAME = lib$(XMLSEC_NAME) XMLSEC_SO = $(XMLSEC_BASENAME).dll -XMLSEC_SO_MANIFEST = $(XMLSEC_BASENAME).dll.manifest XMLSEC_IMP = $(XMLSEC_BASENAME).lib XMLSEC_A = $(XMLSEC_BASENAME)_a.lib XMLSEC_OPENSSL_NAME = $(XMLSEC_NAME)-openssl XMLSEC_OPENSSL_BASENAME = lib$(XMLSEC_OPENSSL_NAME) XMLSEC_OPENSSL_SO = $(XMLSEC_OPENSSL_BASENAME).dll -XMLSEC_OPENSSL_SO_MANIFEST = $(XMLSEC_OPENSSL_BASENAME).dll.manifest XMLSEC_OPENSSL_IMP = $(XMLSEC_OPENSSL_BASENAME).lib XMLSEC_OPENSSL_A = $(XMLSEC_OPENSSL_BASENAME)_a.lib XMLSEC_NSS_NAME = $(XMLSEC_NAME)-nss XMLSEC_NSS_BASENAME = lib$(XMLSEC_NSS_NAME) XMLSEC_NSS_SO = $(XMLSEC_NSS_BASENAME).dll -XMLSEC_NSS_SO_MANIFEST = $(XMLSEC_NSS_BASENAME).dll.manifest XMLSEC_NSS_IMP = $(XMLSEC_NSS_BASENAME).lib XMLSEC_NSS_A = $(XMLSEC_NSS_BASENAME)_a.lib XMLSEC_MSCRYPTO_NAME = $(XMLSEC_NAME)-mscrypto XMLSEC_MSCRYPTO_BASENAME= lib$(XMLSEC_MSCRYPTO_NAME) XMLSEC_MSCRYPTO_SO = $(XMLSEC_MSCRYPTO_BASENAME).dll -XMLSEC_MSCRYPTO_SO_MANIFEST = $(XMLSEC_MSCRYPTO_BASENAME).dll.manifest XMLSEC_MSCRYPTO_IMP = $(XMLSEC_MSCRYPTO_BASENAME).lib XMLSEC_MSCRYPTO_A = $(XMLSEC_MSCRYPTO_BASENAME)_a.lib @@ -143,7 +137,6 @@ XMLSEC_OBJS = \ $(XMLSEC_INTDIR)\keys.obj \ $(XMLSEC_INTDIR)\keysdata.obj \ $(XMLSEC_INTDIR)\keysmngr.obj \ - $(XMLSEC_INTDIR)\kw_aes_des.obj \ $(XMLSEC_INTDIR)\list.obj \ $(XMLSEC_INTDIR)\membuf.obj \ $(XMLSEC_INTDIR)\nodeset.obj \ @@ -174,7 +167,6 @@ XMLSEC_OBJS_A = \ $(XMLSEC_INTDIR_A)\keys.obj \ $(XMLSEC_INTDIR_A)\keysdata.obj \ $(XMLSEC_INTDIR_A)\keysmngr.obj \ - $(XMLSEC_INTDIR_A)\kw_aes_des.obj \ $(XMLSEC_INTDIR_A)\list.obj \ $(XMLSEC_INTDIR_A)\membuf.obj \ $(XMLSEC_INTDIR_A)\nodeset.obj \ @@ -265,11 +257,8 @@ XMLSEC_MSCRYPTO_OBJS = \ $(XMLSEC_MSCRYPTO_INTDIR)\crypto.obj \ $(XMLSEC_MSCRYPTO_INTDIR)\ciphers.obj \ $(XMLSEC_MSCRYPTO_INTDIR)\digests.obj \ - $(XMLSEC_MSCRYPTO_INTDIR)\hmac.obj \ $(XMLSEC_MSCRYPTO_INTDIR)\symkeys.obj \ $(XMLSEC_MSCRYPTO_INTDIR)\kt_rsa.obj \ - $(XMLSEC_MSCRYPTO_INTDIR)\kw_aes.obj \ - $(XMLSEC_MSCRYPTO_INTDIR)\kw_des.obj \ $(XMLSEC_MSCRYPTO_INTDIR)\strings.obj \ $(XMLSEC_MSCRYPTO_INTDIR)\signatures.obj \ $(XMLSEC_MSCRYPTO_INTDIR)\certkeys.obj \ @@ -281,11 +270,8 @@ XMLSEC_MSCRYPTO_OBJS_A = \ $(XMLSEC_MSCRYPTO_INTDIR_A)\crypto.obj \ $(XMLSEC_MSCRYPTO_INTDIR_A)\ciphers.obj \ $(XMLSEC_MSCRYPTO_INTDIR_A)\digests.obj \ - $(XMLSEC_MSCRYPTO_INTDIR_A)\hmac.obj \ $(XMLSEC_MSCRYPTO_INTDIR_A)\symkeys.obj \ $(XMLSEC_MSCRYPTO_INTDIR_A)\kt_rsa.obj \ - $(XMLSEC_MSCRYPTO_INTDIR_A)\kw_aes.obj \ - $(XMLSEC_MSCRYPTO_INTDIR_A)\kw_des.obj \ $(XMLSEC_MSCRYPTO_INTDIR_A)\strings.obj \ $(XMLSEC_MSCRYPTO_INTDIR_A)\signatures.obj \ $(XMLSEC_MSCRYPTO_INTDIR_A)\certkeys.obj \ @@ -312,10 +298,6 @@ CFLAGS = $(CFLAGS) /D "HAVE_STDIO_H" /D "HAVE_STDLIB_H" CFLAGS = $(CFLAGS) /D "HAVE_STRING_H" /D "HAVE_CTYPE_H" CFLAGS = $(CFLAGS) /D "HAVE_MALLOC_H" /D "HAVE_MEMORY_H" -!if "$(UNICODE)" == "1" -CFLAGS = $(CFLAGS) /D "UNICODE" /D "_UNICODE" -!endif - # Optimisation and debug symbols. !if "$(DEBUG)" == "1" CFLAGS = $(CFLAGS) /D "_DEBUG" /Od /Z7 @@ -463,28 +445,28 @@ check-keys : $(BINDIR)\$(APP_NAME) cd .. if not exist win32\tmp mkdir win32\tmp set TMPFOLDER=win32/tmp - sh ./tests/testrun.sh ./tests/testKeys.sh default ./tests win32/$(BINDIR)/$(APP_NAME) der + sh ./tests/testKeys.sh default ./tests win32/$(BINDIR)/$(APP_NAME) der cd win32 check-dsig : $(BINDIR)\$(APP_NAME) cd .. if not exist win32\tmp mkdir win32\tmp set TMPFOLDER=win32/tmp - sh ./tests/testrun.sh ./tests/testDSig.sh default ./tests win32/$(BINDIR)/$(APP_NAME) der + sh ./tests/testDSig.sh default ./tests win32/$(BINDIR)/$(APP_NAME) der cd win32 check-enc : $(BINDIR)\$(APP_NAME) cd .. if not exist win32\tmp mkdir win32\tmp set TMPFOLDER=win32/tmp - sh ./tests/testrun.sh ./tests/testEnc.sh default ./tests win32/$(BINDIR)/$(APP_NAME) der + sh ./tests/testEnc.sh default ./tests win32/$(BINDIR)/$(APP_NAME) der cd win32 check-xkms : $(BINDIR)\$(APP_NAME) cd .. if not exist win32\tmp mkdir win32\tmp set TMPFOLDER=win32\tmp - sh ./tests/testrun.sh ./tests/testXKMS.sh default ./tests win32/$(BINDIR)/$(APP_NAME) der + sh ./tests/testXKMS.sh default ./tests win32/$(BINDIR)/$(APP_NAME) der cd win32 clean : @@ -504,54 +486,44 @@ rebuild : clean all install : all if not exist $(INCPREFIX)\$(XMLSEC_NAME) mkdir $(INCPREFIX)\$(XMLSEC_NAME) - if not exist $(BINPREFIX) mkdir $(BINPREFIX) - if not exist $(LIBPREFIX) mkdir $(LIBPREFIX) if exist $(BINDIR)\$(XMLSEC_OPENSSL_SO) if not exist $(INCPREFIX)\$(XMLSEC_NAME)\openssl mkdir $(INCPREFIX)\$(XMLSEC_NAME)\openssl if exist $(BINDIR)\$(XMLSEC_NSS_SO) if not exist $(INCPREFIX)\$(XMLSEC_NAME)\nss mkdir $(INCPREFIX)\$(XMLSEC_NAME)\nss if exist $(BINDIR)\$(XMLSEC_MSCRYPTO_SO) if not exist $(INCPREFIX)\$(XMLSEC_NAME)\mscrypto mkdir $(INCPREFIX)\$(XMLSEC_NAME)\mscrypto - if exist $(BASEDIR)\include\$(XMLSEC_NAME) copy $(BASEDIR)\include\$(XMLSEC_NAME)\*.h $(INCPREFIX)\$(XMLSEC_NAME) + if not exist $(BINPREFIX) mkdir $(BINPREFIX) + if not exist $(LIBPREFIX) mkdir $(LIBPREFIX) + copy $(BASEDIR)\include\$(XMLSEC_NAME)\*.h $(INCPREFIX)\$(XMLSEC_NAME) if exist $(BINDIR)\$(XMLSEC_OPENSSL_SO) copy $(BASEDIR)\include\$(XMLSEC_NAME)\openssl\*.h $(INCPREFIX)\$(XMLSEC_NAME)\openssl if exist $(BINDIR)\$(XMLSEC_NSS_SO) copy $(BASEDIR)\include\$(XMLSEC_NAME)\nss\*.h $(INCPREFIX)\$(XMLSEC_NAME)\nss if exist $(BINDIR)\$(XMLSEC_MSCRYPTO_SO) copy $(BASEDIR)\include\$(XMLSEC_NAME)\mscrypto\*.h $(INCPREFIX)\$(XMLSEC_NAME)\mscrypto - if exist $(BINDIR)\$(XMLSEC_SO) copy $(BINDIR)\$(XMLSEC_SO) $(SOPREFIX) - if exist $(BINDIR)\$(XMLSEC_SO_MANIFEST) copy $(BINDIR)\$(XMLSEC_SO_MANIFEST) $(SOPREFIX) - if exist $(BINDIR)\$(XMLSEC_A) copy $(BINDIR)\$(XMLSEC_A) $(LIBPREFIX) - if exist $(BINDIR)\$(XMLSEC_IMP) copy $(BINDIR)\$(XMLSEC_IMP) $(LIBPREFIX) + copy $(BINDIR)\$(XMLSEC_SO) $(SOPREFIX) + copy $(BINDIR)\$(XMLSEC_A) $(LIBPREFIX) + copy $(BINDIR)\$(XMLSEC_IMP) $(LIBPREFIX) if exist $(BINDIR)\$(XMLSEC_OPENSSL_SO) copy $(BINDIR)\$(XMLSEC_OPENSSL_SO) $(SOPREFIX) - if exist $(BINDIR)\$(XMLSEC_OPENSSL_SO_MANIFEST) copy $(BINDIR)\$(XMLSEC_OPENSSL_SO_MANIFEST) $(SOPREFIX) if exist $(BINDIR)\$(XMLSEC_OPENSSL_A) copy $(BINDIR)\$(XMLSEC_OPENSSL_A) $(LIBPREFIX) if exist $(BINDIR)\$(XMLSEC_OPENSSL_IMP) copy $(BINDIR)\$(XMLSEC_OPENSSL_IMP) $(LIBPREFIX) if exist $(BINDIR)\$(XMLSEC_NSS_SO) copy $(BINDIR)\$(XMLSEC_NSS_SO) $(SOPREFIX) - if exist $(BINDIR)\$(XMLSEC_NSS_SO_MANIFEST) copy $(BINDIR)\$(XMLSEC_NSS_SO_MANIFEST) $(SOPREFIX) if exist $(BINDIR)\$(XMLSEC_NSS_A) copy $(BINDIR)\$(XMLSEC_NSS_A) $(LIBPREFIX) if exist $(BINDIR)\$(XMLSEC_NSS_IMP) copy $(BINDIR)\$(XMLSEC_NSS_IMP) $(LIBPREFIX) if exist $(BINDIR)\$(XMLSEC_MSCRYPTO_SO) copy $(BINDIR)\$(XMLSEC_MSCRYPTO_SO) $(SOPREFIX) - if exist $(BINDIR)\$(XMLSEC_MSCRYPTO_SO_MANIFEST) copy $(BINDIR)\$(XMLSEC_MSCRYPTO_SO_MANIFEST) $(SOPREFIX) if exist $(BINDIR)\$(XMLSEC_MSCRYPTO_A) copy $(BINDIR)\$(XMLSEC_MSCRYPTO_A) $(LIBPREFIX) if exist $(BINDIR)\$(XMLSEC_MSCRYPTO_IMP) copy $(BINDIR)\$(XMLSEC_MSCRYPTO_IMP) $(LIBPREFIX) - if exist $(BINDIR)\$(APP_NAME) copy $(BINDIR)\$(APP_NAME) $(BINPREFIX) - if exist $(BINDIR)\$(APP_NAME_MANIFEST) copy $(BINDIR)\$(APP_NAME_MANIFEST) $(BINPREFIX) + copy $(BINDIR)\$(APP_NAME) $(BINPREFIX) uninstall : if exist $(INCPREFIX)\$(XMLSEC_NAME) rmdir /S /Q $(INCPREFIX)\$(XMLSEC_NAME) if exist $(SOPREFIX)\$(XMLSEC_SO) del /F /S /Q $(SOPREFIX)\$(XMLSEC_SO) - if exist $(SOPREFIX)\$(XMLSEC_SO_MANIFEST) del /F /S /Q $(SOPREFIX)\$(XMLSEC_SO) if exist $(LIBPREFIX)\$(XMLSEC_A) del /F /S /Q $(LIBPREFIX)\$(XMLSEC_A) if exist $(LIBPREFIX)\$(XMLSEC_IMP) del /F /S /Q $(LIBPREFIX)\$(XMLSEC_IMP) if exist $(SOPREFIX)\$(XMLSEC_OPENSSL_SO) del /F /S /Q $(SOPREFIX)\$(XMLSEC_OPENSSL_SO) - if exist $(SOPREFIX)\$(XMLSEC_OPENSSL_SO_MANIFEST) del /F /S /Q $(SOPREFIX)\$(XMLSEC_OPENSSL_SO) if exist $(LIBPREFIX)\$(XMLSEC_OPENSSL_A) del /F /S /Q $(LIBPREFIX)\$(XMLSEC_OPENSSL_A) if exist $(LIBPREFIX)\$(XMLSEC_OPENSSL_IMP) del /F /S /Q $(LIBPREFIX)\$(XMLSEC_OPENSSL_IMP) if exist $(SOPREFIX)\$(XMLSEC_NSS_SO) del /F /S /Q $(SOPREFIX)\$(XMLSEC_NSS_SO) - if exist $(SOPREFIX)\$(XMLSEC_NSS_SO_MANIFEST) del /F /S /Q $(SOPREFIX)\$(XMLSEC_NSS_SO) if exist $(LIBPREFIX)\$(XMLSEC_NSS_A) del /F /S /Q $(LIBPREFIX)\$(XMLSEC_NSS_A) if exist $(LIBPREFIX)\$(XMLSEC_NSS_IMP) del /F /S /Q $(LIBPREFIX)\$(XMLSEC_NSS_IMP) if exist $(SOPREFIX)\$(XMLSEC_MSCRYPTO_SO) del /F /S /Q $(SOPREFIX)\$(XMLSEC_MSCRYPTO_SO) - if exist $(SOPREFIX)\$(XMLSEC_MSCRYPTO_SO_MANIFEST) del /F /S /Q $(SOPREFIX)\$(XMLSEC_MSCRYPTO_SO) if exist $(LIBPREFIX)\$(XMLSEC_MSCRYPTO_A) del /F /S /Q $(LIBPREFIX)\$(XMLSEC_MSCRYPTO_A) if exist $(LIBPREFIX)\$(XMLSEC_MSCRYPTO_IMP) del /F /S /Q $(LIBPREFIX)\$(XMLSEC_MSCRYPTO_IMP) if exist $(BINPREFIX)\$(APP_NAME) del /F /S /Q $(BINPREFIX)\$(APP_NAME) - if exist $(BINPREFIX)\$(APP_NAME_MANIFEST) del /F /S /Q $(BINPREFIX)\$(APP_NAME_MANIFEST) # This is a target for me, to make a binary distribution. Not for the public use, # keep your hands off :-) |