Mercurial > forge

diff main/fixed/src/Makefile @ 3359:4f23e9c5957a octave-forge

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge octave_fixed.dll into fixed.oct to avoid installing files (DLL) outside of the normal package directory [Win32/MSVC]
author goffioul
date Wed, 23 May 2007 09:01:11 +0000
parents c9748be75a06
children 9d5056800caa
line wrap: on
line diff
--- a/main/fixed/src/Makefile	Wed May 23 05:16:14 2007 +0000
+++ b/main/fixed/src/Makefile	Wed May 23 09:01:11 2007 +0000
@@ -9,14 +9,15 @@
 DLLDEF =
 ifeq (,$(findstring cygwin,$(canonical_host_type)))
  ifeq (,$(findstring mingw,$(canonical_host_type)))
-   ifeq (,$(findstring msdosmsvc,$(canonical_host_type)))
+   ifneq (,$(findstring msdosmsvc,$(canonical_host_type)))
+    DLLDEF = -DFIXED_DLL
+   endif
    OCT_INCLUDES_LIB = 1
-   else
-     LIBPRE =
-     LIBIMPEXT = lib
-     DLLDEF = -DFIXED_DLL
-   endif
-  endif
+ else
+   LIBPRE =
+   LIBIMPEXT = lib
+   DLLDEF = -DFIXED_DLL
+ endif
 endif
 
 ifeq (1,$(OCT_INCLUDES_LIB))
@@ -105,6 +106,8 @@
 ifeq (1,$(OCT_INCLUDES_LIB))
 install : 
 	@$(INSTALL) -d $(DESTDIR)$(MPATH)/fixed
+
+$(FIXEDOBJECTS) $(FIXEDDEPENDS): DEFINES := $(DEFINES) $(DLLDEF)
 else
 install : 
 	@$(INSTALL) -d $(DESTDIR)$(MPATH)/fixed; \