summaryrefslogtreecommitdiffstats
path: root/vidix
diff options
context:
space:
mode:
Diffstat (limited to 'vidix')
-rw-r--r--vidix/Makefile15
-rw-r--r--vidix/drivers/Makefile28
2 files changed, 14 insertions, 29 deletions
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