diff options
| -rw-r--r-- | Makefile | 9 | ||||
| -rw-r--r-- | vidix/Makefile | 15 | ||||
| -rw-r--r-- | vidix/drivers/Makefile | 28 |
3 files changed, 14 insertions, 38 deletions
@@ -110,7 +110,6 @@ MENCODER_DEPS = $(OBJS_MENCODER) $(OBJS_COMMON) $(LIBS_MENCODER) $(COMMON_LIBS) INSTALL_TARGETS-$(MPLAYER) += install-mplayer install-mplayer-man INSTALL_TARGETS-$(MENCODER) += install-mencoder install-mplayer-man INSTALL_TARGETS-$(GUI) += install-gui -INSTALL_TARGETS-$(VIDIX) += install-vidix INSTALL_TARGETS += $(INSTALL_TARGETS-yes) PARTS = libmpdemux \ @@ -137,7 +136,6 @@ PARTS = libmpdemux \ tremor \ libdha \ vidix \ - vidix/drivers \ dvdread \ libdvdcss \ libass \ @@ -218,7 +216,6 @@ libdha/libdha.a: vidix/libvidix.a: libdha/libdha.a $(MAKE) -C vidix - $(MAKE) -C vidix/drivers Gui/libgui.a: $(MAKE) -C Gui @@ -297,10 +294,6 @@ install-gui: $(INSTALL) -d $(prefix)/share/applications $(INSTALL) -m 644 etc/mplayer.desktop $(prefix)/share/applications/ -install-vidix: - mkdir -p $(LIBDIR)/mplayer/vidix - $(INSTALL) -m 755 $(INSTALLSTRIP) -p vidix/drivers/*.so $(LIBDIR)/mplayer/vidix - uninstall: -rm -f $(BINDIR)/mplayer$(EXESUF) $(BINDIR)/gmplayer$(EXESUF) -rm -f $(BINDIR)/mencoder$(EXESUF) @@ -314,8 +307,6 @@ uninstall: $(MANDIR)/$$l/man1/gmplayer.1 ; \ fi ; \ done - rm -f $(LIBDIR)/mplayer/vidix/*.so - -rmdir -p $(LIBDIR)/mplayer/vidix dep depend: help_mp.h version.h codecs.conf.h $(CC) -MM $(CFLAGS) $(SRCS_MPLAYER) $(SRCS_MENCODER) $(SRCS_COMMON) 1>.depend diff --git a/vidix/Makefile b/vidix/Makefile index a73b4f4e1a..0ee4a8875d 100644 --- a/vidix/Makefile +++ b/vidix/Makefile @@ -2,6 +2,19 @@ include ../config.mak LIBNAME_MPLAYER = libvidix.a -SRCS_MPLAYER = vidixlib.c +SRCS_MPLAYER = vidixlib.c \ + $(wildcard drivers/*.c) + +OBJS_MPLAYER = drivers/mga_crtc2_vid.o \ + drivers/rage128_vid.o \ include ../mpcommon.mak + +drivers/mga_crtc2_vid.o: drivers/mga_vid.c + $(CC) -c $(CFLAGS) -DCRTC2 -o $@ $< + +drivers/rage128_vid.o: drivers/radeon_vid.c + $(CC) -c $(CFLAGS) -DRAGE128 -o $@ $< + +clean:: + rm -f drivers/*.o drivers/*~ diff --git a/vidix/drivers/Makefile b/vidix/drivers/Makefile deleted file mode 100644 index a41eacb3b1..0000000000 --- a/vidix/drivers/Makefile +++ /dev/null @@ -1,28 +0,0 @@ -include ../../config.mak - -SRCS_MPLAYER = $(wildcard *.c) -VIDIX_LIBS = -L../../libdha -ldha -CFLAGS = -fPIC - -libs: cyberblade_vid.so radeon_vid.so rage128_vid.so mach64_vid.so \ - nvidia_vid.so mga_vid.so mga_crtc2_vid.so pm3_vid.so \ - sis_vid.so unichrome_vid.so savage_vid.so - -%.so: %.o - $(CC) -shared $^ $(VIDIX_LIBS) -Wl,-soname,$@ -o $@ - -mga_crtc2_vid.o: mga_vid.c - $(CC) -c $(CFLAGS) -DCRTC2 -o $@ $< - -rage128_vid.o: radeon_vid.c - $(CC) -c $(CFLAGS) -DRAGE128 -o $@ $< - -sis_vid.so: sis_vid.o sis_bridge.o - -cyberblade_vid.so nvidia_vid.so mga_vid.so mga_crtc2_vid.so unichrome_vid.so \ -savage_vid.so: VIDIX_LIBS += -lm - -include ../../mpcommon.mak - -clean:: - rm -f *.so |