Unconditionalize definition of DYNAMIC_* so that libffi.so/.dll is removed even when...

[ghc-hetmet.git] / libffi / Makefile

diff --git a/libffi/Makefile b/libffi/Makefile
index d76ad52..f76c16d 100644 (file)
--- 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)
 
@@ -104,19 +101,9 @@ clean distclean maintainer-clean ::
 
 include $(TOP)/mk/target.mk
 
-binary-dist:
-       $(INSTALL_DIR)                         $(BIN_DIST_DIR)/libffi
-       $(INSTALL_DATA)    Makefile            $(BIN_DIST_DIR)/libffi/
-ifneq "$(HaveLibFFI)" "YES"
-       $(INSTALL_DATA)    $(BINDIST_STAMPS)   $(BIN_DIST_DIR)/libffi/
-  ifneq "$(INSTALL_PROGS)" ""
-       $(INSTALL_DATA)    $(INSTALL_PROGS)    $(BIN_DIST_DIR)/libffi/
-  endif
-  ifneq "$(INSTALL_LIBS)" ""
-       $(INSTALL_DATA)    $(INSTALL_LIBS)     $(BIN_DIST_DIR)/libffi/
-  endif
-  ifneq "$(INSTALL_HEADERS)" ""
-       $(INSTALL_HEADER)  $(INSTALL_HEADERS)  $(BIN_DIST_DIR)/libffi/
-  endif
-endif
+BINDIST_EXTRAS += $(BINDIST_STAMPS)
+BINDIST_EXTRAS += $(INSTALL_PROGS)
+BINDIST_EXTRAS += $(INSTALL_LIBS)
+BINDIST_EXTRAS += $(INSTALL_HEADERS)
+include $(TOP)/mk/bindist.mk