Change all CRLF linefeeds to LF linefeeds

Signed-off-by: Samuli Seppänen <samuli@openvpn.net>
Acked-by: David Sommerseth <davids@redhat.com>
Signed-off-by: David Sommerseth <davids@redhat.com>

1 files changed, 42 insertions, 42 deletions

diff --git a/win/msvc.mak.in b/win/msvc.mak.in
index 6c7558f..ac17ae9 100644
--- a/win/msvc.mak.in
+++ b/win/msvc.mak.in
@@ -7,51 +7,51 @@
 #
 # - Everything between @<< and << is inserted into a s.c. "in-line file". This 
 #   file drives the linker (link.exe).
-# - HEADERS_OBJS is expanded to all all header and source files listed in 
+# - HEADERS_OBJS is expanded to all all header and source files listed in
 #  ..\Makefile.am
 # - OPENSSL_DIR and LZO_DIR are dynamically created from settings.in
-

-OPENSSL = @OPENSSL_DIR@

-OPENSSL_DYNAMIC = libeay32.lib ssleay32.lib

-

-LZO = @LZO_DIR@

-LZO_DYNAMIC = lzo2.lib

-

-INCLUDE_DIRS = -I$(OPENSSL)/include -I$(LZO)/include

-

-LIBS = $(OPENSSL_DYNAMIC) $(LZO_DYNAMIC) ws2_32.lib crypt32.lib iphlpapi.lib winmm.lib user32.lib gdi32.lib advapi32.lib wininet.lib

-

-LIB_DIRS = -LIBPATH:$(OPENSSL)\lib -LIBPATH:$(LZO)\lib

-

-EXE = openvpn.exe

-

-CPP=cl.exe

-CPP_ARG_COMMON=/nologo /W3 -DWIN32 -DWIN32_LEAN_AND_MEAN -D_CONSOLE -D_MBCS -D_CRT_SECURE_NO_DEPRECATE $(INCLUDE_DIRS) /FD /c

-

-LINK32=link.exe

-

-!ifdef PRODUCT_OPENVPN_DEBUG

-# debug:

-CPP_PROJ=$(CPP_ARG_COMMON) /MD /Z7

+
+OPENSSL = @OPENSSL_DIR@
+OPENSSL_DYNAMIC = libeay32.lib ssleay32.lib
+
+LZO = @LZO_DIR@
+LZO_DYNAMIC = lzo2.lib
+
+INCLUDE_DIRS = -I$(OPENSSL)/include -I$(LZO)/include
+
+LIBS = $(OPENSSL_DYNAMIC) $(LZO_DYNAMIC) ws2_32.lib crypt32.lib iphlpapi.lib winmm.lib user32.lib gdi32.lib advapi32.lib wininet.lib
+
+LIB_DIRS = -LIBPATH:$(OPENSSL)\lib -LIBPATH:$(LZO)\lib
+
+EXE = openvpn.exe
+
+CPP=cl.exe
+CPP_ARG_COMMON=/nologo /W3 -DWIN32 -DWIN32_LEAN_AND_MEAN -D_CONSOLE -D_MBCS -D_CRT_SECURE_NO_DEPRECATE $(INCLUDE_DIRS) /FD /c
+
+LINK32=link.exe
+
+!ifdef PRODUCT_OPENVPN_DEBUG
+# debug:
+CPP_PROJ=$(CPP_ARG_COMMON) /MD /Z7
 LINK32_FLAGS=/nologo /subsystem:console /incremental:no /opt:ref /opt:icf /debug
-!else

-# release:

-CPP_PROJ=$(CPP_ARG_COMMON) /O2 /MD -DNDEBUG

+!else
+# release:
+CPP_PROJ=$(CPP_ARG_COMMON) /O2 /MD -DNDEBUG
 LINK32_FLAGS=/nologo /subsystem:console /incremental:no
-!endif

-

+!endif
+
 # HEADERS and OBJS definitions, automatically generated from ../Makefile.am
-@HEADERS_OBJS@

-

-openvpn : $(OBJS)

-	$(LINK32) @<<

+@HEADERS_OBJS@
+
+openvpn : $(OBJS)
+	$(LINK32) @<<
 	$(LINK32_FLAGS) "/out:$(EXE)" $(LIB_DIRS) $(LIBS) $(OBJS)
-<<

-

-clean :

-	del /Q $(OBJS) $(EXE) *.idb *.pdb

-

-.c.obj::

-   $(CPP) @<<

-   $(CPP_PROJ) $<

-<<

+<<
+
+clean :
+	del /Q $(OBJS) $(EXE) *.idb *.pdb
+
+.c.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $<
+<<