This email list is read-only. Emails sent to this list will be discarded
----------------------------------
apple/Makefile.am | 4 ++--
apple/apple.desktop | 2 +-
colortext/16x16/Makefile.am | 5 -----
colortext/16x16/colortext.png | Bin 854 -> 0 bytes
colortext/32x32/Makefile.am | 5 -----
colortext/32x32/colortext.png | Bin 2416 -> 0 bytes
colortext/Makefile.am | 22 ++--------------------
colortext/colortext.desktop | 2 +-
colortext/configure.ac | 25 ++++---------------------
configure.ac | 1 -
squares/Makefile.am | 11 +++++------
squares/configure.ac | 4 ++--
squares/squares.desktop | 2 +-
13 files changed, 18 insertions(+), 65 deletions(-)
New commits:
commit c7c2fc688da291f7d9a845430c031ad9b555f2af
Author: Felicia Decker <[EMAIL PROTECTED]>
Date: Wed Aug 13 13:39:38 2008 -0700
Fixed desktop files to point to correct .png
Deleted unnecessary directories in colortext
Diff in this email is a maximum of 400 lines.
diff --git a/apple/Makefile.am b/apple/Makefile.am
index b165261..8784524 100644
--- a/apple/Makefile.am
+++ b/apple/Makefile.am
@@ -13,8 +13,8 @@ apple_DATA = apple_stem3.png caterpillar2.png leaf.png
text_bubble.png
desktopdir = $(datadir)/applications
desktop_DATA = apple.desktop
-icon32dir = $(datadir)/icons/hicolor/48x48/apps
-icon32_DATA = clutter_apple.png
+icondir = $(datadir)/icons/hicolor/48x48/apps
+icon_DATA = clutter_apple.png
EXTRA_DIST = clutter_apple.png
diff --git a/apple/apple.desktop b/apple/apple.desktop
index 442867d..142d232 100644
--- a/apple/apple.desktop
+++ b/apple/apple.desktop
@@ -3,6 +3,6 @@ Version=0.1
Encoding=UTF-8
Name=Clutter Apple
Type=Application
-Icon=clutter_apple.png
+Icon=clutter_apple
Exec=apple
Name[en_US]=Clutter Apple
diff --git a/colortext/16x16/Makefile.am b/colortext/16x16/Makefile.am
deleted file mode 100644
index 45fcb6d..0000000
--- a/colortext/16x16/Makefile.am
+++ /dev/null
@@ -1,5 +0,0 @@
-icon16dir = /usr/share/icons/hicolor/16x16/apps
-icon16_DATA = colortext.png
-
-EXTRA_DIST = colortext.png
-
diff --git a/colortext/16x16/colortext.png b/colortext/16x16/colortext.png
deleted file mode 100644
index 65c5fff..0000000
Binary files a/colortext/16x16/colortext.png and /dev/null differ
diff --git a/colortext/32x32/Makefile.am b/colortext/32x32/Makefile.am
deleted file mode 100644
index ed980cb..0000000
--- a/colortext/32x32/Makefile.am
+++ /dev/null
@@ -1,5 +0,0 @@
-icondir = /usr/share/icons/hicolor/32x32/apps
-icon_DATA = colortext.png
-
-EXTRA_DIST = colortext.png
-
diff --git a/colortext/32x32/colortext.png b/colortext/32x32/colortext.png
deleted file mode 100644
index 81e09e5..0000000
Binary files a/colortext/32x32/colortext.png and /dev/null differ
diff --git a/colortext/Makefile.am b/colortext/Makefile.am
index f86d7c8..2c6273d 100644
--- a/colortext/Makefile.am
+++ b/colortext/Makefile.am
@@ -1,40 +1,22 @@
bin_PROGRAMS = colortext
-#PKGDATADIR = $(datadir)/colortext
colortextdir = $(datadir)/colortext
AM_CFLAGS = $(CLUTTER_CFLAGS) \
$(GCC_CFLAGS) \
- -D_GNU_SOURCE \
- -DICONDIR=\"$(icondir)\"
+ -D_GNU_SOURCE
colortext_LDADD = $(CLUTTER_LIBS)
colortext_SOURCES = main.c
desktopdir = $(datadir)/applications
-#icon16dir = $(datadir)/icons/hicolor/16x16/apps
-#icon22dir = $(datadir)/icons/hicolor/22x22/apps
-#icon24dir = $(datadir)/icons/hicolor/24x24/apps
-#icon32dir = $(datadir)/icons/hicolor/32x32/apps
-#icon48dir = $(datadir)/icons/hicolor/48x48/apps
-
-colortext_DATA = word_file
desktop_DATA = colortext.desktop
-#icon16_DATA = $(srcdir)/16x16/colortext.png
-#icon22_DATA = colortext_22x22_icon.png
-#icon24_DATA = colortext_24x24_icon.png
-#icon32_DATA = $(srcdir)/32x32/colortext.png
-#icon48_DATA = $(srcdir)/48x48/colortext.png
-#desktopdir = colortext.desktop
-
-#EXTRA_DIST=word_file
+colortext_DATA = word_file
icondir = $(datadir)/icons/hicolor/48x48/apps
icon_DATA = clutter_colortext.png
EXTRA_DIST = clutter_colortext.png
-snapshot:
- $(MAKE) dist distdir=$(PACKAGE)-snap`date +"%Y%m%d"`
diff --git a/colortext/colortext.desktop b/colortext/colortext.desktop
index a233a5c..9a35a9f 100644
--- a/colortext/colortext.desktop
+++ b/colortext/colortext.desktop
@@ -3,6 +3,6 @@ Version=1.0
Encoding=UTF-8
Name=Color Text
Type=Application
-Icon=colortext
+Icon=clutter_colortext
Exec=colortext
Name[en_US]=Color Text
diff --git a/colortext/configure.ac b/colortext/configure.ac
index 27494cc..e251462 100644
--- a/colortext/configure.ac
+++ b/colortext/configure.ac
@@ -1,7 +1,7 @@
AC_PREREQ(2.61)
AC_INIT(colortext, 1.0, [])
AM_INIT_AUTOMAKE()
-AC_CONFIG_SRCDIR(src/main.c)
+AC_CONFIG_SRCDIR(main.c)
AM_CONFIG_HEADER(config.h)
AM_MAINTAINER_MODE
@@ -19,27 +19,14 @@ PKG_CHECK_MODULES(CLUTTER, clutter-0.8)
AC_SUBST(CLUTTER_CFLAGS)
AC_SUBST(CLUTTER_LIBS)
-
-if test "x$GCC" = "xyes"; then
- GCC_FLAGS="-g -Wall"
-fi
-
colortextdir = $(datadir)/colortext
AC_SUBST(colortextdir)
desktopdir = $(datadir)/applications
-#icon16dir = $(datadir)/icons/hicolor/16x16/apps
-#icon22dir = $(datadir)/icons/hicolor/22x22/apps
-#icon24dir = $(datadir)/icons/hicolor/24x24/apps
-#icon32dir = $(datadir)/icons/hicolor/32x32/apps
-#icon48dir = $(datadir)/icons/hicolor/48x48/apps
-
AC_SUBST(desktopdir)
-#AC_SUBST(icon16dir)
-#AC_SUBST(icon22dir)
-#AC_SUBST(icon24dir)
-#AC_SUBST(icon32dir)
-#AC_SUBST(icon49dir)
+
+icondir = $(datadir)/icons/hicolor/48x48/apps
+AC_SUBST(icondir)
# Checks for typedefs, structures, and compiler characteristics.
@@ -49,8 +36,4 @@ AC_CHECK_FUNCS([memset])
AC_OUTPUT([
Makefile
-src/Makefile
-16x16/Makefile
-32x32/Makefile
-48x48/Makefile
])
diff --git a/configure.ac b/configure.ac
index bb58923..6af61ae 100644
--- a/configure.ac
+++ b/configure.ac
@@ -55,5 +55,4 @@ colortext/Makefile
squares/Makefile
])
-#32x32/Makefile
diff --git a/squares/Makefile.am b/squares/Makefile.am
index 1e1f9eb..975117c 100644
--- a/squares/Makefile.am
+++ b/squares/Makefile.am
@@ -4,8 +4,7 @@ bin_PROGRAMS = squares
AM_CFLAGS = $(CLUTTER_CFLAGS) \
$(GCC_CFLAGS) \
- -D_GNU_SOURCE \
- -DPKGDATADIR=\"$(PKGDATADIR)\"
+ -D_GNU_SOURCE
squares_LDADD = $(CLUTTER_LIBS)
squares_SOURCES = main.c
@@ -13,9 +12,9 @@ squares_SOURCES = main.c
desktopdir = $(datadir)/applications
desktop_DATA = squares.desktop
-icon32dir = $(datadir)/icons/hicolor/32x32/apps
-icon32_DATA = clutter_squares.png
+icondir = $(datadir)/icons/hicolor/32x32/apps
+icon_DATA = clutter_squares.png
+
+EXTRA_DIST = clutter_squares.png
-snapshot:
- $(MAKE) dist distdir=$(PACKAGE)-snap`date +"%Y%m%d"`
diff --git a/squares/configure.ac b/squares/configure.ac
index 5d3775b..fd98f31 100644
--- a/squares/configure.ac
+++ b/squares/configure.ac
@@ -22,6 +22,8 @@ AC_SUBST(CLUTTER_LIBS)
desktopdir = $(datadir)/applications
AC_SUBST(desktopdir)
+icondir = $(datadir)/icons/hicolor/32x32/apps
+AC_SUBST(icon)
if test "x$GCC" = "xyes"; then
GCC_FLAGS="-g -Wall"
@@ -30,6 +32,4 @@ fi
AC_OUTPUT([
Makefile
-src/Makefile
-32x32/Makefile
])
diff --git a/squares/squares.desktop b/squares/squares.desktop
index adc830c..007691c 100644
--- a/squares/squares.desktop
+++ b/squares/squares.desktop
@@ -3,6 +3,6 @@ Version=1.0
Encoding=UTF-8
Name=Squares
Type=Application
-Icon=rotatingsquare
+Icon=clutter_squares
Exec=rotatingsquare
Name[en_US]=Squares
_______________________________________________
Commits mailing list
[email protected]
https://www.moblin.org/mailman/listinfo/commits
