Author: diego Date: Thu Mar 15 10:04:11 2007 New Revision: 22599 Modified: trunk/libdha/Makefile Log: Revert previous broken commit. Modified: trunk/libdha/Makefile ============================================================================== --- trunk/libdha/Makefile (original) +++ trunk/libdha/Makefile Thu Mar 15 10:04:11 2007 @@ -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 $<