summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--contrib/Jamfile2
-rw-r--r--contrib/Makefile82
-rw-r--r--libhb/Makefile218
-rw-r--r--test/Makefile64
4 files changed, 183 insertions, 183 deletions
diff --git a/contrib/Jamfile b/contrib/Jamfile
index 86d35a536..0c2fa30b2 100644
--- a/contrib/Jamfile
+++ b/contrib/Jamfile
@@ -415,7 +415,7 @@ if $(OS) = CYGWIN
{
cd `dirname $(>)` && CONTRIB=`pwd` &&
rm -rf zlib && (gzip -dc zlib.tar.gz | tar xf - ) &&
- cd zlib && ./configure --prefix=$CONTRIB --cache-file=$CONTRIB/config.cache &&
+ cd zlib && ./configure --prefix=$CONTRIB &&
$(MAKE) && $(MAKE) install && touch $CONTRIB/.contrib &&
$(STRIP) $CONTRIB/lib/libz.a
}
diff --git a/contrib/Makefile b/contrib/Makefile
index b39c53ea6..33baec42c 100644
--- a/contrib/Makefile
+++ b/contrib/Makefile
@@ -1,41 +1,41 @@
-# Contrib Makefile
-
-SYSTEM = $(shell uname -s)
-
-# Special case for Mac OS X: everything is handled from the Xcode project
-ifeq ($(SYSTEM),Darwin)
-
-all:
- ( echo "MacOs X doesn't use this makefile, to build the contrib please use ../jam" ; false )
-
-endif
-
-ifeq ($(SYSTEM),Linux)
-
-all: .contrib
-
-.contrib:
- ( cd .. ; ./configure ; cd contrib ; cp -f ../config.jam . ; jam )
-
-clean:
- ( echo "Do a make mrproper to remove the contrib libraries )
-
-mrproper:
- (rm -rf lib ; rm -rf include )
-
-endif
-
-ifeq ($(SYSTEM),CYGWIN_NT-5.1)
-
-all: .contrib
-
-.contrib:
- ( cd .. ; ./configure ; cd contrib ; cp -f ../config.jam . ; jam.exe )
-
-clean:
- ( echo "Do a make mrproper to remove the contrib libraries )
-
-mrproper: clean
- (rm -rf lib ; rm -rf include ; rm -f .contrib)
-
-endif
+# Contrib Makefile
+
+SYSTEM = $(shell uname -s)
+
+# Special case for Mac OS X: everything is handled from the Xcode project
+ifeq ($(SYSTEM),Darwin)
+
+all:
+ ( echo "MacOs X doesn't use this makefile, to build the contrib please use ../jam" ; false )
+
+endif
+
+ifeq ($(SYSTEM),Linux)
+
+all: .contrib
+
+.contrib:
+ ( cd .. ; ./configure ; cd contrib ; cp -f ../config.jam . ; jam )
+
+clean:
+ ( echo "Do a make mrproper to remove the contrib libraries )
+
+mrproper:
+ (rm -rf lib ; rm -rf include )
+
+endif
+
+ifeq ($(findstring CYGWIN_NT,$(SYSTEM)),CYGWIN_NT)
+
+all: .contrib
+
+.contrib:
+ ( cd .. ; ./configure ; cd contrib ; cp -f ../config.jam . ; jam.exe )
+
+clean:
+ ( echo "Do a make mrproper to remove the contrib libraries )
+
+mrproper: clean
+ (rm -rf lib ; rm -rf include ; rm -f .contrib)
+
+endif
diff --git a/libhb/Makefile b/libhb/Makefile
index 097116dff..255cf21cd 100644
--- a/libhb/Makefile
+++ b/libhb/Makefile
@@ -1,109 +1,109 @@
-include ../Makefile.config
-
-SYSTEM = $(shell uname -s)
-
-ifeq ($(SYSTEM),CYGWIN_NT-5.1)
- 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 ($(SYSTEM),CYGWIN_NT-5.1)
-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 ($(SYSTEM),CYGWIN_NT-5.1)
-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
+
diff --git a/test/Makefile b/test/Makefile
index cd88806e9..472eb5bc0 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -1,32 +1,32 @@
-SYSTEM = $(shell uname -s)
-
-ifeq ($(SYSTEM),CYGWIN_NT-5.1)
- LIBS = a52 mkv avformat avcodec avutil dca dvdread faac mp3lame mpeg2 vorbis vorbisenc ogg samplerate x264 xvidcore mp4v2 swscale
-else
- LIBS = a52 mkv avformat avcodec avutil dca dvdread dvdcss faac mp3lame mpeg2 vorbis vorbisenc ogg samplerate x264 xvidcore mp4v2 swscale
-endif
-
-all: ../HandBrakeCLI
-
-CFLAGS += -I../libhb
-CXXFLAGS += -I../libhb
-LIBS2 = ../libhb/libhb.a $(LIBS:%=../contrib/lib/lib%.a)
-LDFLAGS += $(LIBS2)
-
-../HandBrakeCLI: test.c parsecsv.c $(LIBS2)
- @CMD="$(CC) $(CFLAGS) -o test.o -c test.c"; $$CMD || \
- ( echo "Compile line for $@ was:"; echo $$CMD; false )
- @CMD="$(CC) $(CFLAGS) -o parsecsv.o -c parsecsv.c"; $$CMD || \
- ( echo "Compile line for $@ was:"; echo $$CMD; false )
- @echo "Link HandBrakeCLI"
- @CMD="g++ $(CXXFLAGS) -o ../HandBrakeCLI test.o parsecsv.o $(LDFLAGS) -lz -lpthread"; $$CMD || \
- ( echo "Compile line for $@ was:"; echo $$CMD; false )
- @CMD="rm -rf ../plugins ; mkdir ../plugins ; cp ../contrib/lib/libquicktime/* ../plugins"; $$CMD
-
-
-clean:
- @echo "Clean HandBrakeCLI"
- @$(RM) ../HandBrakeCLI
- @$(RM) ../HandBrakeCLI.exe
- @$(RM) *.o
-
+SYSTEM = $(shell uname -s)
+
+ifeq ($(findstring CYGWIN_NT,$(SYSTEM)),CYGWIN_NT)
+ LIBS = a52 mkv avformat avcodec avutil dca dvdread faac mp3lame mpeg2 vorbis vorbisenc ogg samplerate x264 xvidcore mp4v2 swscale
+else
+ LIBS = a52 mkv avformat avcodec avutil dca dvdread dvdcss faac mp3lame mpeg2 vorbis vorbisenc ogg samplerate x264 xvidcore mp4v2 swscale
+endif
+
+all: ../HandBrakeCLI
+
+CFLAGS += -I../libhb
+CXXFLAGS += -I../libhb
+LIBS2 = ../libhb/libhb.a $(LIBS:%=../contrib/lib/lib%.a)
+LDFLAGS += $(LIBS2)
+
+../HandBrakeCLI: test.c parsecsv.c $(LIBS2)
+ @CMD="$(CC) $(CFLAGS) -o test.o -c test.c"; $$CMD || \
+ ( echo "Compile line for $@ was:"; echo $$CMD; false )
+ @CMD="$(CC) $(CFLAGS) -o parsecsv.o -c parsecsv.c"; $$CMD || \
+ ( echo "Compile line for $@ was:"; echo $$CMD; false )
+ @echo "Link HandBrakeCLI"
+ @CMD="g++ $(CXXFLAGS) -o ../HandBrakeCLI test.o parsecsv.o $(LDFLAGS) -lz -lpthread"; $$CMD || \
+ ( echo "Compile line for $@ was:"; echo $$CMD; false )
+ @CMD="rm -rf ../plugins ; mkdir ../plugins ; cp ../contrib/lib/libquicktime/* ../plugins"; $$CMD
+
+
+clean:
+ @echo "Clean HandBrakeCLI"
+ @$(RM) ../HandBrakeCLI
+ @$(RM) ../HandBrakeCLI.exe
+ @$(RM) *.o
+
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-20 14:14:27 +0000