summaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authordiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2006-11-25 00:31:07 +0000
committerdiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2006-11-25 00:31:07 +0000
commit58a9204e797cf9061ceac3c8ed49c5185ea2ee6b (patch)
tree80e63fe2b8cc17c429cd8527de46e42fdabf9faa /Makefile
parentcd18aec18a66890d8a07e0f996eb3e323797744e (diff)
downloadmpv-58a9204e797cf9061ceac3c8ed49c5185ea2ee6b.tar.bz2
mpv-58a9204e797cf9061ceac3c8ed49c5185ea2ee6b.tar.xz
Make loader Makefile non-recursive.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21201 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile13
1 files changed, 2 insertions, 11 deletions
diff --git a/Makefile b/Makefile
index c4b223ab15..fe377f5cfc 100644
--- a/Makefile
+++ b/Makefile
@@ -107,8 +107,8 @@ COMMON_LIBS += libpostproc/libpostproc.a
PARTS += libpostproc
endif
ifeq ($(WIN32DLL),yes)
-COMMON_LIBS += loader/libloader.a loader/dshow/libDS_Filter.a loader/dmo/libDMO_Filter.a
-PARTS += loader loader/dshow loader/dmo
+COMMON_LIBS += loader/libloader.a
+PARTS += loader
endif
ifeq ($(MP3LIB),yes)
COMMON_LIBS += mp3lib/libMP3.a
@@ -205,12 +205,6 @@ stream/stream.a:
libmpcodecs/libmpcodecs.a:
$(MAKE) -C libmpcodecs
-loader/dshow/libDS_Filter.a:
- $(MAKE) -C loader/dshow
-
-loader/dmo/libDMO_Filter.a:
- $(MAKE) -C loader/dmo
-
libavutil/libavutil.a:
$(MAKE) -C libavutil LIBPREF=lib LIBSUF=.a
@@ -445,9 +439,6 @@ mp3lib/libMP3.a: .norecurse $(wildcard mp3lib/*.[ch])
libfaad2/libfaad2.a: .norecurse $(wildcard libfaad2/*.[ch] libfaad2/*/*.[ch])
loader/libloader.a: .norecurse $(wildcard loader/*.[chSs])
-loader/dmo/libDMO_Filter.a: .norecurse $(wildcard loader/dmo/*.[ch])
-loader/dshow/libDS_Filter.a: .norecurse $(wildcard loader/dshow/*.[ch])
-
libdha/libdha.so: .norecurse $(wildcard libdha/*.[ch])
vidix/libvidix.a: .norecurse $(wildcard vidix/*.[ch])
Gui/libgui.a: .norecurse $(wildcard Gui/*.[ch] Gui/*/*.[ch] Gui/*/*/*.[ch])