[MPlayer-cvslog] r26336 - in trunk: Makefile libmpcodecs/native/RTjpegN.c libmpcodecs/native/RTjpegN.h libmpcodecs/native/nuppelvideo.c libmpcodecs/native/rtjpegn.c libmpcodecs/native/rtjpegn.h libmpcodecs/ve_nuv.c

[diego]

Author: diego
Date: Sun Apr  6 20:17:59 2008
New Revision: 26336

Log:
Rename RTJPEG files so that filenames consist of lowercase name only.
Parts of the build system assume lowercase-only filenames.


Added:
   trunk/libmpcodecs/native/rtjpegn.c
      - copied, changed from r26335, /trunk/libmpcodecs/native/RTjpegN.c
   trunk/libmpcodecs/native/rtjpegn.h
      - copied unchanged from r26335, /trunk/libmpcodecs/native/RTjpegN.h
Removed:
   trunk/libmpcodecs/native/RTjpegN.c
   trunk/libmpcodecs/native/RTjpegN.h
Modified:
   trunk/Makefile
   trunk/libmpcodecs/native/nuppelvideo.c
   trunk/libmpcodecs/ve_nuv.c

Modified: trunk/Makefile
==============================================================================
--- trunk/Makefile	(original)
+++ trunk/Makefile	Sun Apr  6 20:17:59 2008
@@ -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)                += lib
 
 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
 
 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 lib
 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])

Modified: trunk/libmpcodecs/native/nuppelvideo.c
==============================================================================
--- trunk/libmpcodecs/native/nuppelvideo.c	(original)
+++ trunk/libmpcodecs/native/nuppelvideo.c	Sun Apr  6 20:17:59 2008
@@ -18,7 +18,7 @@
 #include "../libvo/fastmemcpy.h"
 
 #include "libmpdemux/nuppelvideo.h" 
-#include "RTjpegN.h"
+#include "rtjpegn.h"
 #include "libavutil/lzo.h"
 
 #define KEEP_BUFFER

Copied: trunk/libmpcodecs/native/rtjpegn.c (from r26335, /trunk/libmpcodecs/native/RTjpegN.c)
==============================================================================
--- /trunk/libmpcodecs/native/RTjpegN.c	(original)
+++ trunk/libmpcodecs/native/rtjpegn.c	Sun Apr  6 20:17:59 2008
@@ -31,7 +31,7 @@
 #endif
 
 #include "mpbswap.h"
-#include "RTjpegN.h"
+#include "rtjpegn.h"
 
 #ifdef MMX
 #include "mmx.h"

Modified: trunk/libmpcodecs/ve_nuv.c
==============================================================================
--- trunk/libmpcodecs/ve_nuv.c	(original)
+++ trunk/libmpcodecs/ve_nuv.c	Sun Apr  6 20:17:59 2008
@@ -21,7 +21,7 @@
 
 #include "libmpdemux/nuppelvideo.h"
 #include <lzo/lzo1x.h>
-#include "native/RTjpegN.h"
+#include "native/rtjpegn.h"
 
 #define LZO_AL(size) (((size) + (sizeof(long) - 1)) / sizeof(long))
 #define LZO_IN_LEN          (1024*1024L)