Mercurial > mplayer.hg

changeset 26308:51338bf153de

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Get rid of recursive make for the input/ subdirectory.
author diego
date Sun, 06 Apr 2008 23:09:06 +0000
parents ba4fc811a894
children 5a27681fb896
files Makefile input/Makefile
diffstat 2 files changed, 8 insertions(+), 16 deletions(-) [+]
line wrap: on
line diff
--- a/Makefile	Sun Apr 06 23:08:15 2008 +0000
+++ b/Makefile	Sun Apr 06 23:09:06 2008 +0000
@@ -43,6 +43,12 @@
                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 @@
 
 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 @@
 
 PARTS = dvdread \
         gui \
-        input \
         liba52 \
         libaf \
         libao2 \
@@ -128,6 +132,7 @@
         tremor \
         vidix \
 
+DIRS =  input \
 
 all:	$(ALL_PRG)
 
@@ -216,9 +221,6 @@
 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 @@
 	  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/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])
--- a/input/Makefile	Sun Apr 06 23:08:15 2008 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -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