Mercurial > forge
diff main/fixed/src/Makefile @ 4631:1b0a2d6110ca octave-forge
attempt at build fix for fixed package
author | adb014 |
---|---|
date | Thu, 27 Mar 2008 11:42:41 +0000 |
parents | c372fffc9fec |
children | 9de4481b4710 |
line wrap: on
line diff
--- a/main/fixed/src/Makefile Thu Mar 27 10:29:23 2008 +0000 +++ b/main/fixed/src/Makefile Thu Mar 27 11:42:41 2008 +0000 @@ -3,35 +3,18 @@ FIXEDVERTARGET = fixedversion.h FIXEDTARGET = fixed.oct -LIBPRE = lib -LIBEXT = dll -LIBIMPEXT = dll.a DLLDEF = -ISMS = ifneq (,$(findstring cygwin,$(canonical_host_type))) - OCT_INCLUDES_LIB = 1 - ISMS = 1 DLLDEF = -DFIXED_DLL - FIXEDIMPTARGET = $(LIBPRE)octave_fixed.$(LIBIMPEXT) - ADD_FLAGS = -Wl,--out-implib=$(FIXEDIMPTARGET) endif ifneq (,$(findstring mingw,$(canonical_host_type))) - OCT_INCLUDES_LIB = 1 - ISMS = 1 DLLDEF = -DFIXED_DLL - FIXEDIMPTARGET = $(LIBPRE)octave_fixed.$(LIBIMPEXT) - ADD_FLAGS = -Wl,--out-implib=$(FIXEDIMPTARGET) endif ifneq (,$(findstring msdosmsvc,$(canonical_host_type))) - OCT_INCLUDES_LIB = 1 - ISMS = 1 - LIBPRE = - LIBIMPEXT = lib DLLDEF = -DFIXED_DLL endif -ifeq (1,$(OCT_INCLUDES_LIB)) - FIXEDSOURCES = fixedColVector.cc fixedRowVector.cc \ +FIXEDSOURCES = fixedColVector.cc fixedRowVector.cc \ fixedMatrix.cc fixedComplex.cc fixedCColVector.cc fixedCRowVector.cc \ fixedCMatrix.cc Array-f.cc fixed-conv.cc ov-fixed.cc ov-fixed-mat.cc \ fixedNDArray.cc fixedCNDArray.cc \ @@ -41,46 +24,11 @@ op-fcs-fs.cc op-fcs-fm.cc op-fcm-fs.cc op-fcm-fm.cc \ op-fcs-fcs.cc op-fcs-fcm.cc op-fcm-fcs.cc op-fcm-fcm.cc \ fixed-var.cc fixed.cc - FIXEDOBJECTS = fixed-int.o $(patsubst %.cc,%.o,$(FIXEDSOURCES)) - FIXEDDEPENDS = fixed-int.d $(patsubst %.cc,%.d,$(FIXEDSOURCES)) - - TARGETS = $(FIXEDTARGET) - OBJECTS = $(FIXEDOBJECTS) +FIXEDOBJECTS = fixed-int.o $(patsubst %.cc,%.o,$(FIXEDSOURCES)) +FIXEDDEPENDS = fixed-int.d $(patsubst %.cc,%.d,$(FIXEDSOURCES)) - EXTRALIBS = -else - FIXEDLIBTARGET = $(LIBPRE)octave_fixed.$(LIBEXT) - FIXEDIMPTARGET = $(FIXEDLIBTARGET:.$(LIBEXT)=.$(LIBIMPEXT)) - FIXEDLIBSOURCES = fixedColVector.cc fixedRowVector.cc \ - fixedMatrix.cc fixedComplex.cc fixedCColVector.cc fixedCRowVector.cc \ - fixedCMatrix.cc Array-f.cc fixed-conv.cc ov-fixed.cc ov-fixed-mat.cc \ - fixedNDArray.cc fixedCNDArray.cc \ - ov-fixed-complex.cc ov-fixed-cx-mat.cc \ - op-fs-fs.cc op-fs-fm.cc op-fm-fs.cc op-fm-fm.cc \ - op-fs-fcs.cc op-fs-fcm.cc op-fm-fcs.cc op-fm-fcm.cc \ - op-fcs-fs.cc op-fcs-fm.cc op-fcm-fs.cc op-fcm-fm.cc \ - op-fcs-fcs.cc op-fcs-fcm.cc op-fcm-fcs.cc op-fcm-fcm.cc - FIXEDLIBOBJECTS = fixed-int.o $(patsubst %.cc,%.o,$(FIXEDLIBSOURCES)) - FIXEDLIBDEPENDS = fixed-int.d $(patsubst %.cc,%.d,$(FIXEDLIBSOURCES)) - - FIXEDSOURCES = fixed.cc fixed-var.cc - FIXEDOBJECTS = $(patsubst %.cc,%.o,$(FIXEDSOURCES)) - FIXEDDEPENDS = $(FIXEDLIBDEPENDS) $(patsubst %.cc,%.d,$(FIXEDSOURCES)) - - TARGETS = $(FIXEDLIBTARGET) $(FIXEDTARGET) - OBJECTS = $(FIXEDLIBOBJECTS) $(FIXEDOBJECTS) - - EXTRALIBS = -L./ -loctave_fixed - - ifeq (1,$(ISMS)) - # The name of this flag changed in version 2.1.54. Use both versions - # so that one of them will work. - MY_SH_LDFLAGS = $(shell $(MKOCTFILE) -p SH_LDFLAGS) \ - -Wl,--out-implib=$(FIXEDIMPTARGET) - MY_DL_LDFLAGS = $(shell $(MKOCTFILE) -p DL_LDFLAGS) \ - -Wl,--out-implib=$(FIXEDIMPTARGET) - endif -endif +TARGETS = $(FIXEDTARGET) +OBJECTS = $(FIXEDOBJECTS) ifeq ($(MAKECMDGOALS),all) DEPENDS = $(FIXEDDEPENDS) @@ -89,11 +37,11 @@ DEPENDS = $(FIXEDDEPENDS) endif -DELETES = $(OBJECTS) $(FIXEDDEPENDS) $(TARGETS) $(FIXEDIMPTARGET) \ - $(FIXEDVERTARGET) core octave-core *~ *.d-t int/fixed.o int/fixed.d \ +DELETES = $(OBJECTS) $(FIXEDDEPENDS) $(TARGETS) $(FIXEDVERTARGET) \ + core octave-core *~ *.d-t int/fixed.o int/fixed.d \ int/fixed.d-t FILES -DEFINES = -DOCTAVE_FORGE +DEFINES = -DOCTAVE_FORGE $(DLLDEF) MOFLAGS = .PHONY: all clean count @@ -115,34 +63,10 @@ install : @echo "Where exactly do you want me to install to!!!" else -ifeq (1,$(OCT_INCLUDES_LIB)) install : @$(INSTALL) -d $(DESTDIR)$(MPATH)/fixed $(FIXEDOBJECTS) $(FIXEDDEPENDS): DEFINES := $(DEFINES) $(DLLDEF) -else -install : - @$(INSTALL) -d $(DESTDIR)$(MPATH)/fixed; \ - if test ! -e $(bindir)/$(LIBPRE)octave.$(LIBEXT) ; then \ - echo "****** WARNING: $(FIXEDLIBTARGET) not correctly installed."; \ - echo "****** To ensure correct operation $(FIXEDLIBTARGET) should"; \ - echo "****** be in the same directory as $(LIBPRE)octave.$(LIBEXT)"; \ - fi; \ - $(INSTALL) $(FIXEDLIBTARGET) $(bindir); \ - if test ! -e $(libdir)/$(LIBPRE)octave.$(LIBIMPEXT) ; then \ - echo "****** WARNING: $(FIXEDIMPTARGET) not correctly installed"; \ - echo "****** To ensure correct operation $(FIXEDIMPTARGET)"; \ - echo "****** should be in the same directory as $(LIBPRE)octave.$(LIBIMPEXT)"; \ - fi; \ - $(INSTALL) $(FIXEDIMPTARGET) $(libdir); - -$(FIXEDLIBOBJECTS) $(FIXEDLIBDEPENDS): DEFINES := $(DEFINES) $(DLLDEF) - -$(FIXEDLIBTARGET): $(FIXEDLIBDEPENDS) $(FIXEDLIBOBJECTS) - @echo "Linking $@"; \ - $(RM) -f $@; \ - DL_LDFLAGS="$(MY_DL_LDFLAGS)" SH_LDFLAGS="$(MY_SH_LDFLAGS)" $(MKOCTFILE) -v -o $@ $(FIXEDLIBOBJECTS) -endif endif $(FIXEDTARGET) : $(DEPENDS) $(FIXEDOBJECTS)