From 5bf5aebe9202b6aabe19d334b7657be6961ae91d Mon Sep 17 00:00:00 2001 From: diego Date: Thu, 15 Mar 2007 09:14:35 +0000 Subject: Use versioned names explicitly instead of employed backwards-named variables. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22602 b3059339-0415-0410-9bf9-f77b7e298cf2 --- libdha/Makefile | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) (limited to 'libdha') diff --git a/libdha/Makefile b/libdha/Makefile index ec7eab1deb..59ec7e5d38 100644 --- a/libdha/Makefile +++ b/libdha/Makefile @@ -4,12 +4,9 @@ MAJOR_VERSION = 1 MINOR_VERSION = 0 VERSION = $(MAJOR_VERSION).$(MINOR_VERSION) -LIBNAME = libdha.so.$(VERSION) -SHORTNAME = libdha.so.$(MAJOR_VERSION) -VSHORTNAME = libdha.so +LIBNAME = libdha.so ifeq ($(TARGET_WIN32),yes) LIBNAME = libdha.a -SHORTNAME = libdha.a endif SRCS_MPLAYER = libdha.c \ @@ -41,8 +38,8 @@ ifeq ($(TARGET_WIN32),yes) $(AR) r $@ $^ else $(CC) -shared -Wl,-soname -Wl,$@ -o $@ $^ $(EXTRALIBS) - ln -sf $@ $(SHORTNAME) - ln -sf $@ $(VSHORTNAME) + ln -sf $@ $@.$(VERSION) + ln -sf $@ $@.$(MAJOR_VERSION) endif pci_names.c: oth/pci.db @@ -63,11 +60,11 @@ dep depend: pci_names.c install: -mkdir -p $(LIBDIR) $(INSTALL) -m 755 $(INSTALLSTRIP) -p $(LIBNAME) $(LIBDIR)/$(LIBNAME) - ln -sf $(LIBNAME) $(LIBDIR)/$(SHORTNAME) + ln -sf $(LIBNAME) $(LIBDIR)/$(LIBNAME).$(MAJOR_VERSION) -$(LDCONFIG) uninstall: - rm -f $(LIBDIR)/libdha.so $(LIBDIR)/$(SHORTNAME) $(LIBDIR)/$(LIBNAME) + rm -f $(LIBDIR)/$(LIBNAME) $(LIBDIR)/$(LIBNAME).$(MAJOR_VERSION) $(LIBDIR)/$(LIBNAME).$(VERSION) -$(LDCONFIG) -include .depend -- cgit v1.2.3