summaryrefslogtreecommitdiff
path: root/src/libw32dll
diff options
context:
space:
mode:
authorDaniel Caujolle-Bert <f1rmb@users.sourceforge.net>2001-07-10 21:07:55 +0000
committerDaniel Caujolle-Bert <f1rmb@users.sourceforge.net>2001-07-10 21:07:55 +0000
commit4cc9fd313df701f722a81ad4bb551155415ce5cc (patch)
treecafd04a6191675accbc2d168192eee7169a6056b /src/libw32dll
parent9125c00c6d1242b911cbf68cdd25114cd9972c8f (diff)
downloadxine-lib-4cc9fd313df701f722a81ad4bb551155415ce5cc.tar.gz
xine-lib-4cc9fd313df701f722a81ad4bb551155415ce5cc.tar.bz2
Fixed get_dir in input plugins. Fixed a strange header inclusion bug
in libw32dll/wine. CVS patchset: 264 CVS date: 2001/07/10 21:07:55
Diffstat (limited to 'src/libw32dll')
-rw-r--r--src/libw32dll/Makefile.am6
-rw-r--r--src/libw32dll/wine/Makefile.am2
-rw-r--r--src/libw32dll/wine/config.h2
3 files changed, 5 insertions, 5 deletions
diff --git a/src/libw32dll/Makefile.am b/src/libw32dll/Makefile.am
index dc70ec334..5012c03f4 100644
--- a/src/libw32dll/Makefile.am
+++ b/src/libw32dll/Makefile.am
@@ -24,10 +24,10 @@ xineplug_decode_w32dll_la_LIBADD = $(top_builddir)/src/libw32dll/wine/libwine.la
noinst_HEADERS = w32codec.h
debug:
- list='$(SUBDIRS)'; for subdir in $$list; do \
- (cd $$subdir && $(MAKE) $@) \
+ @list='$(SUBDIRS)'; for subdir in $$list; do \
+ (cd $$subdir && $(MAKE) $@) || exit;\
done;
- $(MAKE) CFLAGS="$(DEBUG_CFLAGS)"
+ @$(MAKE) CFLAGS="$(DEBUG_CFLAGS)"
install-debug: debug
@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
diff --git a/src/libw32dll/wine/Makefile.am b/src/libw32dll/wine/Makefile.am
index f729a8187..a28aab089 100644
--- a/src/libw32dll/wine/Makefile.am
+++ b/src/libw32dll/wine/Makefile.am
@@ -34,7 +34,7 @@ stubs.lo: stubs.s
$(CC) -c $(top_srcdir)/src/libw32dll/wine/stubs.s -o stubs.lo
debug:
- $(MAKE) CFLAGS="$(DEBUG_CFLAGS)"
+ @$(MAKE) CFLAGS="$(DEBUG_CFLAGS)"
mostlyclean-generic:
-rm -f *~ \#* .*~ .\#*
diff --git a/src/libw32dll/wine/config.h b/src/libw32dll/wine/config.h
index f10850d9e..55a8c5ea6 100644
--- a/src/libw32dll/wine/config.h
+++ b/src/libw32dll/wine/config.h
@@ -3,7 +3,7 @@
* we need all these tests and checks in our
* configure.in
*/
-#if 1
+#if 0
#include "../../config.h"
#else