GNOME.org
 

[gnome-icon-theme-symbolic] Switch to a more standard build system

commit 2e737c5fce25ca5f2a392d52ab3e1c69156638d0
Author: William Jon McCann <jmccann redhat com>
Date:   Sun Mar 28 22:42:57 2010 -0400

    Switch to a more standard build system

 AUTHORS                                      |   12 ++-
 COPYING                                      |  166 ++++++++++++++++++-
 Makefile.am                                  |   36 ++++
 build/NEWS => NEWS                           |    0
 build/autogen.sh => autogen.sh               |   15 +-
 build/AUTHORS                                |   11 --
 build/COPYING                                |  165 ------------------
 build/INSTALL                                |  234 --------------------------
 build/Makefile.am                            |   30 ----
 build/configure.ac                           |   36 ----
 configure.ac                                 |   72 ++++++++
 src/Makefile.am                              |   52 ++++++
 gnome-stencils.svg => src/gnome-stencils.svg |    0
 stencils-hbons.svg => src/stencils-hbons.svg |    0
 14 files changed, 344 insertions(+), 485 deletions(-)
---
diff --git a/AUTHORS b/AUTHORS
deleted file mode 120000
index efc6baf..0000000
--- a/AUTHORS
+++ /dev/null
@@ -1 +0,0 @@
-build/AUTHORS
\ No newline at end of file
diff --git a/AUTHORS b/AUTHORS
new file mode 100644
index 0000000..df7cf3e
--- /dev/null
+++ b/AUTHORS
@@ -0,0 +1,11 @@
+Metaphors
+=========
+Claire Alexander <claire alexander intel com>
+Hylke Bons <hylke bons intel com>
+Darren Wilson <darren wilson intel com>
+
+Artwork
+=======
+Jakub Steiner <jimmac novell com>
+Lapo Calamandrei <calamandrei gmail com>
+Hylke Bons <hylke bons intel com>
diff --git a/COPYING b/COPYING
deleted file mode 120000
index 7381782..0000000
--- a/COPYING
+++ /dev/null
@@ -1 +0,0 @@
-build/COPYING
\ No newline at end of file
diff --git a/COPYING b/COPYING
new file mode 100644
index 0000000..fc8a5de
--- /dev/null
+++ b/COPYING
@@ -0,0 +1,165 @@
+		   GNU LESSER GENERAL PUBLIC LICENSE
+                       Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+
+  This version of the GNU Lesser General Public License incorporates
+the terms and conditions of version 3 of the GNU General Public
+License, supplemented by the additional permissions listed below.
+
+  0. Additional Definitions. 
+
+  As used herein, "this License" refers to version 3 of the GNU Lesser
+General Public License, and the "GNU GPL" refers to version 3 of the GNU
+General Public License.
+
+  "The Library" refers to a covered work governed by this License,
+other than an Application or a Combined Work as defined below.
+
+  An "Application" is any work that makes use of an interface provided
+by the Library, but which is not otherwise based on the Library.
+Defining a subclass of a class defined by the Library is deemed a mode
+of using an interface provided by the Library.
+
+  A "Combined Work" is a work produced by combining or linking an
+Application with the Library.  The particular version of the Library
+with which the Combined Work was made is also called the "Linked
+Version".
+
+  The "Minimal Corresponding Source" for a Combined Work means the
+Corresponding Source for the Combined Work, excluding any source code
+for portions of the Combined Work that, considered in isolation, are
+based on the Application, and not on the Linked Version.
+
+  The "Corresponding Application Code" for a Combined Work means the
+object code and/or source code for the Application, including any data
+and utility programs needed for reproducing the Combined Work from the
+Application, but excluding the System Libraries of the Combined Work.
+
+  1. Exception to Section 3 of the GNU GPL.
+
+  You may convey a covered work under sections 3 and 4 of this License
+without being bound by section 3 of the GNU GPL.
+
+  2. Conveying Modified Versions.
+
+  If you modify a copy of the Library, and, in your modifications, a
+facility refers to a function or data to be supplied by an Application
+that uses the facility (other than as an argument passed when the
+facility is invoked), then you may convey a copy of the modified
+version:
+
+   a) under this License, provided that you make a good faith effort to
+   ensure that, in the event an Application does not supply the
+   function or data, the facility still operates, and performs
+   whatever part of its purpose remains meaningful, or
+
+   b) under the GNU GPL, with none of the additional permissions of
+   this License applicable to that copy.
+
+  3. Object Code Incorporating Material from Library Header Files.
+
+  The object code form of an Application may incorporate material from
+a header file that is part of the Library.  You may convey such object
+code under terms of your choice, provided that, if the incorporated
+material is not limited to numerical parameters, data structure
+layouts and accessors, or small macros, inline functions and templates
+(ten or fewer lines in length), you do both of the following:
+
+   a) Give prominent notice with each copy of the object code that the
+   Library is used in it and that the Library and its use are
+   covered by this License.
+
+   b) Accompany the object code with a copy of the GNU GPL and this license
+   document.
+
+  4. Combined Works.
+
+  You may convey a Combined Work under terms of your choice that,
+taken together, effectively do not restrict modification of the
+portions of the Library contained in the Combined Work and reverse
+engineering for debugging such modifications, if you also do each of
+the following:
+
+   a) Give prominent notice with each copy of the Combined Work that
+   the Library is used in it and that the Library and its use are
+   covered by this License.
+
+   b) Accompany the Combined Work with a copy of the GNU GPL and this license
+   document.
+
+   c) For a Combined Work that displays copyright notices during
+   execution, include the copyright notice for the Library among
+   these notices, as well as a reference directing the user to the
+   copies of the GNU GPL and this license document.
+
+   d) Do one of the following:
+
+       0) Convey the Minimal Corresponding Source under the terms of this
+       License, and the Corresponding Application Code in a form
+       suitable for, and under terms that permit, the user to
+       recombine or relink the Application with a modified version of
+       the Linked Version to produce a modified Combined Work, in the
+       manner specified by section 6 of the GNU GPL for conveying
+       Corresponding Source.
+
+       1) Use a suitable shared library mechanism for linking with the
+       Library.  A suitable mechanism is one that (a) uses at run time
+       a copy of the Library already present on the user's computer
+       system, and (b) will operate properly with a modified version
+       of the Library that is interface-compatible with the Linked
+       Version. 
+
+   e) Provide Installation Information, but only if you would otherwise
+   be required to provide such information under section 6 of the
+   GNU GPL, and only to the extent that such information is
+   necessary to install and execute a modified version of the
+   Combined Work produced by recombining or relinking the
+   Application with a modified version of the Linked Version. (If
+   you use option 4d0, the Installation Information must accompany
+   the Minimal Corresponding Source and Corresponding Application
+   Code. If you use option 4d1, you must provide the Installation
+   Information in the manner specified by section 6 of the GNU GPL
+   for conveying Corresponding Source.)
+
+  5. Combined Libraries.
+
+  You may place library facilities that are a work based on the
+Library side by side in a single library together with other library
+facilities that are not Applications and are not covered by this
+License, and convey such a combined library under terms of your
+choice, if you do both of the following:
+
+   a) Accompany the combined library with a copy of the same work based
+   on the Library, uncombined with any other library facilities,
+   conveyed under the terms of this License.
+
+   b) Give prominent notice with the combined library that part of it
+   is a work based on the Library, and explaining where to find the
+   accompanying uncombined form of the same work.
+
+  6. Revised Versions of the GNU Lesser General Public License.
+
+  The Free Software Foundation may publish revised and/or new versions
+of the GNU Lesser General Public License from time to time. Such new
+versions will be similar in spirit to the present version, but may
+differ in detail to address new problems or concerns.
+
+  Each version is given a distinguishing version number. If the
+Library as you received it specifies that a certain numbered version
+of the GNU Lesser General Public License "or any later version"
+applies to it, you have the option of following the terms and
+conditions either of that published version or of any later version
+published by the Free Software Foundation. If the Library as you
+received it does not specify a version number of the GNU Lesser
+General Public License, you may choose any version of the GNU Lesser
+General Public License ever published by the Free Software Foundation.
+
+  If the Library as you received it specifies that a proxy can decide
+whether future versions of the GNU Lesser General Public License shall
+apply, that proxy's public statement of acceptance of any version is
+permanent authorization for you to choose that version for the
+Library.
diff --git a/Makefile.am b/Makefile.am
new file mode 100644
index 0000000..f6ab79b
--- /dev/null
+++ b/Makefile.am
@@ -0,0 +1,36 @@
+DISTCHECK_CONFIGURE_FLAGS = --disable-icon-mapping
+
+SUBDIRS = $(SVGSRCDIR)
+
+THEME_DIRS=$(shell SIZES="$(render_sizes)"; for size in $$SIZES; do for dir in `find $(srcdir)/$(SVGOUTDIR)/$$size/* -type d`; do printf "$$dir,"; done; done | sed -e "s/,$$//g")
+
+render: Makefile
+	($(am__cd) $(SVGSRCDIR) && $(MAKE) $(AM_MAKEFLAGS) render) \
+	|| eval `exit 1`
+
+# we don't want to install mo files, all translations are already stored
+# in theme files
+install-data-local:
+	if [ -h $(DESTDIR)$(themedir) ]; then \
+		rm -f $(DESTDIR)$(themedir); \
+	fi
+	if [ -d $(DESTDIR)$(themedir) ]; then \
+		touch $(DESTDIR)$(themedir); \
+	fi
+
+EXTRA_DIST = gnome
+
+MAINTAINERCLEANFILES =			\
+	Makefile.in			\
+	aclocal.m4			\
+	config.guess			\
+	config.h.in			\
+	config.sub			\
+	configure			\
+	depcomp				\
+	install-sh			\
+	intltool-*.in			\
+	libtool				\
+	ltmain.sh			\
+	missing				\
+	mkinstalldirs
diff --git a/build/NEWS b/NEWS
similarity index 100%
rename from build/NEWS
rename to NEWS
diff --git a/build/autogen.sh b/autogen.sh
similarity index 51%
rename from build/autogen.sh
rename to autogen.sh
index 042d38e..5670723 100755
--- a/build/autogen.sh
+++ b/autogen.sh
@@ -4,15 +4,16 @@
 srcdir=`dirname $0`
 test -z "$srcdir" && srcdir=.
 
