diff options
| author |  diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2007-03-15 09:04:11 +0000 |
|---|---|---|
| committer | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2007-03-15 09:04:11 +0000 |
| commit | a6dd4af10d0493e4dfe6ad101d72e5c24c1a2a7f (patch) | |
| tree | 092516bb7aea21c68218ef86a04def07fd19aa81 | |
| parent | 5ed6b0aba90a90719a20be3e2f5c2180c43c4f8f (diff) | |
Revert previous broken commit.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22599 b3059339-0415-0410-9bf9-f77b7e298cf2
| -rw-r--r-- | libdha/Makefile | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/libdha/Makefile b/libdha/Makefile index 82b04e8f63..f63d30c940 100644 --- a/libdha/Makefile +++ b/libdha/Makefile @@ -1,16 +1,15 @@ include ../config.mak -LIBNAME_MPLAYER = lidha.a -LIBNAME_MPLAYER_SHARED = lidha.so - -LIBS = $(LIBNAME_MPLAYER_SHARED) - MAJOR_VERSION = 1 MINOR_VERSION = 0 VERSION = $(MAJOR_VERSION).$(MINOR_VERSION) +ifeq ($(TARGET_OS),CYGWIN) +SHORTNAME = libdha.dll +else SHORTNAME = libdha.so.$(MAJOR_VERSION) VSHORTNAME = libdha.so +endif ifeq ($(TARGET_WIN32),yes) LIBNAME = libdha.a SHORTNAME = libdha.a @@ -40,15 +39,16 @@ ifneq ($(wildcard svgalib_helper),) CFLAGS += -DDEV_SVGA=\"/dev/svga\" -DCONFIG_SVGAHELPER -Isvgalib_helper/ endif -all: pci_names.c $(LIBS) +all: pci_names.c $(LIBNAME) -$(LIBNAME_MPLAYER): $(OBJS_MPLAYER) +$(LIBNAME): $(OBJS_MPLAYER) +ifeq ($(TARGET_WIN32),yes) $(AR) r $@ $^ - -$(LIBNAME_MPLAYER_SHARED): $(OBJS_MPLAYER) +else $(CC) -shared -Wl,-soname -Wl,$@ -o $@ $^ $(EXTRALIBS) ln -sf $@ $(SHORTNAME) ln -sf $@ $(VSHORTNAME) +endif pci_names.c: oth/pci.db LC_ALL=C $(AWK) -f pci_db2c.awk $< |