From a5605c305ff873306ba0c495216736949fbf497b Mon Sep 17 00:00:00 2001 From: Clemens Fruhwirth Date: Tue, 30 Sep 2008 08:54:49 +0000 Subject: [PATCH] Unconditionalize definition of DYNAMIC_* so that libffi.so/.dll is removed even when BuildSharedLibs is reset to NO --- libffi/Makefile | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/libffi/Makefile b/libffi/Makefile index cfcec35..f76c16d 100644 --- a/libffi/Makefile +++ b/libffi/Makefile @@ -41,7 +41,6 @@ INSTALL_LIBS += $(STATIC_LIB) # We have to add the GHC version to the name of our dynamic libs, because # they will be residing in the system location along with dynamic libs from # other GHC installations. -ifeq "$(BuildSharedLibs)" "YES" ifeq "$(Windows)" "YES" DYNAMIC_PROG = libffi.dll.a DYNAMIC_LIBS = libffi-3.dll @@ -50,10 +49,6 @@ else DYNAMIC_PROG = DYNAMIC_LIBS = libffi.so libffi.so.5 libffi.so.5.0.5 endif -else -DYNAMIC_PROG = -DYNAMIC_LIBS = -endif ifeq "$(BuildSharedLibs)" "YES" EnableShared=yes @@ -61,8 +56,10 @@ else EnableShared=no endif +ifeq "$(BuildSharedLibs)" "YES" INSTALL_LIBS += $(DYNAMIC_LIBS) INSTALL_PROGS += $(DYNAMIC_PROGS) +endif install all :: $(INSTALL_HEADERS) $(INSTALL_LIBS) $(INSTALL_PROGS) -- 1.7.10.4