[pkg-opensc-commit] [libp11] 56/67: make.rules.mak cleanup
Eric Dorland
eric at moszumanska.debian.org
Sat Jan 30 05:34:17 UTC 2016
This is an automated email from the git hooks/post-receive script.
eric pushed a commit to branch master
in repository libp11.
commit 2a21022d1a174ce1f50ec829f9437f326d5fba9c
Author: Michał Trojnara <Michal.Trojnara at stunnel.org>
Date: Tue Jan 19 17:23:55 2016 +0100
make.rules.mak cleanup
---
make.rules.mak | 4 +---
src/Makefile.mak | 3 +--
2 files changed, 2 insertions(+), 5 deletions(-)
diff --git a/make.rules.mak b/make.rules.mak
index b10d983..9bd4f7a 100644
--- a/make.rules.mak
+++ b/make.rules.mak
@@ -31,8 +31,6 @@ OPENSSL_LIB = $(OPENSSL_DIR)\lib\VC\static\libeay32MT$(DEBUG_SUFFIX).lib
LIBS = $(OPENSSL_LIB) user32.lib advapi32.lib crypt32.lib gdi32.lib
-CFLAGS = /nologo /GS /W3 /D_CRT_SECURE_NO_DEPRECATE /MT$(DEBUG_SUFFIX) $(OPENSSL_INC) /D_WIN32_WINNT=0x0502 /DWIN32_LEAN_AND_MEAN $(DEBUG_COMPILE)
+CLFLAGS = /nologo /GS /W3 /D_CRT_SECURE_NO_DEPRECATE /MT$(DEBUG_SUFFIX) $(OPENSSL_INC) /D_WIN32_WINNT=0x0502 /DWIN32_LEAN_AND_MEAN $(DEBUG_COMPILE)
LINKFLAGS = /NOLOGO /INCREMENTAL:NO $(MACHINE) /MANIFEST:NO /NXCOMPAT /DYNAMICBASE $(DEBUG_LINK)
-
-LIBFLAGS = /NOLOGO $(MACHINE)
diff --git a/src/Makefile.mak b/src/Makefile.mak
index 2955a41..81657d6 100644
--- a/src/Makefile.mak
+++ b/src/Makefile.mak
@@ -16,7 +16,7 @@ versioninfo.res: versioninfo.rc
rc $(RSC_PROJ) versioninfo.rc
.c.obj::
- cl $(CFLAGS) /c $<
+ cl $(CLFLAGS) /c $<
$(TARGET): $(OBJECTS) versioninfo.res
echo LIBRARY $* > $*.def
@@ -25,4 +25,3 @@ $(TARGET): $(OBJECTS) versioninfo.res
link $(LINKFLAGS) /dll /def:$*.def /implib:$*.lib /out:$(TARGET) \
$(OBJECTS) $(LIBS) versioninfo.res
if EXIST $*.dll.manifest mt -manifest $*.dll.manifest -outputresource:$*.dll;2
-
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-opensc/libp11.git
More information about the pkg-opensc-commit
mailing list