diff options
| author | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2007-03-15 08:59:31 +0000 |
|---|---|---|
| committer | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2007-03-15 08:59:31 +0000 |
| commit | 5ed6b0aba90a90719a20be3e2f5c2180c43c4f8f (patch) | |
| tree | fc403f74756b10cda178e099421bee7da2e7a460 /libdha | |
| parent | caf8e251cd306bdc21c4f5a0556d4375f3d09f63 (diff) | |
| download | mpv-5ed6b0aba90a90719a20be3e2f5c2180c43c4f8f.tar.bz2 mpv-5ed6b0aba90a90719a20be3e2f5c2180c43c4f8f.tar.xz | |
Remove Cygwin case from conditional, it's overridden by the Win32 case.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22598 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libdha')
| -rw-r--r-- | libdha/Makefile | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/libdha/Makefile b/libdha/Makefile index f63d30c940..82b04e8f63 100644 --- a/libdha/Makefile +++ b/libdha/Makefile @@ -1,15 +1,16 @@ 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 @@ -39,16 +40,15 @@ ifneq ($(wildcard svgalib_helper),) CFLAGS += -DDEV_SVGA=\"/dev/svga\" -DCONFIG_SVGAHELPER -Isvgalib_helper/ endif -all: pci_names.c $(LIBNAME) +all: pci_names.c $(LIBS) -$(LIBNAME): $(OBJS_MPLAYER) -ifeq ($(TARGET_WIN32),yes) +$(LIBNAME_MPLAYER): $(OBJS_MPLAYER) $(AR) r $@ $^ -else + +$(LIBNAME_MPLAYER_SHARED): $(OBJS_MPLAYER) $(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 $< |