From f4d87d3e88e4cb903d2440b2becb93dacbd81198 Mon Sep 17 00:00:00 2001 From: diego Date: Sun, 6 Apr 2008 18:17:59 +0000 Subject: Rename RTJPEG files so that filenames consist of lowercase name only. Parts of the build system assume lowercase-only filenames. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26336 b3059339-0415-0410-9bf9-f77b7e298cf2 --- Makefile | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 773e278de6..f373f18d22 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,10 +132,12 @@ PARTS = dvdread \ tremor \ vidix \ +DIRS = input \ all: $(ALL_PRG) -dep depend:: help_mp.h version.h codecs.conf.h +.depend: help_mp.h version.h codecs.conf.h +dep depend:: @for a in $(PARTS); do $(MAKE) -C $$a dep; done include mpcommon.mak @@ -216,9 +222,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 @@ -302,7 +305,8 @@ clean:: -rm -f mplayer$(EXESUF) mencoder$(EXESUF) codec-cfg$(EXESUF) \ 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 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 +384,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]) -- cgit v1.2.3