Fix Makefiles for dynamically linked dvdcss.

You can only build dynamically linked dvdcss with make.
If you want static dvdcss use jam.

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

diff --git a/libhb/Makefile b/libhb/Makefile
index fb05e5a..28b8d5c 100644 (file)
--- a/libhb/Makefile
+++ b/libhb/Makefile
@@ -29,7 +29,6 @@ SRCS = common.c hb.c ports.c scan.c work.c decmpeg2.c encavcodec.c enctheora.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  \
@@ -41,19 +40,6 @@ CONTRIBS = ../contrib/lib/liba52.a ../contrib/lib/libavformat.a \
                   ../contrib/lib/libxvidcore.a  ../contrib/lib/libmp4v2.a \
                   ../contrib/lib/libmkv.a ../contrib/lib/libswscale.a \
                   ../contrib/lib/libtheora.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 ../contrib/lib/libtheora.a
-endif
 
 CFLAGS += -I../contrib/include -D__LIBHB__ -DUSE_PTHREAD -DHB_VERSION=\"$(HB_VERSION)\" -DHB_BUILD=$(HB_BUILD) $(SYSDEF)
 

diff --git a/test/Makefile b/test/Makefile
index 472eb5b..3a5b39c 100644 (file)
--- a/test/Makefile
+++ b/test/Makefile
@@ -1,17 +1,14 @@
 SYSTEM = $(shell uname -s)\r
 \r
-ifeq ($(findstring CYGWIN_NT,$(SYSTEM)),CYGWIN_NT)\r
-       LIBS = a52 mkv avformat avcodec avutil dca dvdread faac mp3lame mpeg2 vorbis vorbisenc ogg samplerate x264 xvidcore mp4v2 swscale \r
-else\r
-        LIBS = a52 mkv avformat avcodec avutil dca dvdread dvdcss faac mp3lame mpeg2 vorbis vorbisenc ogg samplerate x264 xvidcore mp4v2 swscale \r
-endif\r
+LIBS = a52 mkv avformat avcodec avutil dca dvdread faac mp3lame mpeg2 vorbis \\r
+          vorbisenc ogg samplerate x264 xvidcore mp4v2 swscale\r
 \r
 all: ../HandBrakeCLI\r
 \r
 CFLAGS += -I../libhb\r
 CXXFLAGS += -I../libhb\r
 LIBS2 = ../libhb/libhb.a $(LIBS:%=../contrib/lib/lib%.a)\r
-LDFLAGS += $(LIBS2)\r
+LDFLAGS += $(LIBS2) -ldl\r
 \r
 ../HandBrakeCLI: test.c parsecsv.c $(LIBS2)\r
        @CMD="$(CC) $(CFLAGS) -o test.o -c test.c"; $$CMD || \\r