-PKG_NAME="moblin"
+PKG_NAME="gnome-icon-theme-symbolic"
 REQUIRED_AUTOMAKE_VERSION=1.9
 
-gettext=`which gettext`
-gettext_prefix=`dirname $gettext | xargs dirname`
-
-if [ -x $gettext_prefix/share/gettext/mkinstalldirs ]; then
-    cp $gettext_prefix/share/gettext/mkinstalldirs $srcdir
-fi
+(test -f $srcdir/configure.ac \
+  && test -f $srcdir/src/gnome-stencils.svg \
+  && test -d $srcdir/gnome) || {
+    echo -n "**Error**: Directory "\`$srcdir\'" does not look like the"
+    echo " top-level $PKG_NAME directory"
+    exit 1
+}
 
 which gnome-autogen.sh || {
     echo "You need to install gnome-common from the GNOME CVS"
diff --git a/configure.ac b/configure.ac
new file mode 100644
index 0000000..712a13d
--- /dev/null
+++ b/configure.ac
@@ -0,0 +1,72 @@
+dnl Process this file with autoconf to produce a configure script.
+AC_PREREQ(2.53)
+
+AC_INIT([gnome-icon-theme-symbolic], [2.29.2],
+        [http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-icon-theme-symbolic])
+AC_CONFIG_SRCDIR([src/gnome-stencils.svg])
+
+AM_INIT_AUTOMAKE([1.9 tar-ustar foreign dist-bzip2 no-dist-gzip])
+
+PKG_PROG_PKG_CONFIG([0.19])
+
+# Workaround to make aclocal get the right flags
+AC_SUBST(ACLOCAL_AMFLAGS, "\${ACLOCAL_FLAGS}")
+
+# Define the toplevel path here
+AC_SUBST(themedir, "\${datadir}/icons/gnome")
+
+# Input and Output dirs for the rendering
+AC_SUBST(SVGSRCDIR, "src")
+AC_SUBST(SVGOUTDIR, "gnome")
+
+# Icon sizes we want to install
+AC_SUBST([render_sizes], [""])
+
+# Allow icon mapping to be disabled
+AC_ARG_ENABLE([icon-mapping],
+	AC_HELP_STRING([--enable-icon-mapping],
+			[Enable compatibility symlinks [default=auto]]),
+	[enable_mapping=$enableval],
+	[enable_mapping=yes])
+
+ICONMAP="true"
+if test "x$enable_mapping" != "xno"; then
+   UTILS_REQUIRED=0.8.7
+
+   AC_MSG_CHECKING([icon-naming-utils >= $UTILS_REQUIRED])
+   PKG_CHECK_EXISTS(icon-naming-utils >= $UTILS_REQUIRED,
+                    have_utils=yes, have_utils=no)
+   if test "x$have_utils" = "xyes"; then
+      UTILS_PATH="`$PKG_CONFIG --variable=program_path icon-naming-utils`"
+      ICONMAP="$UTILS_PATH/icon-name-mapping"
+      AC_MSG_RESULT([yes])
+   else
+      AC_MSG_RESULT([no])
+      AC_MSG_ERROR([icon-naming-utils >= $UTILS_REQUIRED is required to build and install gnome-icon-theme-symbolic])
+   fi
+fi
+AC_SUBST(ICONMAP)
+
+# need git, icontool, and inkscape for rendering
+allow_rendering=yes
+AC_PATH_PROG([GIT], [git], [false])
+if test "x$GIT" = "xfalse"; then
+   allow_rendering=no
+fi
+AC_PATH_PROG([ICONTOOL_RENDER], [icontool-render], [false])
+if test "x$ICONTOOL_RENDER" = "xfalse"; then
+   allow_rendering=no
+fi
+AC_PATH_PROG([INKSCAPE], [inkscape], [false])
+if test "x$INKSCAPE" = "xfalse"; then
+   allow_rendering=no
+fi
+AM_CONDITIONAL(ALLOW_RENDERING, test "x$allow_rendering" = "xyes")
+
+
+AC_CONFIG_FILES([
+Makefile
+src/Makefile
+])
+
+AC_OUTPUT
diff --git a/src/Makefile.am b/src/Makefile.am
new file mode 100644
index 0000000..4183376
--- /dev/null
+++ b/src/Makefile.am
@@ -0,0 +1,52 @@
+
+icon_in_files = $(shell SRCDIR="$(srcdir)"; for i in `find $$SRCDIR -name "*.svg"`; do printf "$$i "; done)
+
+if ALLOW_RENDERING
+render-png: $(icon_in_files) Makefile
+	for file in $(icon_in_files); do \
+		for size in $(render_sizes); do \
+			$(ICONTOOL_RENDER) -s $$size -o $(top_builddir)/$(SVGOUTDIR) $$file >/dev/null; \
+		done; \
+	done
+
+else
+render-png: $(icon_in_files) Makefile
+	if test "x$(top_srcdir)" != "x$(top_builddir)"; then \
+		cp -a $(top_srcdir)/$(SVGOUTDIR) $(top_builddir)/$(SVGOUTDIR); \
+	fi
+
+endif
+
+$(render_sizes): Makefile
+
+render: render-png
+
+install-data-local:
+	for size in $(render_sizes); do \
+		for file in `cd $(top_builddir)/$(SVGOUTDIR)/$$size; find . -name "*.png"`; do \
+			context="`dirname $$file`"; \
+			$(mkdir_p) $(DESTDIR)$(themedir)/$$size/$$context; \
+			$(install_sh_DATA) $(top_srcdir)/$(SVGOUTDIR)/$$size/$$file $(DESTDIR)$(themedir)/$$size/$$file; \
+		done; \
+	done
+	for file in `cd $(top_builddir)/$(SVGOUTDIR)/scalable; find . -name "*.svg"`; do \
+		context="`dirname $$file`"; \
+		$(mkdir_p) $(DESTDIR)$(themedir)/scalable/$$context; \
+		$(install_sh_DATA) $(top_srcdir)/$(SVGOUTDIR)/scalable/$$file $(DESTDIR)$(themedir)/scalable/$$file; \
+	done
+
+uninstall-local:
+	for size in $(render_sizes); do \
+		for file in `cd $(top_builddir)/$(SVGOUTDIR)/$$size; find . -name "*.png"`; do \
+			rm -f $(DESTDIR)$(themedir)/$$size/$$file; \
+		done; \
+	done
+
+EXTRA_DIST =			\
+	$(icon_in_files)
+
+
+MAINTAINERCLEANFILES =		\
+	*~			\
+	Makefile.in		\
+	$(icon_cache)
diff --git a/gnome-stencils.svg b/src/gnome-stencils.svg
similarity index 100%
rename from gnome-stencils.svg
rename to src/gnome-stencils.svg
diff --git a/stencils-hbons.svg b/src/stencils-hbons.svg
similarity index 100%
rename from stencils-hbons.svg
rename to src/stencils-hbons.svg
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]