Use unix-style line endings (LF) for libhb/Makefile instead of Windows style (CRLF).

git-svn-id: svn://localhost/HandBrake/trunk@1339 b64f7644-9d1e-0410-96f1-a4d463321fa5

diff --git a/libhb/Makefile b/libhb/Makefile
index 255cf21..5b19385 100644 (file)
--- a/libhb/Makefile
+++ b/libhb/Makefile
@@ -1,109 +1,109 @@
-include ../Makefile.config\r
-\r
-SYSTEM = $(shell uname -s)\r
-\r
-ifeq ($(findstring CYGWIN_NT,$(SYSTEM)),CYGWIN_NT)\r
-       SYSDEF=-DSYS_CYGWIN\r
-endif\r
-\r
-ifeq ($(SYSTEM),FreeBSD)\r
-       SYSDEF = -DSYS_FREEBSD\r
-       LDFLAGS += -pthread -lm\r
-endif\r
-       \r
-ifeq ($(SYSTEM),NetBSD)\r
-       SYSDEF = -DSYS_NETBSD\r
-       LDFLAGS += -lpthread -lm\r
-endif\r
-       \r
-ifeq ($(SYSTEM),Linux)\r
-       SYSDEF = -DSYS_LINUX $(HB_DEFPPC) -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64\r
-       LDFLAGS += -lpthread -lm -ldl\r
-endif\r
-\r
-SRCS = common.c hb.c ports.c scan.c work.c decmpeg2.c encavcodec.c \\r
-          update.c demuxmpeg.c fifo.c render.c reader.c muxcommon.c stream.c \\r
-          muxmp4.c sync.c decsub.c deca52.c decdca.c encfaac.c declpcm.c encx264.c \\r
-          decavcodec.c encxvid.c muxmkv.c muxavi.c enclame.c muxogm.c encvorbis.c \\r
-          dvd.c  ipodutil.cpp deblock.c deinterlace.c denoise.c detelecine.c lang.c\r
-OTMP = $(SRCS:%.c=%.o) \r
-OBJS = $(OTMP:%.cpp=%.o)\r
-\r
-ifeq ($(findstring CYGWIN_NT,$(SYSTEM)),CYGWIN_NT)\r
-CONTRIBS = ../contrib/lib/liba52.a ../contrib/lib/libavformat.a \\r
-                  ../contrib/lib/libavcodec.a ../contrib/lib/libavutil.a \\r
-                  ../contrib/lib/libdca.a ../contrib/lib/libdvdread.a  \\r
-                  ../contrib/lib/libfaac.a ../contrib/lib/libmp3lame.a \\r
-                  ../contrib/lib/libmpeg2.a ../contrib/lib/libmpeg2convert.a \\r
-                  ../contrib/lib/libvorbis.a ../contrib/lib/libvorbisenc.a \\r
-                  ../contrib/lib/libvorbisfile.a ../contrib/lib/libogg.a \\r
-                  ../contrib/lib/libsamplerate.a ../contrib/lib/libx264.a \\r
-                  ../contrib/lib/libxvidcore.a  ../contrib/lib/libmp4v2.a \\r
-                  ../contrib/lib/libmkv.a ../contrib/lib/libswscale.a\r
-else\r
-CONTRIBS = ../contrib/lib/liba52.a ../contrib/lib/libavformat.a \\r
-                  ../contrib/lib/libavcodec.a ../contrib/lib/libavutil.a \\r
-                  ../contrib/lib/libdca.a ../contrib/lib/libdvdread.a \\r
-                  ../contrib/lib/libdvdcss.a ../contrib/lib/libfaac.a \\r
-                  ../contrib/lib/libmp3lame.a ../contrib/lib/libmpeg2.a \\r
-                  ../contrib/lib/libmpeg2convert.a ../contrib/lib/libvorbis.a \\r
-                  ../contrib/lib/libvorbisenc.a ../contrib/lib/libvorbisfile.a \\r
-                  ../contrib/lib/libogg.a ../contrib/lib/libsamplerate.a \\r
-                  ../contrib/lib/libx264.a ../contrib/lib/libxvidcore.a \\r
-                  ../contrib/lib/libmp4v2.a ../contrib/lib/libmkv.a \\r
-                  ../contrib/lib/libswscale.a\r
-endif\r
-\r
-CFLAGS += -I../contrib/include -D__LIBHB__ -DUSE_PTHREAD -DHB_VERSION=\"$(HB_VERSION)\" -DHB_BUILD=$(HB_BUILD) $(SYSDEF)\r
-\r
-CXXFLAGS += -I../contrib/include -D__LIBHB__ -DUSE_PTHREAD -DHB_VERSION=\"$(HB_VERSION)\" -DHB_BUILD=$(HB_BUILD) $(SYSDEF)\r
-\r
-ifeq ($(findstring CYGWIN_NT,$(SYSTEM)),CYGWIN_NT)\r
-all: libhb.a libhb.dll\r
-else\r
-all: libhb.a libhb.so\r
-\r
-endif\r
-\r
-libhb.a: $(OBJS)\r
-       @echo "Library $@"\r
-       @ar ru $@ $(OBJS)\r
-       @ranlib $@\r
-\r
-libhb.so: $(OBJS)\r
-       @echo "Shared library $@"\r
-       @g++ -o $@ $(OBJS) $(CONTRIBS) -shared $(CFLAGS)  || \\r
-       ( echo "Compile line for $@ was:"; echo $$CMD; false )\r
-\r
-libhb.dll: $(OBJS)\r
-       @echo "Shared library $@"\r
-       @g++ -o $@ $(OBJS) $(CONTRIBS) -shared $(CFLAGS)  || \\r
-       ( echo "Compile line for $@ was:"; echo $$CMD; false )\r
-\r
-%.o: %.c\r
-       @echo "Cc $@"\r
-       echo $(CC) $(CFLAGS)\r
-       @CMD="$(CC) $(CFLAGS) -o $@ -c $<"; $$CMD || \\r
-         ( echo "Compile line for $@ was:"; echo $$CMD; false )\r
-\r
-%.o: %.cpp\r
-       @echo "Cc $@"\r
-       @CMD="$(CC) $(CFLAGS) -o $@ -c $<"; $$CMD || \\r
-       ( echo "Compile line for $@ was:"; echo $$CMD; false )\r
-\r
-       \r
-clean:\r
-       @echo "Clean libhb.a"\r
-       @$(RM) libhb.*\r
-       @echo "Clean libhb.so"\r
-       @$(RM) libhb.so\r
-       @echo "Clean $(OBJS)"\r
-       @$(RM) $(OBJS)\r
-\r
-.depend: $(SRCS)\r
-       @echo "Checking dependencies..."\r
-       @$(RM) .depend\r
-       @$(foreach SRC, $(SRCS), $(CC) -MM $(SRC) $(CFLAGS) >> .depend;)\r
-       \r
--include .depend\r
-\r
+include ../Makefile.config
+
+SYSTEM = $(shell uname -s)
+
+ifeq ($(findstring CYGWIN_NT,$(SYSTEM)),CYGWIN_NT)
+       SYSDEF=-DSYS_CYGWIN
+endif
+
+ifeq ($(SYSTEM),FreeBSD)
+       SYSDEF = -DSYS_FREEBSD
+       LDFLAGS += -pthread -lm
+endif
+       
+ifeq ($(SYSTEM),NetBSD)
+       SYSDEF = -DSYS_NETBSD
+       LDFLAGS += -lpthread -lm
+endif
+       
+ifeq ($(SYSTEM),Linux)
+       SYSDEF = -DSYS_LINUX $(HB_DEFPPC) -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64
+       LDFLAGS += -lpthread -lm -ldl
+endif
+
+SRCS = common.c hb.c ports.c scan.c work.c decmpeg2.c encavcodec.c \
+          update.c demuxmpeg.c fifo.c render.c reader.c muxcommon.c stream.c \
+          muxmp4.c sync.c decsub.c deca52.c decdca.c encfaac.c declpcm.c encx264.c \
+          decavcodec.c encxvid.c muxmkv.c muxavi.c enclame.c muxogm.c encvorbis.c \
+          dvd.c  ipodutil.cpp deblock.c deinterlace.c denoise.c detelecine.c lang.c
+OTMP = $(SRCS:%.c=%.o) 
+OBJS = $(OTMP:%.cpp=%.o)
+
+ifeq ($(findstring CYGWIN_NT,$(SYSTEM)),CYGWIN_NT)
+CONTRIBS = ../contrib/lib/liba52.a ../contrib/lib/libavformat.a \
+                  ../contrib/lib/libavcodec.a ../contrib/lib/libavutil.a \
+                  ../contrib/lib/libdca.a ../contrib/lib/libdvdread.a  \
+                  ../contrib/lib/libfaac.a ../contrib/lib/libmp3lame.a \
+                  ../contrib/lib/libmpeg2.a ../contrib/lib/libmpeg2convert.a \
+                  ../contrib/lib/libvorbis.a ../contrib/lib/libvorbisenc.a \
+                  ../contrib/lib/libvorbisfile.a ../contrib/lib/libogg.a \
+                  ../contrib/lib/libsamplerate.a ../contrib/lib/libx264.a \
+                  ../contrib/lib/libxvidcore.a  ../contrib/lib/libmp4v2.a \
+                  ../contrib/lib/libmkv.a ../contrib/lib/libswscale.a
+else
+CONTRIBS = ../contrib/lib/liba52.a ../contrib/lib/libavformat.a \
+                  ../contrib/lib/libavcodec.a ../contrib/lib/libavutil.a \
+                  ../contrib/lib/libdca.a ../contrib/lib/libdvdread.a \
+                  ../contrib/lib/libdvdcss.a ../contrib/lib/libfaac.a \
+                  ../contrib/lib/libmp3lame.a ../contrib/lib/libmpeg2.a \
+                  ../contrib/lib/libmpeg2convert.a ../contrib/lib/libvorbis.a \
+                  ../contrib/lib/libvorbisenc.a ../contrib/lib/libvorbisfile.a \
+                  ../contrib/lib/libogg.a ../contrib/lib/libsamplerate.a \
+                  ../contrib/lib/libx264.a ../contrib/lib/libxvidcore.a \
+                  ../contrib/lib/libmp4v2.a ../contrib/lib/libmkv.a \
+                  ../contrib/lib/libswscale.a
+endif
+
+CFLAGS += -I../contrib/include -D__LIBHB__ -DUSE_PTHREAD -DHB_VERSION=\"$(HB_VERSION)\" -DHB_BUILD=$(HB_BUILD) $(SYSDEF)
+
+CXXFLAGS += -I../contrib/include -D__LIBHB__ -DUSE_PTHREAD -DHB_VERSION=\"$(HB_VERSION)\" -DHB_BUILD=$(HB_BUILD) $(SYSDEF)
+
+ifeq ($(findstring CYGWIN_NT,$(SYSTEM)),CYGWIN_NT)
+all: libhb.a libhb.dll
+else
+all: libhb.a libhb.so
+
+endif
+
+libhb.a: $(OBJS)
+       @echo "Library $@"
+       @ar ru $@ $(OBJS)
+       @ranlib $@
+
+libhb.so: $(OBJS)
+       @echo "Shared library $@"
+       @g++ -o $@ $(OBJS) $(CONTRIBS) -shared $(CFLAGS)  || \
+       ( echo "Compile line for $@ was:"; echo $$CMD; false )
+
+libhb.dll: $(OBJS)
+       @echo "Shared library $@"
+       @g++ -o $@ $(OBJS) $(CONTRIBS) -shared $(CFLAGS)  || \
+       ( echo "Compile line for $@ was:"; echo $$CMD; false )
+
+%.o: %.c
+       @echo "Cc $@"
+       echo $(CC) $(CFLAGS)
+       @CMD="$(CC) $(CFLAGS) -o $@ -c $<"; $$CMD || \
+         ( echo "Compile line for $@ was:"; echo $$CMD; false )
+
+%.o: %.cpp
+       @echo "Cc $@"
+       @CMD="$(CC) $(CFLAGS) -o $@ -c $<"; $$CMD || \
+       ( echo "Compile line for $@ was:"; echo $$CMD; false )
+
+       
+clean:
+       @echo "Clean libhb.a"
+       @$(RM) libhb.*
+       @echo "Clean libhb.so"
+       @$(RM) libhb.so
+       @echo "Clean $(OBJS)"
+       @$(RM) $(OBJS)
+
+.depend: $(SRCS)
+       @echo "Checking dependencies..."
+       @$(RM) .depend
+       @$(foreach SRC, $(SRCS), $(CC) -MM $(SRC) $(CFLAGS) >> .depend;)
+       
+-include .depend
+