changeset 918:e50e8bfb90ed libavformat

Simplify LDFLAGS handling for MinGW.
author diego
date Sun, 29 Jan 2006 18:32:55 +0000
parents f1104ac8de95
children 7ac21a82ac29
files Makefile
diffstat 1 files changed, 6 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/Makefile	Thu Jan 26 23:42:30 2006 +0000
+++ b/Makefile	Sun Jan 29 18:32:55 2006 +0000
@@ -8,6 +8,11 @@
 
 CFLAGS=$(OPTFLAGS) -I.. -I$(SRC_PATH) -I$(SRC_PATH)/libavutil -I$(SRC_PATH)/libavcodec -DHAVE_AV_CONFIG_H -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_GNU_SOURCE
 
+#FIXME: This should be in configure/config.mak
+ifeq ($(CONFIG_WIN32),yes)
+    LDFLAGS=-Wl,--output-def,$(@:.dll=.def)
+endif
+
 OBJS= utils.o cutils.o os_support.o allformats.o
 PPOBJS=
 
@@ -106,11 +111,9 @@
 	$(RANLIB) $@
 
 $(SLIBNAME): $(OBJS)
+	$(CC) $(SHFLAGS) $(LDFLAGS) -o $@ $(OBJS) $(PPOBJS) $(AVCLIBS) $(EXTRALIBS)
 ifeq ($(CONFIG_WIN32),yes)
-	$(CC) $(SHFLAGS) -Wl,--output-def,$(@:.dll=.def) -o $@ $(OBJS) $(PPOBJS) $(AVCLIBS) $(EXTRALIBS)
 	-lib /machine:i386 /def:$(@:.dll=.def)
-else
-	$(CC) $(SHFLAGS) $(LDFLAGS) -o $@ $(OBJS) $(PPOBJS) $(AVCLIBS) $(EXTRALIBS)
 endif
 
 depend: $(SRCS)