Mercurial > octave-nkf

changeset 9229:4b94672337d0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Add Makefile/configure support for C++ version of mkoctfile, octave-config and octave-bug
author Michael Goffioul <michael.goffioul@gmail.com>
date Thu, 21 May 2009 18:13:47 +0100
parents 902a4597dce8
children 579a19943d38
files ChangeLog configure.in octMakefile.in
diffstat 3 files changed, 79 insertions(+), 19 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Wed May 20 14:13:31 2009 +0200
+++ b/ChangeLog	Thu May 21 18:13:47 2009 +0100
@@ -1,3 +1,20 @@
+2008-05-21  Michael Goffioul <michael.goffioul@gmail.com>
+
+	* configure.in (SCRIPTS_EXE_SUFFIX): New substituted
+	variable. Define to ".exe" for MSVC compilation.
+	* octMakefile.in (SCRIPTS_EXE_SUFFIX): New variable.
+	(DISTFILES): Add mkoctfile.cc.in, octave-config.cc.in and
+	octave-bug.cc.in.
+	(SHELL_SCRIPTS): Use SCRIPTS_EXE_SUFFIX.
+	(mkoctfile.cc, mkoctfile$(EXEEXT)): New build rules.
+	(octave-config.cc, octave-config$(EXEEXT)): Likewise.
+	(octave-bug.cc, octave-bug$(EXEEXT)): Likewise.
+	(install, install-strip, uninstall): Use SCRIPTS_EXE_SUFFIX.
+	(maintainer-clean, distclean): Remove mkoctfile.[cc|o|exe],
+	octave-config.[cc|o|exe] and octave-bug.[cc|o|exe].
+	(clean): Remove mkoctfile$(EXEEXT), octave-config$(EXEEXT),
+	octave-bug$(EXEEXT) and the corresponding object files.
+
 2009-05-07  John W. Eaton  <jwe@octave.org>
 
 	* configure.in, mkoctfile.in, mkoctfile.cc.in, octave-bug.in,
--- a/configure.in	Wed May 20 14:13:31 2009 +0200
+++ b/configure.in	Thu May 21 18:13:47 2009 +0100
@@ -1209,6 +1209,7 @@
 OCTINTERP_DLL_DEFS=
 OCTGRAPHICS_DLL_DEFS=
 library_path_var=LD_LIBRARY_PATH
+SCRIPTS_EXE_SUFFIX=
 case "$canonical_host_type" in
   *-*-386bsd* | *-*-netbsd*)
     SH_LD=ld
@@ -1298,6 +1299,7 @@
     OCTAVE_DLL_DEFS="-DOCTAVE_DLL"
     OCTINTERP_DLL_DEFS="-DOCTINTERP_DLL"
     OCTGRAPHICS_DLL_DEFS="-DOCTGRAPHICS_DLL"
+    SCRIPTS_EXE_SUFFIX='$(EXEEXT)'
   ;;
   *-*-linux* | *-*-gnu*)
     MKOCTFILE_DL_LDFLAGS="-shared -Wl,-Bsymbolic"
@@ -1446,6 +1448,7 @@
 AC_SUBST(OCTINTERP_DLL_DEFS)
 AC_SUBST(OCTGRAPHICS_DLL_DEFS)
 AC_SUBST(library_path_var)
+AC_SUBST(SCRIPTS_EXE_SUFFIX)
 
 ### special checks for odd OS specific things.
 ###
--- a/octMakefile.in	Wed May 20 14:13:31 2009 +0200
+++ b/octMakefile.in	Thu May 21 18:13:47 2009 +0100
@@ -26,6 +26,8 @@
 abs_top_srcdir = @abs_top_srcdir@
 VPATH = @srcdir@
 
+SCRIPTS_EXE_SUFFIX = @SCRIPTS_EXE_SUFFIX@
+
 include $(TOPDIR)/Makeconf
 
 INSTALL = @INSTALL@
@@ -44,9 +46,9 @@
 	COPYING INSTALL NEWS \
 	NEWS.[0-9] PROJECTS README README.Linux README.Windows \
 	README.Cygwin README.MSVC README.kpathsea ROADMAP SENDING-PATCHES \
