summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2008-04-06 23:09:06 +0000
committerdiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2008-04-06 23:09:06 +0000
commitc9b0ef9bca5cfe9380bed0ebfd45e61680a2fc96 (patch)
tree276c8e426667e0f8f28964ff7067f0c08a07caed
parent9087c4270b6a9c2806e8af0752566059b9e0aa0c (diff)
downloadmpv-c9b0ef9bca5cfe9380bed0ebfd45e61680a2fc96.tar.bz2
mpv-c9b0ef9bca5cfe9380bed0ebfd45e61680a2fc96.tar.xz
Get rid of recursive make for the input/ subdirectory.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26340 b3059339-0415-0410-9bf9-f77b7e298cf2
-rw-r--r--Makefile14
-rw-r--r--input/Makefile10
2 files changed, 8 insertions, 16 deletions
diff --git a/Makefile b/Makefile
index 773e278de6..0a4f87aa01 100644
--- a/Makefile
+++ b/Makefile
@@ -43,6 +43,12 @@ SRCS_MPLAYER = mplayer.c \
mixer.c \
parser-mpcmd.c \
command.c \
+ input/input.c \
+
+SRCS_MPLAYER-$(APPLE_REMOTE) += input/ar.c
+SRCS_MPLAYER-$(JOYSTICK) += input/joystick.c
+SRCS_MPLAYER-$(LIRC) += input/lirc.c
+
SRCS_MENCODER = mencoder.c \
mp_msg-mencoder.c \
@@ -72,7 +78,6 @@ COMMON_LIBS-$(ASS) += libass/libass.a
LIBS_MPLAYER = libvo/libvo.a \
libao2/libao2.a \
- input/libinput.a \
LIBS_MPLAYER-$(VIDIX) += vidix/libvidix.a
LIBS_MPLAYER-$(GUI) += gui/libgui.a
@@ -104,7 +109,6 @@ INSTALL_TARGETS += $(INSTALL_TARGETS-yes)
PARTS = dvdread \
gui \
- input \
liba52 \
libaf \
libao2 \
@@ -128,6 +132,7 @@ PARTS = dvdread \
tremor \
vidix \
+DIRS = input \
all: $(ALL_PRG)
@@ -216,9 +221,6 @@ osdep/libosdep.a:
osdep/mplayer-rc.o: version.h
$(MAKE) -C osdep mplayer-rc.o
-input/libinput.a:
- $(MAKE) -C input
-
libmenu/libmenu.a:
$(MAKE) -C libmenu
@@ -303,6 +305,7 @@ clean::
codecs2html$(EXESUF) codec-cfg-test$(EXESUF) cpuinfo$(EXESUF) \
codecs.conf.h help_mp.h version.h TAGS tags
@for a in $(PARTS); do $(MAKE) -C $$a clean; done
+ for dir in $(DIRS); do rm -f $$dir/*.o $$dir/*.a $$dir/*.ho $$dir/*~ ; done
distclean:: doxygen_clean
@for a in $(PARTS); do $(MAKE) -C $$a distclean; done
@@ -380,7 +383,6 @@ libvo/libvo.a: .norecurse $(wildcard libvo/*.[ch])
libvo/libosd.a: .norecurse $(wildcard libvo/*.[ch])
libao2/libao2.a: .norecurse $(wildcard libao2/*.[ch])
osdep/libosdep.a: .norecurse $(wildcard osdep/*.[ch])
-input/libinput.a: .norecurse $(wildcard input/*.[ch])
libmenu/libmenu.a: .norecurse $(wildcard libmenu/*.[ch])
libaf/libaf.a: .norecurse $(wildcard libaf/*.[ch])
diff --git a/input/Makefile b/input/Makefile
deleted file mode 100644
index 364d73641d..0000000000
--- a/input/Makefile
+++ /dev/null
@@ -1,10 +0,0 @@
-include ../config.mak
-
-LIBNAME_MPLAYER = libinput.a
-
-SRCS_MPLAYER = input.c
-SRCS_MPLAYER-$(APPLE_REMOTE) += ar.c
-SRCS_MPLAYER-$(JOYSTICK) += joystick.c
-SRCS_MPLAYER-$(LIRC) += lirc.c
-
-include ../mpcommon.mak