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

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

1 files changed, 109 insertions, 109 deletions

diff --git a/libhb/Makefile b/libhb/Makefile
index 255cf21cd..5b193854b 100644
--- a/libhb/Makefile
+++ b/libhb/Makefile
@@ -1,109 +1,109 @@
-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

-

+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
+