* Fixed unnecessary target remake (recursive make is harmful !).

diff --git a/include/defs.h.in b/include/defs.h.in
index f4ba3580590d897f2363bdaa43d2edb4e3aef9aa..a9c9ad78f948ea98c928b7204173c0d8ba009591 100644 (file)
--- a/include/defs.h.in
+++ b/include/defs.h.in
@@ -130,6 +130,9 @@
 /* Define if you have the <machine/soundcard.h> header file.  */
 #undef HAVE_MACHINE_SOUNDCARD_H
 
+/* Define if you have the <mad.h> header file.  */
+#undef HAVE_MAD_H
+
 /* Define if you have the <net/if.h> header file.  */
 #undef HAVE_NET_IF_H
 
@@ -175,6 +178,9 @@
 /* Define if you have the <winioctl.h> header file.  */
 #undef HAVE_WINIOCTL_H
 
+/* Define if you have the mad library (-lmad).  */
+#undef HAVE_LIBMAD
+
 /* Define if you have the pth library (-lpth).  */
 #undef HAVE_LIBPTH
 

diff --git a/plugins/dvd/Makefile b/plugins/dvd/Makefile
index 7fc59f1aab1ca55e22288812d5fb7891ddc8dac8..bb2f93b2d64e5513712bfa9ed4f1a47ca4bb332f 100644 (file)
--- a/plugins/dvd/Makefile
+++ b/plugins/dvd/Makefile
@@ -10,6 +10,8 @@
 PLUGIN_DVD = dvd.o input_dvd.o dvd_ifo.o dvd_udf.o dvd_summary.o $(OBJ_DVD)
 BUILTIN_DVD = $(PLUGIN_DVD:%.o=BUILTIN_%.o)
 
+LIBDVDCSS_OBJ = ../../lib/libdvdcss.a ../../lib/libdvdcss.so
+
 ALL_OBJ = $(PLUGIN_DVD) $(BUILTIN_DVD)
 
 #
@@ -30,22 +32,27 @@ $(BUILTIN_DVD): BUILTIN_%.o: %.c
 # Real targets
 #
 
+# If we build our own libdvdcss
 ifeq (1,$(NEED_LIBDVDCSS))
-../dvd.so: libdvdcss $(PLUGIN_DVD)
-       $(CC) $(PCFLAGS) -o $@ $(PLUGIN_DVD) $(PLCFLAGS) $(LIB_DVD_PLUGIN)
+../dvd.so: $(LIBDVDCSS_OBJ) $(PLUGIN_DVD)
+       $(CC) -o $@ $(PLUGIN_DVD) $(PLCFLAGS) $(LIB_DVD_PLUGIN)
 
-../dvd.a: libdvdcss $(BUILTIN_DVD)
+../dvd.a: $(LIBDVDCSS_OBJ) $(BUILTIN_DVD)
        ar r $@ $(BUILTIN_DVD)
        $(RANLIB) $@
+
+# If we rely on an existing libdvdcss
 else
 ../dvd.so: $(PLUGIN_DVD)
-       $(CC) $(PCFLAGS) -o $@ $(PLUGIN_DVD) $(PLCFLAGS) $(LIB_DVD_PLUGIN)
+       $(CC) -o $@ $(PLUGIN_DVD) $(PLCFLAGS) $(LIB_DVD_PLUGIN)
 
 ../dvd.a: $(BUILTIN_DVD)
        ar r $@ $(BUILTIN_DVD)
        $(RANLIB) $@
 endif
 
+$(LIBDVDCSS_OBJ): libdvdcss
+
 libdvdcss:
-       cd ../../ && $(MAKE) libdvdcss
+       @cd ../../ && $(MAKE) libdvdcss
 

diff --git a/plugins/dvdread/Makefile b/plugins/dvdread/Makefile
index e284f0a76518a07f8956851068cff15cd5c557e5..a0d843580b25279d5961784998fcd5bc0be0f9dc 100644 (file)
--- a/plugins/dvdread/Makefile
+++ b/plugins/dvdread/Makefile
@@ -10,6 +10,9 @@
 PLUGIN_DVDREAD = dvdread.o input_dvdread.o $(OBJ_DVDREAD)
 BUILTIN_DVDREAD = $(PLUGIN_DVDREAD:%.o=BUILTIN_%.o)
 
+LIBDVDCSS_OBJ = ../../lib/libdvdcss.a ../../lib/libdvdcss.so
+LIBDVDREAD_OBJ = ../../lib/libdvdread.a ../../lib/libdvdread.so
+
 ALL_OBJ = $(PLUGIN_DVDREAD) $(BUILTIN_DVDREAD)
 
 #
@@ -31,23 +34,27 @@ $(BUILTIN_DVDREAD): BUILTIN_%.o: %.c
 #
 
 ifeq (1,$(NEED_LIBDVDCSS))
-../dvdread.so: libdvdcss libdvdread $(PLUGIN_DVDREAD)
-       $(CC) $(PCFLAGS) -o $@ $(PLUGIN_DVDREAD) $(PLCFLAGS) $(LIB_DVD_PLUGIN) $(LIB_DVDREAD_PLUGIN)
+../dvdread.so: $(LIBDVDCSS_OBJ) $(LIBDVDREAD_OBJ) $(PLUGIN_DVDREAD)
+       $(CC) -o $@ $(PLUGIN_DVDREAD) $(PLCFLAGS) $(LIB_DVD_PLUGIN) $(LIB_DVDREAD_PLUGIN)
 
-../dvdread.a: libdvdcss libdvdread $(BUILTIN_DVDREAD)
+../dvdread.a: $(LIBDVDCSS_OBJ) $(LIBDVDREAD_OBJ) $(BUILTIN_DVDREAD)
        ar r $@ $(BUILTIN_DVDREAD)
        $(RANLIB) $@
 else
-../dvdread.so: libdvdread $(PLUGIN_DVDREAD)
-       $(CC) $(PCFLAGS) -o $@ $(PLUGIN_DVD) $(PLCFLAGS) $(LIB_DVD_PLUGIN) $(LIB_DVDREAD_PLUGIN)
+../dvdread.so: $(LIBDVDREAD_OBJ) $(PLUGIN_DVDREAD)
+       $(CC) -o $@ $(PLUGIN_DVD) $(PLCFLAGS) $(LIB_DVD_PLUGIN) $(LIB_DVDREAD_PLUGIN)
 
-../dvdread.a: libdvdread $(BUILTIN_DVDREAD)
+../dvdread.a: $(LIBDVDREAD_OBJ) $(BUILTIN_DVDREAD)
        ar r $@ $(BUILTIN_DVDREAD)
        $(RANLIB) $@
 endif
 
+$(LIBDVDCSS_OBJ): libdvdcss
+
 libdvdcss:
-       cd ../../ && $(MAKE) libdvdcss
+       @cd ../../ && $(MAKE) libdvdcss
+
+$(LIBDVDREAD_OBJ): libdvdread
 
 libdvdread:
-       cd ../../ && $(MAKE) libdvdread
+       @cd ../../ && $(MAKE) libdvdread