[MPlayer-cvslog] r22598 - trunk/libdha/Makefile

[diego]

Author: diego
Date: Thu Mar 15 09:59:31 2007
New Revision: 22598

Modified:
   trunk/libdha/Makefile

Log:
Remove Cygwin case from conditional, it's overridden by the Win32 case.


Modified: trunk/libdha/Makefile
==============================================================================
--- trunk/libdha/Makefile	(original)
+++ trunk/libdha/Makefile	Thu Mar 15 09:59:31 2007
@@ -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 $<