Mercurial > mplayer.hg
changeset 22837:2e506e1c8d85
Build libdha statically like all the other libraries.
| author | diego |
|---|---|
| date | Sat, 31 Mar 2007 13:37:29 +0000 |
| parents | e547888c4413 |
| children | c13fe81f024c |
| files | Makefile libdha/Makefile |
| diffstat | 2 files changed, 6 insertions(+), 29 deletions(-) [+] |
line wrap: on
line diff
--- a/Makefile Sat Mar 31 13:35:42 2007 +0000 +++ b/Makefile Sat Mar 31 13:37:29 2007 +0000 @@ -213,10 +213,10 @@ tremor/libvorbisidec.a: $(MAKE) -C tremor -libdha/libdha.so: +libdha/libdha.a: $(MAKE) -C libdha -vidix/libvidix.a: libdha/libdha.so +vidix/libvidix.a: libdha/libdha.a $(MAKE) -C vidix $(MAKE) -C vidix/drivers @@ -298,7 +298,6 @@ $(INSTALL) -m 644 etc/mplayer.desktop $(prefix)/share/applications/ install-vidix: - $(MAKE) -C libdha install mkdir -p $(LIBDIR)/mplayer/vidix $(INSTALL) -m 755 $(INSTALLSTRIP) -p vidix/drivers/*.so $(LIBDIR)/mplayer/vidix @@ -315,7 +314,6 @@ $(MANDIR)/$$l/man1/gmplayer.1 ; \ fi ; \ done - $(MAKE) -C libdha uninstall rm -f $(LIBDIR)/mplayer/vidix/*.so -rmdir -p $(LIBDIR)/mplayer/vidix @@ -418,7 +416,7 @@ libfaad2/libfaad2.a: .norecurse $(wildcard libfaad2/*.[ch] libfaad2/*/*.[ch]) loader/libloader.a: .norecurse $(wildcard loader/*.[chSs]) -libdha/libdha.so: .norecurse $(wildcard libdha/*.[ch]) +libdha/libdha.a: .norecurse $(wildcard libdha/*.[ch]) vidix/libvidix.a: .norecurse $(wildcard vidix/*.[ch]) Gui/libgui.a: .norecurse $(wildcard Gui/*.[ch] Gui/*/*.[ch] Gui/*/*/*.[ch])
--- a/libdha/Makefile Sat Mar 31 13:35:42 2007 +0000 +++ b/libdha/Makefile Sat Mar 31 13:37:29 2007 +0000 @@ -1,34 +1,23 @@ include ../config.mak -MAJOR_VERSION = 1 -MINOR_VERSION = 0 -VERSION = $(MAJOR_VERSION).$(MINOR_VERSION) - -LIBNAME = libdha.so +LIBNAME_MPLAYER = libdha.a SRCS_MPLAYER = libdha.c \ mtrr.c \ pci.c \ pci_names.c \ -CFLAGS = -fPIC - # If you want libdha to use svgalib_helper for hardware access, # uncomment this statement, and change the -I to the correct directory # that includes svgalib_helper.o: #CFLAGS += -DDEV_SVGA=\"/dev/svga\" -DCONFIG_SVGAHELPER -Isvgalib_helper/ -all: $(LIBNAME) +libs: pci_names.c dep depend:: pci_names.c include ../mpcommon.mak -$(LIBNAME): $(OBJS_MPLAYER) - $(CC) -shared -Wl,-soname -Wl,$@ -o $@ $^ $(EXTRALIBS) - ln -sf $@ $@.$(VERSION) - ln -sf $@ $@.$(MAJOR_VERSION) - pci_names.c: oth/pci.db LC_ALL=C $(AWK) -f pci_db2c.awk $< @@ -36,14 +25,4 @@ $(CC) test.c -o $@ $^ clean:: - rm -f *.so *.so.* pci_*.c pci_*.h pci.db - -install: - -mkdir -p $(LIBDIR) - $(INSTALL) -m 755 $(INSTALLSTRIP) -p $(LIBNAME) $(LIBDIR)/$(LIBNAME) - ln -sf $(LIBNAME) $(LIBDIR)/$(LIBNAME).$(MAJOR_VERSION) - -$(LDCONFIG) - -uninstall: - rm -f $(LIBDIR)/$(LIBNAME) $(LIBDIR)/$(LIBNAME).$(MAJOR_VERSION) $(LIBDIR)/$(LIBNAME).$(VERSION) - -$(LDCONFIG) + rm -f pci_*.c pci_*.h pci.db