Mercurial > hg > octave-lyh
changeset 6488:a3152d296248
[project @ 2007-04-04 16:10:26 by jwe]
| author | jwe |
|---|---|
| date | Wed, 04 Apr 2007 16:10:26 +0000 |
| parents | ef5113474882 |
| children | 39eb39d67dd8 |
| files | libcruft/ChangeLog libcruft/Makefile.in libcruft/Makerules.in libcruft/misc/Makefile.in test/ChangeLog test/Makefile.in |
| diffstat | 6 files changed, 69 insertions(+), 39 deletions(-) [+] |
line wrap: on
line diff
--- a/libcruft/ChangeLog +++ b/libcruft/ChangeLog @@ -1,3 +1,15 @@ +2007-04-04 John W. Eaton <jwe@octave.org> + + * Makefules.in: Handle Fortran, C, and C++ sources with separate + variables. + * misc/Makefile.in: Use new variables for Fortran, C, and C++ files. + * Makefile.in (clean mostlyclean distclean): No need to remove + $(CRUFT_OBJ) here. + +2007-04-04 Rafael Laboissiere <rafael@debian.org> + + * Makefile.in (clean): Remove mkf77def. + 2007-03-27 John W. Eaton <jwe@octave.org> * Makerules.in, Makefile.in (dist): Use ln instead of $(LN_S).
--- a/libcruft/Makefile.in +++ b/libcruft/Makefile.in @@ -174,9 +174,9 @@ etags $(SOURCES) clean mostlyclean distclean:: - rm -f $(LIBPRE)cruft.$(LIBEXT) $(CRUFT_OBJ) + rm -f $(LIBPRE)cruft.$(LIBEXT) rm -f $(LIBPRE)cruft.$(SHLEXT_VER) $(LIBPRE)cruft.$(SHLEXT) - rm -f $(CRUFT_DEFS) cruft.def + rm -f $(CRUFT_DEFS) cruft.def mkf77def distclean maintainer-clean:: rm -f Makefile Makerules so_locations
--- a/libcruft/Makerules.in +++ b/libcruft/Makerules.in @@ -18,35 +18,63 @@ CRUFT_CXXSRC = $(addprefix $(srcdir)/, $(CXXSRC)) CRUFT_SRC = $(CRUFT_FSRC) $(CRUFT_CSRC) $(CRUFT_CXXSRC) -CRUFT_BASE = $(basename $(notdir $(CRUFT_SRC)) ) -CRUFT_OBJ = $(addsuffix .o, $(CRUFT_BASE) ) -CRUFT_DEFS = $(patsubst %.f, %.def, $(notdir $(CRUFT_FSRC))) + +CRUFT_FBASE = $(basename $(notdir $(CRUFT_FSRC))) +CRUFT_CBASE = $(basename $(notdir $(CRUFT_CSRC))) +CRUFT_CXXBASE = $(basename $(notdir $(CRUFT_CXXSRC))) + +CRUFT_BASE = $(CRUFT_FBASE) $(CRUFT_CBASE) $(CRUFT_CXXBASE) + +CRUFT_FOBJ = $(addsuffix .o, $(CRUFT_FBASE) ) +CRUFT_COBJ = $(addsuffix .o, $(CRUFT_CBASE) ) +CRUFT_CXXOBJ = $(addsuffix .o, $(CRUFT_CXXBASE) ) + +CRUFT_OBJ = $(CRUFT_FOBJ) $(CRUFT_COBJ) $(CRUFT_CXXOBJ) + +CRUFT_FDEFS = $(patsubst %.f, %.def, $(notdir $(CRUFT_FSRC))) +CRUFT_CDEFS = $(patsubst %.c, %.def, $(notdir $(CRUFT_CSRC))) +CRUFT_CXXDEFS = $(patsubst %.cc, %.def, $(notdir $(CRUFT_CXXSRC))) + +CRUFT_DEFS = $(CRUFT_FDEFS) $(CRUFT_CDEFS) $(CRUFT_CXXDEFS) DISTFILES = Makefile.in $(CRUFT_SRC) $(SPECIAL) ifeq ($(SHARED_LIBS), true) ifdef FPICFLAG - CRUFT_PICOBJ := $(addprefix pic/, $(CRUFT_OBJ)) + CRUFT_FPICOBJ := $(addprefix pic/, $(CRUFT_FOBJ)) + else + CRUFT_FPICOBJ := $(CRUFT_FOBJ) + endif + ifdef CPICFLAG + CRUFT_CPICOBJ := $(addprefix pic/, $(CRUFT_COBJ)) else - CRUFT_PICOBJ := $(CRUFT_OBJ) + CRUFT_CPICOBJ := $(CRUFT_COBJ) endif + ifdef CXXPICFLAG + CRUFT_CXXPICOBJ := $(addprefix pic/, $(CRUFT_CXXOBJ)) + else + CRUFT_CXXPICOBJ := $(CRUFT_CXXOBJ) + endif + CRUFT_PICOBJ := $(CRUFT_FPICOBJ) $(CRUFT_CPICOBJ) $(CRUFT_CXXPICOBJ) endif CWD = $(shell pwd) THISDIR = $(notdir $(CWD)) -LIBCRUFT_OBJS = $(CRUFT_OBJ) $(SPECIAL_DEPEND) - ifeq ($(STATIC_LIBS), true) - LIBCRUFT_DEPEND := $(LIBCRUFT_OBJS) + LIBCRUFT_DEPEND := $(CRUFT_OBJ) +.PRECIOUS: $(CRUFT_OBJ) endif -all: pic $(CRUFT_DEFS) $(LIBCRUFT_DEPEND) $(CRUFT_PICOBJ) $(SPECIAL_PICDEPEND) +ifeq ($(SHARED_LIBS), true) + LIBCRUFT_PICDEPEND := $(CRUFT_PICOBJ) +.PRECIOUS: $(CRUFT_PICOBJ) +endif + +all: pic $(CRUFT_DEFS) $(LIBCRUFT_DEPEND) $(LIBCRUFT_PICDEPEND) @echo "warning: run make in parent directory to update libraries" .PHONY: all -.PRECIOUS: $(LIBCRUFT_OBJS) - stmp-pic: pic @if [ -f stmp-pic ]; then \ true; \
--- a/libcruft/misc/Makefile.in +++ b/libcruft/misc/Makefile.in @@ -12,41 +12,26 @@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ -SPECIAL_SRC := machar.c f77-extern.cc f77-fcn.c lo-error.c cquit.c quit.cc - -DEP_1 := $(patsubst %.c, %.d, $(SPECIAL_SRC)) -MAKEDEPS := $(patsubst %.cc, %.d, $(DEP_1)) - -SPECIAL_INCLUDE := f77-fcn.h lo-error.h oct-dlldefs.h quit.h - -SPECIAL:= d1mach-tst.for $(SPECIAL_SRC) $(SPECIAL_INCLUDE) - -SPECIAL_DEPEND := machar.o f77-extern.o f77-fcn.o lo-error.o cquit.o quit.o - EXTERNAL_DISTFILES = $(DISTFILES) FSRC = d1mach.f i1mach.f +CSRC = machar.c f77-fcn.c lo-error.c cquit.c + +CXXSRC = f77-extern.cc quit.cc + +MAKEDEPS := $(patsubst %.c, %.d, $(CSRC)) $(patsubst %.cc, %.d, $(CXXSRC)) + +INCLUDES := f77-fcn.h lo-error.h oct-dlldefs.h quit.h + +SPECIAL:= d1mach-tst.for $(INCLUDES) + include $(TOPDIR)/Makeconf INSTALL = @INSTALL@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_DATA = @INSTALL_DATA@ -INCLUDES := f77-fcn.h lo-error.h oct-dlldefs.h quit.h - -ifeq ($(SHARED_LIBS), true) - CPICDEP = machar.o f77-fcn.o lo-error.o cquit.o - ifdef CPICFLAG - CPICDEP := $(addprefix pic/, $(CPICDEP)) - endif - CXXPICDEP := f77-extern.o quit.o - ifdef CXXPICFLAG - CXXPICDEP := $(addprefix pic/, $(CXXPICDEP)) - endif - SPECIAL_PICDEPEND := $(CPICDEP) $(CXXPICDEP) -endif - include ../Makerules install install-strip::