billreminder r632 - in trunk: . data data/images

[ogmaciel svn gnome org]

Author: ogmaciel
Date: Mon Sep  8 23:59:54 2008
New Revision: 632
URL: http://svn.gnome.org/viewvc/billreminder?rev=632&view=rev

Log:
Lots of good work to make sure our autotools files do what they\'re supposed to. Thanks Luiz!


Modified:
   trunk/Makefile.am
   trunk/data/Makefile.am
   trunk/data/billreminder.schemas.in
   trunk/data/images/Makefile.am

Modified: trunk/Makefile.am
==============================================================================
--- trunk/Makefile.am	(original)
+++ trunk/Makefile.am	Mon Sep  8 23:59:54 2008
@@ -15,7 +15,7 @@
 		< $< > $@
 
 EXTRA_DIST = billreminder.in
-CLEANFILES += billreminderd
+CLEANFILES += billreminder
 
 billreminderd: billreminderd.in
 	-sed -e s!\ PYTHONDIR\@!$(pythondir)! \

Modified: trunk/data/Makefile.am
==============================================================================
--- trunk/data/Makefile.am	(original)
+++ trunk/data/Makefile.am	Mon Sep  8 23:59:54 2008
@@ -2,22 +2,19 @@
 
 SUBDIRS = images
 
-# Configuration Data
-# TODO: Remove this as we no longer use it in favor of gconf schemas
-configdir = $(datadir)/billreminder
-config_DATA = billreminder.cfg
-
 # GConf Schemas
-schema_in_files = billreminder.schemas.in
-schemadir = $(GCONF_SCHEMA_FILE_DIR)
-schema_DATA = $(schema_in_files:.schemas.in=.schemas)
+schemasdir = $(GCONF_SCHEMA_FILE_DIR)
+schemas_in_files = billreminder.schemas.in
+schemas_DATA = $(schemas_in_files:.schemas.in=.schemas)
+
+CLEANFILES = $(schemas_DATA)
 
 #DBus Service
 servicedir = $(DBUS_SERVICES_DIR)
 service_in_files = billreminder.service.in
-service_DATA = billreminder.service
+service_DATA = $(service_in_files:.service.in=.service)
 
-CLEANFILES = $(service_DATA)
+CLEANFILES += $(service_DATA)
 
 billreminder.service: billreminder.service.in
 	sed -e s!\ bindir\@!$(bindir)! \
@@ -42,7 +39,7 @@
 if GCONF_SCHEMAS_INSTALL
 install-data-local:
 	@GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) \
-		--makefile-install-rule $(schema_DATA) || \
+		--makefile-install-rule $(schemas_DATA) || \
 		(echo ;\
 		echo "*****************************************************"; \
 		echo "Installation of schemas failed, install them manually"; \
@@ -57,12 +54,8 @@
 endif
 
 EXTRA_DIST = \
-	$(config_DATA) \
-	$(schemas_DATA) \
+	$(schemas_in_files) \
 	$(service_in_files) \
 	$(desktop_in_files) \
 	$(autostart_in_files)
 
-
-uninstall-hook:
-	rm -fr $(configdir)

Modified: trunk/data/billreminder.schemas.in
==============================================================================
--- trunk/data/billreminder.schemas.in	(original)
+++ trunk/data/billreminder.schemas.in	Mon Sep  8 23:59:54 2008
@@ -203,13 +203,13 @@
       </locale>
     </schema>
 
-   <schema>
+    <schema>
       <key>/schemas/apps/billreminder/delay</key>
       <applyto>/apps/billreminder/delay</applyto>
       <owner>billreminder</owner>
       <type>int</type>
       <default>1</default>
-      <locale name="C"/>
+      <locale name="C">
         <short>Delay between notifications.</short>
         <long>Delay between notifications.</long>
       </locale>
@@ -221,7 +221,7 @@
       <owner>billreminder</owner>
       <type>bool</type>
       <default>false</default>
-      <locale name="C"/>
+      <locale name="C">
         <short>Start the application in the system's tray.</short>
         <long>Whether to start the application in the system's tray.</long>
       </locale>

Modified: trunk/data/images/Makefile.am
==============================================================================
--- trunk/data/images/Makefile.am	(original)
+++ trunk/data/images/Makefile.am	Mon Sep  8 23:59:54 2008
@@ -43,19 +43,6 @@
 	@-$(mkinstalldirs) $(DESTDIR)$(hicolordir)/scalable/apps
 	$(INSTALL_DATA) $(srcdir)/billreminder.svg $(DESTDIR)$(hicolordir)/scalable/apps/billreminder.svg
 
-uninstall-hook:
-	rm -f $(DESTDIR)$(hicolordir)/scalable/apps/billreminder.svg
-	rm -f $(DESTDIR)$(hicolordir)/128x128/apps/billreminder.png
-	rm -f $(DESTDIR)$(hicolordir)/96x96/apps/billreminder.png
-	rm -f $(DESTDIR)$(hicolordir)/72x72/apps/billreminder.png
-	rm -f $(DESTDIR)$(hicolordir)/64x64/apps/billreminder.png
-	rm -f $(DESTDIR)$(hicolordir)/48x48/apps/billreminder.png
-	rm -f $(DESTDIR)$(hicolordir)/32x32/apps/billreminder.png
-	rm -f $(DESTDIR)$(hicolordir)/24x24/apps/billreminder.png
-	rm -f $(DESTDIR)$(hicolordir)/22x22/apps/billreminder.png
-	rm -f $(DESTDIR)$(hicolordir)/20x20/apps/billreminder.png
-	rm -f $(DESTDIR)$(hicolordir)/16x16/apps/billreminder.png
-
 imagesdir = $(datadir)/billreminder/images
 images_DATA = \
 	billreminder.png \
@@ -86,3 +73,17 @@
 		echo "*** Icon cache not updated. After install, run this:"; \
 		echo "***   $(gtk_update_icon_cache)"; \
 	fi
+	
+uninstall-hook:
+	rm -f $(DESTDIR)$(hicolordir)/scalable/apps/billreminder.svg
+	rm -f $(DESTDIR)$(hicolordir)/128x128/apps/billreminder.png
+	rm -f $(DESTDIR)$(hicolordir)/96x96/apps/billreminder.png
+	rm -f $(DESTDIR)$(hicolordir)/72x72/apps/billreminder.png
+	rm -f $(DESTDIR)$(hicolordir)/64x64/apps/billreminder.png
+	rm -f $(DESTDIR)$(hicolordir)/48x48/apps/billreminder.png
+	rm -f $(DESTDIR)$(hicolordir)/32x32/apps/billreminder.png
+	rm -f $(DESTDIR)$(hicolordir)/24x24/apps/billreminder.png
+	rm -f $(DESTDIR)$(hicolordir)/22x22/apps/billreminder.png
+	rm -f $(DESTDIR)$(hicolordir)/20x20/apps/billreminder.png
+	rm -f $(DESTDIR)$(hicolordir)/16x16/apps/billreminder.png
+	rm -rf $(DESTDIR)$(datadir)/billreminder