Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarco Pesenti Gritti <mpg@redhat.com>2007-09-29 11:06:28 (GMT)
committer Marco Pesenti Gritti <mpg@redhat.com>2007-09-29 11:06:28 (GMT)
commitcddc25da2eaadc5b285d3b5c7a6702b7c9e2de26 (patch)
tree87c98386b959714815f53b672ef6e5d49060d02e
parent8ec525b54a891a41c5d1a9c5b7c757eceb5d92f0 (diff)
Get rid of intltool support, it's unused and break stuff.
-rw-r--r--.gitignore6
-rw-r--r--configure.ac4
-rw-r--r--icons/Makefile.am10
-rw-r--r--[-rwxr-xr-x]icons/index.theme (renamed from icons/index.theme.in)4
-rw-r--r--po/ChangeLog0
-rw-r--r--po/POTFILES.in0
6 files changed, 3 insertions, 21 deletions
diff --git a/.gitignore b/.gitignore
index 1d883d2..7bc1cab 100644
--- a/.gitignore
+++ b/.gitignore
@@ -22,14 +22,10 @@ ltmain.sh
missing
mkinstalldirs
Makefile.in.in
-po/POTFILES
-po/stamp-it
cursor/cursorthemegen/cursorthemegen
cursor/sugar/theme
-icons/index.theme
.deps
.libs
-po/.intltool-merge-cache
stamp-h1
*~
gtk/theme/sugar.gtkrc
@@ -40,4 +36,4 @@ test/symbols
test/valgrind-logs
test/torturetest
test/torture_*
-test/exported_* \ No newline at end of file
+test/exported_*
diff --git a/configure.ac b/configure.ac
index 83480d2..b8d1383 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,7 +9,6 @@ AM_DISABLE_STATIC
AC_PROG_CC
AC_HEADER_STDC
AC_PROG_LIBTOOL
-AC_PROG_INTLTOOL
PKG_CHECK_MODULES(GTK2, gtk+-2.0 >= 2.0.0,,
AC_MSG_ERROR([GTK+-2.0 is required to compile redhat-artwork]))
@@ -24,8 +23,6 @@ PKG_CHECK_MODULES(ENGINE, gtk+-2.0 >= 2.0 gobject-2.0 >= 2.0 cairo >= 0.1.1)
GTK_VERSION=`$PKG_CONFIG --variable=gtk_binary_version gtk+-2.0`
AC_SUBST(GTK_VERSION)
-AM_GLIB_GNU_GETTEXT
-
AC_OUTPUT([
Makefile
cursor/Makefile
@@ -42,5 +39,4 @@ gtk/Makefile
gtk/engine/Makefile
gtk/theme/Makefile
matchbox/Makefile
-po/Makefile.in
])
diff --git a/icons/Makefile.am b/icons/Makefile.am
index b41a761..79e37c1 100644
--- a/icons/Makefile.am
+++ b/icons/Makefile.am
@@ -1,14 +1,4 @@
SUBDIRS = scalable
-THEME_IN_FILES = index.theme.in
-
-%.theme: %.theme.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_MERGE) $(top_srcdir)/po $< $@ -d -u -c $(top_builddir)/po/.intltool-merge-cache
-
themedir = ${datadir}/icons/sugar
theme_DATA = index.theme
-
-EXTRA_DIST= \
- index.theme.in
-
-CLEANFILES = \
- index.theme
diff --git a/icons/index.theme.in b/icons/index.theme
index 5d32027..2c44abe 100755..100644
--- a/icons/index.theme.in
+++ b/icons/index.theme
@@ -1,6 +1,6 @@
[Icon Theme]
-_Name=OLPC
-_Comment=Default OLPC Theme
+Name=OLPC
+Comment=Default OLPC Theme
Directories=scalable/mimetypes,scalable/device,scalable/control,scalable/actions,scalable/status
diff --git a/po/ChangeLog b/po/ChangeLog
deleted file mode 100644
index e69de29..0000000
--- a/po/ChangeLog
+++ /dev/null
diff --git a/po/POTFILES.in b/po/POTFILES.in
deleted file mode 100644
index e69de29..0000000
--- a/po/POTFILES.in
+++ /dev/null