projects
/
ghc-hetmet.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
291813f
)
Unconditionalize definition of DYNAMIC_* so that libffi.so/.dll is removed even when...
author
Clemens Fruhwirth
<clemens@endorphin.org>
Tue, 30 Sep 2008 08:54:49 +0000
(08:54 +0000)
committer
Clemens Fruhwirth
<clemens@endorphin.org>
Tue, 30 Sep 2008 08:54:49 +0000
(08:54 +0000)
libffi/Makefile
patch
|
blob
|
history
diff --git
a/libffi/Makefile
b/libffi/Makefile
index
cfcec35
..
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.
# 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
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
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
ifeq "$(BuildSharedLibs)" "YES"
EnableShared=yes
@@
-61,8
+56,10
@@
else
EnableShared=no
endif
EnableShared=no
endif
+ifeq "$(BuildSharedLibs)" "YES"
INSTALL_LIBS += $(DYNAMIC_LIBS)
INSTALL_PROGS += $(DYNAMIC_PROGS)
INSTALL_LIBS += $(DYNAMIC_LIBS)
INSTALL_PROGS += $(DYNAMIC_PROGS)
+endif
install all :: $(INSTALL_HEADERS) $(INSTALL_LIBS) $(INSTALL_PROGS)
install all :: $(INSTALL_HEADERS) $(INSTALL_LIBS) $(INSTALL_PROGS)