-	move-if-change octave-sh octave-bug.in \
-	octave-config.in missing mk-opts.pl mkinstalldirs \
-	mkoctfile.in run-octave.in ChangeLog ChangeLog.[0-9]
+	move-if-change octave-sh octave-bug.in octave-bug.cc.in \
+	octave-config.in octave-config.cc.in missing mk-opts.pl mkinstalldirs \
+	mkoctfile.in mkoctfile.cc.in run-octave.in ChangeLog ChangeLog.[0-9]
 
 # Subdirectories in which to run `make all'.
 SUBDIRS = libcruft liboctave src scripts doc examples
@@ -69,7 +71,8 @@
   $(localapioctfiledir) $(localveroctfiledir) $(imagedir) $(archlibdir) \
   $(localarchlibdir) $(localapiarchlibdir) $(localverarchlibdir)
 
-SHELL_SCRIPTS = octave-bug octave-config mkoctfile run-octave
+SHELL_SCRIPTS = octave-bug$(SCRIPTS_EXE_SUFFIX) octave-config$(SCRIPTS_EXE_SUFFIX) \
+		mkoctfile$(SCRIPTS_EXE_SUFFIX)  run-octave
 
 CONFIG_FILES = @ac_config_files@
 
@@ -113,14 +116,41 @@
 	@$(do-subst-config-vals)
 	chmod a+rx $@
 
+octave-bug.cc: octave-bug.cc.in Makeconf octMakefile
+	@$(do-subst-config-vals)
+
+ifneq ($(EXEEXT),)
+octave-bug$(EXEEXT): octave-bug.o
+	$(LD_CXX) $(CPPFLAGS) $(ALL_CXXFLAGS) $(RDYNAMIC_FLAG) \
+	    $(ALL_LDFLAGS) -o $@ octave-bug.o
+endif
+
 octave-config: octave-config.in Makeconf octMakefile $(top_srcdir)/src/version.h
 	@$(do-subst-default-vals)
 	chmod a+rx $@
 
+octave-config.cc: octave-config.cc.in Makeconf octMakefile
+	@$(do-subst-default-vals)
+
+ifneq ($(EXEEXT),)
+octave-config$(EXEEXT): octave-config.o
+	$(LD_CXX) $(CPPFLAGS) $(ALL_CXXFLAGS) $(RDYNAMIC_FLAG) \
+	    $(ALL_LDFLAGS) -o $@ octave-config.o
+endif
+
 mkoctfile: mkoctfile.in Makeconf octMakefile $(top_srcdir)/src/version.h
 	@$(do-subst-config-vals)
 	chmod a+rx $@
 
+mkoctfile.cc: mkoctfile.cc.in Makeconf octMakefile
+	@$(do-subst-config-vals)
+
+ifneq ($(EXEEXT),)
+mkoctfile$(EXEEXT): mkoctfile.o
+	$(LD_CXX) $(CPPFLAGS) $(ALL_CXXFLAGS) $(RDYNAMIC_FLAG) \
+	    $(ALL_LDFLAGS) -o $@ mkoctfile.o
+endif
+
 run-octave: run-octave.in Makeconf octMakefile
 	@$(do-subst-script-vals)
 	chmod a+rx "$@"
@@ -139,26 +169,31 @@
 
 install install-strip ::
 	$(top_srcdir)/mkinstalldirs $(addprefix $(DESTDIR), $(DIRS_TO_MAKE))
-	rm -f $(DESTDIR)$(bindir)/octave-bug
-	$(INSTALL_SCRIPT) octave-bug $(DESTDIR)$(bindir)/octave-bug-$(version)
-	(cd $(DESTDIR)$(bindir); $(LN_S) octave-bug-$(version) $(DESTDIR)$(bindir)/octave-bug)
-	rm -f $(DESTDIR)$(bindir)/octave-config
+	rm -f $(DESTDIR)$(bindir)/octave-bug$(SCRIPTS_EXE_SUFFIX)
+	$(INSTALL_SCRIPT) octave-bug$(SCRIPTS_EXE_SUFFIX) \
+	    $(DESTDIR)$(bindir)/octave-bug-$(version)$(SCRIPTS_EXE_SUFFIX)
+	(cd $(DESTDIR)$(bindir); $(LN_S) octave-bug-$(version)$(SCRIPTS_EXE_SUFFIX) \
+	    $(DESTDIR)$(bindir)/octave-bug$(SCRIPTS_EXE_SUFFIX))
+	rm -f $(DESTDIR)$(bindir)/octave-config$(SCRIPTS_EXE_SUFFIX)
 	$(INSTALL_SCRIPT) \
