diff options
| author | Clemens Fruhwirth <clemens@endorphin.org> | 2008-09-30 08:54:49 +0000 |
|---|---|---|
| committer | Clemens Fruhwirth <clemens@endorphin.org> | 2008-09-30 08:54:49 +0000 |
| commit | a5605c305ff873306ba0c495216736949fbf497b (patch) | |
| tree | 364050a2200376533b614ffb1c1e7d2dadfe261e /libffi | |
| parent | 291813f135a24ee6b48c1d9ddcbac9836cd17296 (diff) | |
| download | haskell-a5605c305ff873306ba0c495216736949fbf497b.tar.gz | |
Unconditionalize definition of DYNAMIC_* so that libffi.so/.dll is removed even when BuildSharedLibs is reset to NO
Diffstat (limited to 'libffi')
| -rw-r--r-- | libffi/Makefile | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/libffi/Makefile b/libffi/Makefile index cfcec35a1b..f76c16d17c 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) |