From 814ea637a650b42c6400cf87eaef88125dce2205 Mon Sep 17 00:00:00 2001 From: stevenj Date: Mon, 3 Sep 2007 21:37:14 -0400 Subject: [PATCH] mex file doesn't use usage.h darcs-hash:20070904013714-c8de0-febfb807bc48f2a21bedb530971e77938ca66ae4.gz --- octave/Makefile.am | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/octave/Makefile.am b/octave/Makefile.am index 5fe9564..bbc7a4b 100644 --- a/octave/Makefile.am +++ b/octave/Makefile.am @@ -13,23 +13,22 @@ endif nlopt_minimize.oct: nlopt_minimize-oct.cc nlopt_minimize_usage.h $(MKOCTFILE) -o $@ $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(srcdir)/nlopt_minimize-oct.cc $(LDFLAGS) -L$(top_builddir)/.libs -lnlopt +nlopt_minimize_usage.h: $(srcdir)/nlopt_minimize.m + echo "#define NLOPT_MINIMIZE_USAGE \\" > $@ + sed 's/\"/\\"/g' $(srcdir)/nlopt_minimize.m | sed 's,^% ,\",;s,^%,\",;s,$$,\\n\" \\,' >> $@ + echo "" >> $@ + ####################################################################### mexdir = $(MEX_INSTALL_DIR) if WITH_MATLAB mex_DATA = nlopt_minimize.$(MEXSUFF) $(MFILES) endif -nlopt_minimize.$(MEXSUFF): nlopt_minimize-mex.c nlopt_minimize_usage.h +nlopt_minimize.$(MEXSUFF): nlopt_minimize-mex.c $(MEX) -output nlopt_minimize -O $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(srcdir)/nlopt_minimize-mex.c $(LDFLAGS) -L$(top_builddir)/.libs -lnlopt ####################################################################### -nlopt_minimize_usage.h: $(srcdir)/nlopt_minimize.m - echo "#define NLOPT_MINIMIZE_USAGE \\" > $@ - sed 's/\"/\\"/g' $(srcdir)/nlopt_minimize.m | sed 's,^% ,\",;s,^%,\",;s,$$,\\n\" \\,' >> $@ - echo "" >> $@ - - EXTRA_DIST = nlopt_minimize-oct.cc nlopt_minimize-mex.c $(MFILES) CLEANFILES = nlopt_minimize.oct nlopt_minimize_usage.h nlopt_minimize.$(MEXSUFF) nlopt_minimize-oct.o -- 2.30.2