diff src/Makefile.in @ 6796:59c0c3637633

[project @ 2007-07-25 15:45:04 by jwe]
author jwe
date Wed, 25 Jul 2007 15:45:06 +0000
parents b2391d403ed2
children 5b00586ccd27
line wrap: on
line diff
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -186,11 +186,13 @@
 
 SOURCES := $(DIST_SRC) $(OP_SRC) $(TI_SRC)
 
-EXTRAS := ov-base-int.cc ov-base-mat.cc ov-base-scalar.cc mxarray.h
+BUILT_EXTRAS := mxarray.h
+
+EXTRAS := ov-base-int.cc ov-base-mat.cc ov-base-scalar.cc
 
 EXTRA_OBJECTS := oct-errno.o octave.o builtins.o ops.o
 
-INCLUDES_FOR_INSTALL := $(INCLUDES) $(EXTRAS)
+INCLUDES_FOR_INSTALL := $(INCLUDES) $(EXTRAS) $(BUILT_EXTRAS)
 
 OBJECTS_4 := $(notdir $(SOURCES))
 OBJECTS_3 := $(patsubst %.l, %.o, $(OBJECTS_4))
@@ -254,11 +256,14 @@
    $(CAMD_LIBS) $(COLAMD_LIBS) $(CCOLAMD_LIBS) $(CXSPARSE_LIBS) $(BLAS_LIBS) \
    $(FFTW_LIBS) $(LIBS) $(FLIBS)
 
+BUILT_DISTFILES = DOCSTRINGS oct-gperf.h parse.cc lex.cc y.tab.h \
+	__gnuplot_raw__.cc \
+	$(OPT_HANDLERS) $(BUILT_EXTRAS)
+
 DISTFILES = Makefile.in ChangeLog mkdefs mkops mkgendoc \
-	DOCSTRINGS mkbuiltins mk-errno-list mk-pkg-add \
+	mkbuiltins mk-errno-list mk-pkg-add \
 	defaults.h.in mxarray.h.in oct-conf.h.in oct-errno.cc.in octave.gperf \
-	oct-gperf.h parse.cc lex.cc y.tab.h __gnuplot_raw__.cc \
-	$(INCLUDES) $(DIST_SRC) $(OPT_HANDLERS) $(EXTRAS)
+	$(INCLUDES) $(DIST_SRC) $(EXTRAS)
 
 all: octave$(EXEEXT) $(OCT_FILES) PKG_ADD DOCSTRINGS
 .PHONY: all
@@ -512,7 +517,8 @@
 .PHONY: maintainer-clean
 
 dist: parse.cc lex.cc oct-gperf.h
-	ln $(DISTFILES) ../`cat ../.fname`/src
+	ln $(addprefix $(srcdir)/,$(DISTFILES)) ../`cat ../.fname`/src
+	ln $(BUILT_DISTFILES) ../`cat ../.fname`/src
 	for f in DLD-FUNCTIONS OPERATORS TEMPLATE-INST; do \
 	  if [ -d ../`cat ../.fname`/src/$$f ]; then \
 	    true; \
@@ -520,16 +526,16 @@
 	    mkdir ../`cat ../.fname`/src/$$f; \
 	  fi; \
 	done
-	ln $(DLD_SRC) ../`cat ../.fname`/src/DLD-FUNCTIONS
-	ln $(OP_SRC) ../`cat ../.fname`/src/OPERATORS
-	ln $(OP_INCLUDES) ../`cat ../.fname`/src/OPERATORS
-	ln $(TI_SRC) ../`cat ../.fname`/src/TEMPLATE-INST
+	ln $(addprefix $(srcdir)/,$(DLD_SRC)) ../`cat ../.fname`/src/DLD-FUNCTIONS
+	ln $(addprefix $(srcdir)/,$(OP_SRC)) ../`cat ../.fname`/src/OPERATORS
+	ln $(addprefix $(srcdir)/,$(OP_INCLUDES)) ../`cat ../.fname`/src/OPERATORS
+	ln $(addprefix $(srcdir)/,$(TI_SRC)) ../`cat ../.fname`/src/TEMPLATE-INST
 	rm -f parse.cc lex.cc y.tab.h y.output yy.lex.c
 	rm -f oct-gperf.h defaults.h oct-conf.h *.d *.df builtins.cc
 .PHONY: dist
 
 conf-dist:
-	ln octave.cc Makefile.in ../`cat ../.fname`/src
+	ln $(addprefix $(srcdir)/,octave.cc Makefile.in) ../`cat ../.fname`/src
 .PHONY: conf-dist
 
 # Special rules -- these files need special things to be defined.