-	  octave-config $(DESTDIR)$(bindir)/octave-config-$(version)
-	(cd $(DESTDIR)$(bindir); $(LN_S) octave-config-$(version) $(DESTDIR)$(bindir)/octave-config)
-	rm -f $(DESTDIR)$(bindir)/mkoctfile
-	$(INSTALL_SCRIPT) mkoctfile $(DESTDIR)$(bindir)/mkoctfile-$(version)
-	(cd $(DESTDIR)$(bindir); $(LN_S) mkoctfile-$(version) $(DESTDIR)$(bindir)/mkoctfile)
+	  octave-config$(SCRIPTS_EXE_SUFFIX) $(DESTDIR)$(bindir)/octave-config-$(version)$(SCRIPTS_EXE_SUFFIX)
+	(cd $(DESTDIR)$(bindir); $(LN_S) octave-config-$(version)$(SCRIPTS_EXE_SUFFIX) \
+	    $(DESTDIR)$(bindir)/octave-config$(SCRIPTS_EXE_SUFFIX))
+	rm -f $(DESTDIR)$(bindir)/mkoctfile$(SCRIPTS_EXE_SUFFIX)
+	$(INSTALL_SCRIPT) mkoctfile$(SCRIPTS_EXE_SUFFIX) \
+	    $(DESTDIR)$(bindir)/mkoctfile-$(version)$(SCRIPTS_EXE_SUFFIX)
+	(cd $(DESTDIR)$(bindir); $(LN_S) mkoctfile-$(version)$(SCRIPTS_EXE_SUFFIX) \
+	    $(DESTDIR)$(bindir)/mkoctfile$(SCRIPTS_EXE_SUFFIX))
 	$(INSTALL_DATA) config.h $(DESTDIR)$(octincludedir)/octave/config.h
 	$(INSTALL_DATA) $(srcdir)/NEWS $(DESTDIR)$(octetcdir)/NEWS
 
 uninstall::
-	rm -f $(DESTDIR)$(bindir)/octave-bug
-	rm -f $(DESTDIR)$(bindir)/octave-bug-$(version)
-	rm -f $(DESTDIR)$(bindir)/octave-config
-	rm -f $(DESTDIR)$(bindir)/octave-config-$(version)
-	rm -f $(DESTDIR)$(bindir)/mkoctfile
-	rm -f $(DESTDIR)$(bindir)/mkoctfile-$(version)
+	rm -f $(DESTDIR)$(bindir)/octave-bug$(SCRIPTS_EXE_SUFFIX)
+	rm -f $(DESTDIR)$(bindir)/octave-bug-$(version)$(SCRIPTS_EXE_SUFFIX)
+	rm -f $(DESTDIR)$(bindir)/octave-config$(SCRIPTS_EXE_SUFFIX)
+	rm -f $(DESTDIR)$(bindir)/octave-config-$(version)$(SCRIPTS_EXE_SUFFIX)
+	rm -f $(DESTDIR)$(bindir)/mkoctfile$(SCRIPTS_EXE_SUFFIX)
+	rm -f $(DESTDIR)$(bindir)/mkoctfile-$(version)$(SCRIPTS_EXE_SUFFIX)
 	rm -f $(DESTDIR)$(octincludedir)/octave/config.h
 	rm -f $(DESTDIR)$(octetcdir)/NEWS
 
@@ -185,11 +220,16 @@
 	rm -f config.cache config.h config.log config.status
 	rm -rf autom4te.cache
 	rm -f $(SHELL_SCRIPTS)
+	rm -f mkoctfile.cc octave-config.cc octave-bug.cc
 	rm -f unistd.h
 
 maintainer-clean::
 	rm -f configure config.h.in BUGS INSTALL.OCTAVE
 
+maintainer-clean distclean clean::
+	rm -f mkoctfile$(EXEEXT) octave-config$(EXEEXT) octave-bug$(EXEEXT)
+	rm -f mkoctfile.o octave-config.o octave-bug.o
+
 # Rules for making a source distribution.
 
 dist-info-files: INSTALL.OCTAVE BUGS