Mercurial > hg > octave-nkf

changeset 12720:ccfe03bebeba stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
src/Makefile.am: Fixes to get 'make dist' working * src/Makefile.am: Remove ALL .df files when using clean rule. Clean BUILT_NODISTFILES under distclean rule, not clean rule. Fix rule to build OPT_INC headers.
author Rik <octave@nomad.inbox5.com>
date Wed, 08 Jun 2011 17:41:45 -0700
parents 7b5bfd6a8e28
children 65faec78a5b3
files src/Makefile.am
diffstat 1 files changed, 5 insertions(+), 12 deletions(-) [+]
line wrap: on
line diff
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -65,7 +65,7 @@
   version.h \
   $(OPT_HANDLERS) \
   $(OPT_INC) \
-  $(DEF_FILES) \
+  $(ALL_DEF_FILES) \
   builtins.cc
 
 EXTRA_DIST = \
@@ -92,7 +92,7 @@
 DLL_CDEFS = @OCTINTERP_DLL_DEFS@
 DLL_CXXDEFS = @OCTINTERP_DLL_DEFS@
 
-.cc.df:	
+%.df: %.cc
 	$(CXXCPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 	  $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) \
 	  -DMAKE_BUILTINS $< | $(srcdir)/mkdefs $(srcdir) $< > $@-t
@@ -105,13 +105,6 @@
   LSODE-opts.cc \
   Quad-opts.cc
 
-OPT_IN = \
-  ../liboctave/DASPK-opts.in \
-  ../liboctave/DASRT-opts.in \
-  ../liboctave/DASSL-opts.in \
-  ../liboctave/LSODE-opts.in \
-  ../liboctave/Quad-opts.in
-
 OPT_INC = \
   ../liboctave/DASPK-opts.h \
   ../liboctave/DASRT-opts.h \
@@ -609,12 +602,12 @@
   gendoc.cc \
   gendoc$(BUILD_EXEEXT) \
   graphics-props.cc \
-  oct-parse.output \
-  $(BUILT_NODISTFILES)
+  oct-parse.output
 
 DISTCLEANFILES = \
   .DOCSTRINGS \
   DOCSTRINGS \
+  $(BUILT_NODISTFILES) \
   $(OCT_FILES) \
   $(OCT_STAMP_FILES)
 
@@ -754,7 +747,7 @@
 
 
 $(OPT_INC) : %.h : %.in
-	$(MAKE) -C $(@D) $@
+	$(MAKE) -C $(@D) $(@F)
 
 ## defaults.h and oct-conf.h must depend on Makefile.  Calling configure
 ## may change default/config values.  However, calling configure will also