Mercurial > mplayer.hg

changeset 22581:7b9862d425a6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Revert previous broken commit.
author diego
date Thu, 15 Mar 2007 09:04:11 +0000
parents b9a351d95340
children ea58da0ae02e
files libdha/Makefile
diffstat 1 files changed, 9 insertions(+), 9 deletions(-) [+]
line wrap: on
line diff
--- a/libdha/Makefile	Thu Mar 15 08:59:31 2007 +0000
+++ b/libdha/Makefile	Thu Mar 15 09:04:11 2007 +0000
@@ -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 @@
 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 $<