Mercurial > mplayer.hg
changeset 6625:54cfbaaf161b
remove unneded config files
| author | pontscho |
|---|---|
| date | Wed, 03 Jul 2002 08:55:26 +0000 |
| parents | 122efdee5b52 |
| children | 036948569977 |
| files | Gui/Makefile Gui/bitmap/Makefile Gui/bitmap/bitmap.mak Gui/gui.mak Gui/mplayer/Makefile Gui/mplayer/gtk/about.c Gui/mplayer/gtk/fs.c Gui/mplayer/gtk/opts.c Gui/skin/skin.c |
| diffstat | 9 files changed, 42 insertions(+), 207 deletions(-) [+] |
line wrap: on
line diff
--- a/Gui/Makefile Wed Jul 03 08:06:43 2002 +0000 +++ b/Gui/Makefile Wed Jul 03 08:55:26 2002 +0000 @@ -4,10 +4,6 @@ include ../config.mak include config.mak -include bitmap/bitmap.mak -MPLAYERDIR = mplayer/ -include gui.mak - INCDIR = -I. -I./event -I./wm -I./skin $(GTKINC) $(EXTRA_INC) OPTIMIZE = $(OPTFLAGS) -fomit-frame-pointer \ @@ -18,6 +14,13 @@ CFLAGS = $(OPTIMIZE) $(INCDIR) $(DEBUG) +SRCS = wm/ws.c wm/wsconv.c app.c events.c interface.c \ + bitmap/bitmap.c bitmap/tga/tga.c bitmap/bmp/bmp.c bitmap/png/png.c \ + skin/skin.c skin/font.c skin/cut.c \ + mplayer/mplayer.c mplayer/widgets.c mplayer/play.c \ + mplayer/gtk/menu.c mplayer/gtk/mb.c mplayer/gtk/about.c mplayer/gtk/pl.c mplayer/gtk/sb.c mplayer/gtk/fs.c mplayer/gtk/opts.c mplayer/gtk/url.c mplayer/gtk/eq.c +OBJS = $(SRCS:.c=.o) + .SUFFIXES: .c .o .c.o: @@ -26,14 +29,12 @@ ### TARGETS ### $(LIB): .depend $(OBJS) - $(MAKE) -C mplayer rm -f $(LIB) $(AR) rc $(LIB) $(OBJS) $(MPLAYEROBJS) all: $(LIB) clean: - $(MAKE) -C mplayer clean rm -rf $(OBJS) *.o *~ *.bak main $(PRG) $(LIB) .depend #dep: depend @@ -48,8 +49,7 @@ depend: .depend -.depend: Makefile config.mak gui.mak bitmap/bitmap.mak - $(MAKE) -C mplayer depend +.depend: Makefile config.mak $(CC) -MM $(CFLAGS) $(SRCS) 1>.depend #
--- a/Gui/bitmap/Makefile Wed Jul 03 08:06:43 2002 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,89 +0,0 @@ - -include ../config.mak - -SRCS = bitmap.c tga/tga.c jpeg/jpeg.c bmp/bmp.c -OBJS = bitmap.o tga/tga.o jpeg/jpeg.o bmp/bmp.o - -.SUFFIXES: .c .o - -.c.o: - $(CC) -c $(CFLAGS) -o $@ $< - -### TARGETS ### - -all: - @( [ -e $(JPEGLIB) ] || \ - make -C jpeg/jpeg-6b libjpeg.a ) -# ( make -C jpeg/jpeg-6b libjpeg.a && mv jpeg/jpeg-6b/libjpeg.a "$(JPEGLIB)" ) ) - $(MAKE) $(OBJS) - $(AR) rc libbitmap.a $(OBJS) jpeg/jpeg-6b/*.o - ranlib libbitmap.a - mv libbitmap.a ../libs - -#comp: -# $(MAKE) $(OBJS) - -clean: - $(MAKE) -C jpeg/jpeg-6b clean - -rm -rf $(OBJS) *.o *~ *.bak $(JPEGLIB) - -dep: depend - -depend: - makedepend -- $(CFLAGS) -- $(SRCS) &>/dev/null - -# DO NOT DELETE - -bitmap.o: /usr/include/stdlib.h /usr/include/features.h -bitmap.o: /usr/include/sys/cdefs.h /usr/include/gnu/stubs.h -bitmap.o: /usr/lib/gcc-lib/i386-linux/2.95.2/include/stddef.h -bitmap.o: /usr/include/sys/types.h /usr/include/bits/types.h -bitmap.o: /usr/include/time.h /usr/include/endian.h -bitmap.o: /usr/include/bits/endian.h /usr/include/sys/select.h -bitmap.o: /usr/include/bits/select.h /usr/include/bits/sigset.h -bitmap.o: /usr/include/sys/sysmacros.h /usr/include/alloca.h -bitmap.o: /usr/include/stdio.h -bitmap.o: /usr/lib/gcc-lib/i386-linux/2.95.2/include/stdarg.h -bitmap.o: /usr/include/libio.h /usr/include/_G_config.h -bitmap.o: /usr/include/bits/stdio_lim.h bitmap.h tga/tga.h bitmap.h -bitmap.o: jpeg/jpeg.h bmp/bmp.h -tga/tga.o: /usr/include/string.h /usr/include/features.h -tga/tga.o: /usr/include/sys/cdefs.h /usr/include/gnu/stubs.h -tga/tga.o: /usr/lib/gcc-lib/i386-linux/2.95.2/include/stddef.h -tga/tga.o: /usr/include/stdio.h -tga/tga.o: /usr/lib/gcc-lib/i386-linux/2.95.2/include/stdarg.h -tga/tga.o: /usr/include/bits/types.h /usr/include/libio.h -tga/tga.o: /usr/include/_G_config.h /usr/include/bits/stdio_lim.h -tga/tga.o: /usr/include/stdlib.h /usr/include/sys/types.h /usr/include/time.h -tga/tga.o: /usr/include/endian.h /usr/include/bits/endian.h -tga/tga.o: /usr/include/sys/select.h /usr/include/bits/select.h -tga/tga.o: /usr/include/bits/sigset.h /usr/include/sys/sysmacros.h -tga/tga.o: /usr/include/alloca.h tga/tga.h bitmap.h -jpeg/jpeg.o: /usr/include/setjmp.h /usr/include/features.h -jpeg/jpeg.o: /usr/include/sys/cdefs.h /usr/include/gnu/stubs.h -jpeg/jpeg.o: /usr/include/bits/setjmp.h /usr/include/bits/sigset.h -jpeg/jpeg.o: /usr/include/string.h -jpeg/jpeg.o: /usr/lib/gcc-lib/i386-linux/2.95.2/include/stddef.h -jpeg/jpeg.o: /usr/include/stdlib.h /usr/include/sys/types.h -jpeg/jpeg.o: /usr/include/bits/types.h /usr/include/time.h -jpeg/jpeg.o: /usr/include/endian.h /usr/include/bits/endian.h -jpeg/jpeg.o: /usr/include/sys/select.h /usr/include/bits/select.h -jpeg/jpeg.o: /usr/include/sys/sysmacros.h /usr/include/alloca.h -jpeg/jpeg.o: /usr/include/stdio.h -jpeg/jpeg.o: /usr/lib/gcc-lib/i386-linux/2.95.2/include/stdarg.h -jpeg/jpeg.o: /usr/include/libio.h /usr/include/_G_config.h -jpeg/jpeg.o: /usr/include/bits/stdio_lim.h jpeg/jpeg-6b/jpeglib.h -jpeg/jpeg.o: jpeg/jpeg-6b/jconfig.h jpeg/jpeg-6b/jmorecfg.h bitmap.h -jpeg/jpeg.o: jpeg/jpeg.h -bmp/bmp.o: /usr/include/stdlib.h /usr/include/features.h -bmp/bmp.o: /usr/include/sys/cdefs.h /usr/include/gnu/stubs.h -bmp/bmp.o: /usr/lib/gcc-lib/i386-linux/2.95.2/include/stddef.h -bmp/bmp.o: /usr/include/sys/types.h /usr/include/bits/types.h -bmp/bmp.o: /usr/include/time.h /usr/include/endian.h -bmp/bmp.o: /usr/include/bits/endian.h /usr/include/sys/select.h -bmp/bmp.o: /usr/include/bits/select.h /usr/include/bits/sigset.h -bmp/bmp.o: /usr/include/sys/sysmacros.h /usr/include/alloca.h -bmp/bmp.o: /usr/include/stdio.h -bmp/bmp.o: /usr/lib/gcc-lib/i386-linux/2.95.2/include/stdarg.h -bmp/bmp.o: /usr/include/libio.h /usr/include/_G_config.h -bmp/bmp.o: /usr/include/bits/stdio_lim.h bmp/bmp.h bitmap.h
--- a/Gui/bitmap/bitmap.mak Wed Jul 03 08:06:43 2002 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,13 +0,0 @@ - -BITMAPOBJS = \ -bitmap/bitmap.o \ -bitmap/tga/tga.o \ -bitmap/bmp/bmp.o \ -bitmap/png/png.o - - -BITMAPSRCS = \ -bitmap/bitmap.c \ -bitmap/tga/tga.c \ -bitmap/bmp/bmp.c \ -bitmap/png/png.c
--- a/Gui/gui.mak Wed Jul 03 08:06:43 2002 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,15 +0,0 @@ - -SKINSRC = skin/skin.c skin/font.c skin/cut.c -SKINOBJ = skin/skin.o skin/font.o skin/cut.o - -GTKSRCS = $(MPLAYERDIR)gtk/menu.c $(MPLAYERDIR)gtk/mb.c $(MPLAYERDIR)gtk/about.c \ - $(MPLAYERDIR)gtk/pl.c $(MPLAYERDIR)gtk/sb.c $(MPLAYERDIR)gtk/fs.c \ - $(MPLAYERDIR)gtk/opts.c $(MPLAYERDIR)gtk/url.c - -MPLAYERSRCS = $(MPLAYERDIR)mplayer.c $(MPLAYERDIR)widgets.c $(MPLAYERDIR)play.c \ - $(GTKSRCS) -MPLAYEROBJS = $(MPLAYERSRCS:.c=.o) - -SRCS = $(SKINSRC) $(BITMAPSRCS) wm/ws.c wm/wsconv.c app.c events.c interface.c -OBJS = $(SRCS:.c=.o) -
--- a/Gui/mplayer/Makefile Wed Jul 03 08:06:43 2002 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,48 +0,0 @@ - -include ../../config.mak -include ../config.mak - -include ../bitmap/bitmap.mak -include ../gui.mak - -LIB = mplayer - -INCDIR = -I. -I../event -I../wm -I../skin $(GTKINC) $(EXTRA_INC) - -OPTIMIZE = $(OPTFLAGS) -fomit-frame-pointer \ - -fexpensive-optimizations -fschedule-insns2 -Wall -ifeq ($(TARGET_ARCH_X86),yes) -OPTIMIZE += -malign-double -endif - -CFLAGS = $(OPTIMIZE) $(INCDIR) $(DEBUG) - -.SUFFIXES: .c .o - -.c.o: - $(CC) -c $(CFLAGS) -o $@ $< - -### TARGETS ### - -default: .depend $(MPLAYEROBJS) - -all: default - -clean: - rm -rf $(MPLAYEROBJS) *.o *~ *.bak .depend - -distclean: clean - -dep: depend - -depend: .depend - -.depend: Makefile ../config.mak ../gui.mak ../bitmap/bitmap.mak - $(CC) -MM $(CFLAGS) $(MPLAYERSRCS) 1>.depend - -# -# include dependency files if they exist -# -ifneq ($(wildcard .depend),) -include .depend -endif
--- a/Gui/mplayer/gtk/about.c Wed Jul 03 08:06:43 2002 +0000 +++ b/Gui/mplayer/gtk/about.c Wed Jul 03 08:55:26 2002 +0000 @@ -3,7 +3,7 @@ #include "../../../config.h" #include "../../../help_mp.h" -#include "pixmaps/about.xpm" +#include "mplayer/pixmaps/about.xpm" #include "../widgets.h" #include "about.h"
--- a/Gui/mplayer/gtk/fs.c Wed Jul 03 08:06:43 2002 +0000 +++ b/Gui/mplayer/gtk/fs.c Wed Jul 03 08:55:26 2002 +0000 @@ -6,11 +6,11 @@ #include <glob.h> #include <unistd.h> -#include "./mplayer.h" +#include "../mplayer.h" -#include "pixmaps/up.xpm" -#include "pixmaps/dir.xpm" -#include "pixmaps/file.xpm" +#include "mplayer/pixmaps/up.xpm" +#include "mplayer/pixmaps/dir.xpm" +#include "mplayer/pixmaps/file.xpm" #include "../../events.h" #include "../../interface.h"
--- a/Gui/mplayer/gtk/opts.c Wed Jul 03 08:06:43 2002 +0000 +++ b/Gui/mplayer/gtk/opts.c Wed Jul 03 08:55:26 2002 +0000 @@ -2,7 +2,7 @@ #include <stdlib.h> #include <stdio.h> -#include "./mplayer.h" +#include "../mplayer.h" #include "../../events.h" #include "../../../config.h"
--- a/Gui/skin/skin.c Wed Jul 03 08:06:43 2002 +0000 +++ b/Gui/skin/skin.c Wed Jul 03 08:55:26 2002 +0000 @@ -74,7 +74,7 @@ return i; } -int __section( char * in ) +int cmd_section( char * in ) { strlower( in ); defList=NULL; @@ -83,7 +83,7 @@ return 0; } -int __end( char * in ) +int cmd_end( char * in ) { if ( strlen( winList ) ) winList[0]=0; else defList=NULL; @@ -91,7 +91,7 @@ return 0; } -int __window( char * in ) +int cmd_window( char * in ) { CHECKDEFLIST( "window" ); @@ -101,7 +101,7 @@ return 0; } -int __base( char * in ) +int cmd_base( char * in ) { unsigned char fname[512]; unsigned char tmp[512]; @@ -188,7 +188,7 @@ return 0; } -int __background( char * in ) +int cmd_background( char * in ) { CHECKDEFLIST( "background" ); CHECKWINLIST( "background" ); @@ -203,7 +203,7 @@ return 0; } -int __button( char * in ) +int cmd_button( char * in ) { unsigned char fname[512]; unsigned char tmp[512]; @@ -246,7 +246,7 @@ return 0; } -int __selected( char * in ) +int cmd_selected( char * in ) { unsigned char fname[512]; unsigned char tmp[512]; @@ -265,7 +265,7 @@ return 0; } -int __menu( char * in ) +int cmd_menu( char * in ) { // menu = number,x,y,sx,sy,msg int x,y,sx,sy,msg; unsigned char tmp[64]; @@ -297,7 +297,7 @@ return 0; } -int __hpotmeter( char * in ) +int cmd_hpotmeter( char * in ) { // hpotmeter=buttonbitmaps,sx,sy,phasebitmaps,phases,default value,x,y,sx,sy,msg int x,y,psx,psy,ph,sx,sy,msg,d; unsigned char tmp[512]; @@ -354,7 +354,7 @@ return 0; } -int __potmeter( char * in ) +int cmd_potmeter( char * in ) { // potmeter=phasebitmaps,phases,default value,x,y,sx,sy,msg int x,y,ph,sx,sy,msg,d; unsigned char tmp[512]; @@ -397,7 +397,7 @@ return 0; } -int __font( char * in ) +int cmd_font( char * in ) { // font=fontname,fontid char name[512]; char id[512]; @@ -426,7 +426,7 @@ return 0; } -int __slabel( char * in ) +int cmd_slabel( char * in ) { char tmp[512]; char sid[63]; @@ -460,7 +460,7 @@ return 0; } -int __dlabel( char * in ) +int cmd_dlabel( char * in ) { // dlabel=x,y,sx,align,fontid,string ... char tmp[512]; char sid[63]; @@ -496,7 +496,7 @@ return 0; } -int __decoration( char * in ) +int cmd_decoration( char * in ) { char tmp[512]; @@ -521,20 +521,20 @@ _item skinItem[] = { - { "section", __section }, - { "end", __end }, - { "window", __window }, - { "base", __base }, - { "button", __button }, - { "selected", __selected }, - { "background", __background }, - { "hpotmeter", __hpotmeter }, - { "potmeter", __potmeter }, - { "font", __font }, - { "slabel", __slabel }, - { "dlabel", __dlabel }, - { "decoration", __decoration }, - { "menu", __menu } + { "section", cmd_section }, + { "end", cmd_end }, + { "window", cmd_window }, + { "base", cmd_base }, + { "button", cmd_button }, + { "selected", cmd_selected }, + { "background", cmd_background }, + { "hpotmeter", cmd_hpotmeter }, + { "potmeter", cmd_potmeter }, + { "font", cmd_font }, + { "slabel", cmd_slabel }, + { "dlabel", cmd_dlabel }, + { "decoration", cmd_decoration }, + { "menu", cmd_menu } }; #define ITEMS (int)( sizeof( skinItem )/sizeof( _item ) )