# HG changeset patch # User Rik # Date 1296852761 28800 # Node ID 1adc6b3d943d24aaf6254dae099d469ea84a99c9 # Parent 729947aa097abe7c2cbf5e6b2ca034d5194e0f44 Add .ico logo left out of icons changset. diff -r 729947aa097a -r 1adc6b3d943d Makefile.am --- a/Makefile.am Fri Feb 04 09:06:19 2011 -0800 +++ b/Makefile.am Fri Feb 04 12:52:41 2011 -0800 @@ -29,6 +29,7 @@ BUILT_DISTFILES = AUTHORS BUGS INSTALL.OCTAVE EXTRA_DIST = \ + AUTHORS \ BUGS \ COPYING \ ChangeLog \ diff -r 729947aa097a -r 1adc6b3d943d doc/ChangeLog --- a/doc/ChangeLog Fri Feb 04 09:06:19 2011 -0800 +++ b/doc/ChangeLog Fri Feb 04 12:52:41 2011 -0800 @@ -1,8 +1,12 @@ +2010-02-04 Rik + + * icons/octave-logo.ico: Add logo format left out of last changeset. + 2010-02-04 Rik * icons/: New directory for icons and .desktop files. - * icons/octave-logo.ico, icons/octave-logo.png, icons/octave-logo.svg: - Add new Octave O logo to Mercurial. + * icons/octave-logo.png, icons/octave-logo.svg: Add new Octave O logo + to Mercurial. * Makefile.am: New Makefile to build .desktop file and distribute logos. * octave.desktop.in, octave-sombrero.png: Moved from examples directory. * octave_branding_samples.svg: Original logos and branding material for diff -r 729947aa097a -r 1adc6b3d943d doc/icons/octave-logo.ico Binary file doc/icons/octave-logo.ico has changed diff -r 729947aa097a -r 1adc6b3d943d liboctave/Makefile.am --- a/liboctave/Makefile.am Fri Feb 04 09:06:19 2011 -0800 +++ b/liboctave/Makefile.am Fri Feb 04 12:52:41 2011 -0800 @@ -265,13 +265,16 @@ include mx-op-inc.mk include smx-op-inc.mk -$(srcdir)/vx-op-inc.mk: $(srcdir)/config-ops.sh $(srcdir)/mk-ops.awk $(srcdir)/vx-ops +#$(srcdir)/vx-op-inc.mk: $(srcdir)/config-ops.sh $(srcdir)/mk-ops.awk $(srcdir)/vx-ops +vx-op-inc.mk: $(srcdir)/config-ops.sh $(srcdir)/mk-ops.awk $(srcdir)/vx-ops $(srcdir)/config-ops.sh $(top_srcdir) vx inc -$(srcdir)/mx-op-inc.mk: $(srcdir)/config-ops.sh $(srcdir)/mk-ops.awk $(srcdir)/mx-ops +#$(srcdir)/mx-op-inc.mk: $(srcdir)/config-ops.sh $(srcdir)/mk-ops.awk $(srcdir)/mx-ops +mx-op-inc.mk: $(srcdir)/config-ops.sh $(srcdir)/mk-ops.awk $(srcdir)/mx-ops $(srcdir)/config-ops.sh $(top_srcdir) mx inc -$(srcdir)/smx-op-inc.mk: $(srcdir)/config-ops.sh $(srcdir)/sparse-mk-ops.awk $(srcdir)/sparse-mx-ops +#$(srcdir)/smx-op-inc.mk: $(srcdir)/config-ops.sh $(srcdir)/sparse-mk-ops.awk $(srcdir)/sparse-mx-ops +smx-op-inc.mk: $(srcdir)/config-ops.sh $(srcdir)/sparse-mk-ops.awk $(srcdir)/sparse-mx-ops $(srcdir)/config-ops.sh $(top_srcdir) smx inc BUILT_INCS = \ @@ -462,13 +465,16 @@ include mx-op-src.mk include smx-op-src.mk -$(srcdir)/vx-op-src.mk: $(srcdir)/config-ops.sh $(srcdir)/mk-ops.awk $(srcdir)/vx-ops +#$(srcdir)/vx-op-src.mk: $(srcdir)/config-ops.sh $(srcdir)/mk-ops.awk $(srcdir)/vx-ops +vx-op-src.mk: $(srcdir)/config-ops.sh $(srcdir)/mk-ops.awk $(srcdir)/vx-ops $(srcdir)/config-ops.sh $(top_srcdir) vx src -$(srcdir)/mx-op-src.mk: $(srcdir)/config-ops.sh $(srcdir)/mk-ops.awk $(srcdir)/mx-ops +#$(srcdir)/mx-op-src.mk: $(srcdir)/config-ops.sh $(srcdir)/mk-ops.awk $(srcdir)/mx-ops +mx-op-src.mk: $(srcdir)/config-ops.sh $(srcdir)/mk-ops.awk $(srcdir)/mx-ops $(srcdir)/config-ops.sh $(top_srcdir) mx src -$(srcdir)/smx-op-src.mk: $(srcdir)/config-ops.sh $(srcdir)/sparse-mk-ops.awk $(srcdir)/sparse-mx-ops +#$(srcdir)/smx-op-src.mk: $(srcdir)/config-ops.sh $(srcdir)/sparse-mk-ops.awk $(srcdir)/sparse-mx-ops +smx-op-src.mk: $(srcdir)/config-ops.sh $(srcdir)/sparse-mk-ops.awk $(srcdir)/sparse-mx-ops $(srcdir)/config-ops.sh $(top_srcdir) smx src BUILT_LIBOCTAVE_CXX_SOURCES = \