Be a good git person: store nmakefiles in correct text fmt

diff --git a/src/common/Makefile.nmake b/src/common/Makefile.nmake
index c8b5988666163cffd8a52a7655c67f09ddd31bac..e54827367053940dc7771d97e2c0eb32a46c556e 100644 (file)
--- a/src/common/Makefile.nmake
+++ b/src/common/Makefile.nmake
@@ -1,20 +1,20 @@
-all: libor.lib libor-crypto.lib libor-event.lib\r
-\r
-CFLAGS = /I ..\win32 /I ..\..\..\build-alpha\include\r
-\r
-LIBOR_OBJECTS = address.obj compat.obj container.obj di_ops.obj \\r
-       log.obj memarea.obj mempool.obj procmon.obj util.obj \\r
-       util_codedigest.obj\r
-\r
-LIBOR_CRYPTO_OBJECTS = aes.obj crypto.obj torgzip.obj tortls.obj\r
-\r
-LIBOR_EVENT_OBJECTS = compat_libevent.obj\r
-\r
-libor.lib: $(LIBOR_OBJECTS)\r
-       lib $(LIBOR_OBJECTS) /out:libor.lib\r
-\r
-libor-crypto.lib: $(LIBOR_CRYPTO_OBJECTS)\r
-       lib $(LIBOR_CRYPTO_OBJECTS) /out:libor-crypto.lib\r
-\r
-libor-event.lib:  $(LIBOR_EVENT_OBJECTS)\r
-       lib $(LIBOR_EVENT_OBJECTS) /out:libor-event.lib\r
+all: libor.lib libor-crypto.lib libor-event.lib
+
+CFLAGS = /I ..\win32 /I ..\..\..\build-alpha\include
+
+LIBOR_OBJECTS = address.obj compat.obj container.obj di_ops.obj \
+       log.obj memarea.obj mempool.obj procmon.obj util.obj \
+       util_codedigest.obj
+
+LIBOR_CRYPTO_OBJECTS = aes.obj crypto.obj torgzip.obj tortls.obj
+
+LIBOR_EVENT_OBJECTS = compat_libevent.obj
+
+libor.lib: $(LIBOR_OBJECTS)
+       lib $(LIBOR_OBJECTS) /out:libor.lib
+
+libor-crypto.lib: $(LIBOR_CRYPTO_OBJECTS)
+       lib $(LIBOR_CRYPTO_OBJECTS) /out:libor-crypto.lib
+
+libor-event.lib:  $(LIBOR_EVENT_OBJECTS)
+       lib $(LIBOR_EVENT_OBJECTS) /out:libor-event.lib

diff --git a/src/or/Makefile.nmake b/src/or/Makefile.nmake
index 919edbbf22dc722899266107a91d809d2c5f12b9..3181e79c20c72b890d6000b4c477070feff9cfdf 100644 (file)
--- a/src/or/Makefile.nmake
+++ b/src/or/Makefile.nmake
@@ -1,28 +1,28 @@
-all: tor.exe\r
-\r
-CFLAGS = /I ..\win32 /I ..\..\..\build-alpha\include /I ..\common\r
-\r
-LIBS = ..\..\..\build-alpha\lib\libevent.a \\r
- ..\..\..\build-alpha\lib\libcrypto.a \\r
- ..\..\..\build-alpha\lib\libssl.a \\r
- ..\..\..\build-alpha\lib\libz.a \\r
- ws2_32.lib advapi32.lib shell32.lib\r
-\r
-LIBTOR_OBJECTS = buffers.obj circuitbuild.obj circuitlist.obj circuituse.obj \\r
-       command.obj config.obj connection.obj connection_edge.obj \\r
-       connection_or.obj control.obj cpuworker.obj directory.obj \\r
-       dirserv.obj dirvote.obj dns.obj dnsserv.obj geoip.obj \\r
-       hibernate.obj main.obj microdesc.obj networkstatus.obj \\r
-       nodelist.obj onion.obj policies.obj reasons.obj relay.obj \\r
-       rendclient.obj rendcommon.obj rendmid.obj rendservice.obj \\r
-       rephist.obj router.obj routerlist.obj routerparse.obj status.obj \\r
-       config_codedigest.obj ntmain.obj\r
-\r
-libtor.lib: $(LIBTOR_OBJECTS)\r
-       lib $(LIBTOR_OBJECTS) /out:libtor.lib\r
-\r
-tor.exe: libtor.lib tor_main.obj\r
-       $(CC) $(CFLAGS) $(LIBS) libtor.lib ..\common\*.lib tor_main.obj\r
-\r
-clean:\r
-       del $(LIBTOR_OBJECTS) *.lib tor.exe\r
+all: tor.exe
+
+CFLAGS = /I ..\win32 /I ..\..\..\build-alpha\include /I ..\common
+
+LIBS = ..\..\..\build-alpha\lib\libevent.a \
+ ..\..\..\build-alpha\lib\libcrypto.a \
+ ..\..\..\build-alpha\lib\libssl.a \
+ ..\..\..\build-alpha\lib\libz.a \
+ ws2_32.lib advapi32.lib shell32.lib
+
+LIBTOR_OBJECTS = buffers.obj circuitbuild.obj circuitlist.obj circuituse.obj \
+       command.obj config.obj connection.obj connection_edge.obj \
+       connection_or.obj control.obj cpuworker.obj directory.obj \
+       dirserv.obj dirvote.obj dns.obj dnsserv.obj geoip.obj \
+       hibernate.obj main.obj microdesc.obj networkstatus.obj \
+       nodelist.obj onion.obj policies.obj reasons.obj relay.obj \
+       rendclient.obj rendcommon.obj rendmid.obj rendservice.obj \
+       rephist.obj router.obj routerlist.obj routerparse.obj status.obj \
+       config_codedigest.obj ntmain.obj
+
+libtor.lib: $(LIBTOR_OBJECTS)
+       lib $(LIBTOR_OBJECTS) /out:libtor.lib
+
+tor.exe: libtor.lib tor_main.obj
+       $(CC) $(CFLAGS) $(LIBS) libtor.lib ..\common\*.lib tor_main.obj
+
+clean:
+       del $(LIBTOR_OBJECTS) *.lib tor.exe