changeset 12372:1adc6b3d943d release-3-4-x

Add .ico logo left out of icons changset.
author Rik <octave@nomad.inbox5.com>
date Fri, 04 Feb 2011 12:52:41 -0800
parents 729947aa097a
children ab838df8de90
files Makefile.am doc/ChangeLog doc/icons/octave-logo.ico liboctave/Makefile.am
diffstat 4 files changed, 19 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- a/Makefile.am
+++ b/Makefile.am
@@ -29,6 +29,7 @@
 BUILT_DISTFILES = AUTHORS BUGS INSTALL.OCTAVE
 
 EXTRA_DIST = \
+  AUTHORS \
   BUGS \
   COPYING \
   ChangeLog \
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,8 +1,12 @@
+2010-02-04  Rik  <octave@nomad.inbox5.com>
+
+	* icons/octave-logo.ico: Add logo format left out of last changeset.
+
 2010-02-04  Rik  <octave@nomad.inbox5.com>
 
 	* 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
new file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..563469b0a29f69e0baa986849f43fb538d552488
GIT binary patch
literal 4286
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
Uu{G@B1H;S#e29ryHUNJ4Us;qKC;$Ke
--- a/liboctave/Makefile.am
+++ b/liboctave/Makefile.am
@@ -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 = \