Merge pull request #8 from mbbill/correct_crlf

Correct crlf

2 files changed, 49 insertions, 49 deletions

diff --git a/components/external/libz/Makefile b/components/external/libz/Makefile
index 9b5fd0e29e..7022fd9306 100644
--- a/components/external/libz/Makefile
+++ b/components/external/libz/Makefile
@@ -1,27 +1,27 @@
-RTGUI_ROOT=../..

-

-include $(RTGUI_ROOT)/config.mk

-

-SRC	= adler32.c compress.c crc32.c deflate.c gzio.c infback.c inffast.c \

-	inflate.c inftrees.c trees.c uncompr.c zutil.c

-

-OBJ	= $(SRC:.c=.o) 

-LIB	= libz.a

-

-all: $(LIB)

-

-$(LIB): $(OBJ)

-	$(AR) r $@ $?

-	$(RANLIB) $@

-

-clean :

-	$(RM) *.o *~ *.bak

-	$(RM) $(LIB)

-	$(RM) .depend

-

-dep : .depend

-

-include .depend

-

-.depend: $(SRC)

-	$(CC) $(CFLAGS) -M $^ > $@

+RTGUI_ROOT=../..
+
+include $(RTGUI_ROOT)/config.mk
+
+SRC	= adler32.c compress.c crc32.c deflate.c gzio.c infback.c inffast.c \
+	inflate.c inftrees.c trees.c uncompr.c zutil.c
+
+OBJ	= $(SRC:.c=.o) 
+LIB	= libz.a
+
+all: $(LIB)
+
+$(LIB): $(OBJ)
+	$(AR) r $@ $?
+	$(RANLIB) $@
+
+clean :
+	$(RM) *.o *~ *.bak
+	$(RM) $(LIB)
+	$(RM) .depend
+
+dep : .depend
+
+include .depend
+
+.depend: $(SRC)
+	$(CC) $(CFLAGS) -M $^ > $@
diff --git a/components/external/libz/SConscript b/components/external/libz/SConscript
index 0ab46278b8..8eae9e9eb0 100644
--- a/components/external/libz/SConscript
+++ b/components/external/libz/SConscript
@@ -1,22 +1,22 @@
-Import('RTT_ROOT')

-Import('rtconfig')

-from building import *

-

-src	= Split('''

-adler32.c

-compress.c

-crc32.c

-deflate.c

-infback.c

-inffast.c

-inflate.c

-inftrees.c

-trees.c

-uncompr.c

-zutil.c

-''')

-CPPPATH = [RTT_ROOT + '/components/external/libz']

-

-group = DefineGroup('libz', src, depend = ['RTGUI_IMAGE_PNG'], CPPPATH = CPPPATH)

-

-Return('group')

+Import('RTT_ROOT')
+Import('rtconfig')
+from building import *
+
+src	= Split('''
+adler32.c
+compress.c
+crc32.c
+deflate.c
+infback.c
+inffast.c
+inflate.c
+inftrees.c
+trees.c
+uncompr.c
+zutil.c
+''')
+CPPPATH = [RTT_ROOT + '/components/external/libz']
+
+group = DefineGroup('libz', src, depend = ['RTGUI_IMAGE_PNG'], CPPPATH = CPPPATH)
+
+Return('group')