Commit 7c98a09b authored by Og B. Maciel's avatar Og B. Maciel

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

svn path=/trunk/; revision=632
parent e5d772da
......@@ -15,7 +15,7 @@ billreminder: billreminder.in
< $< > $@
EXTRA_DIST = billreminder.in
CLEANFILES += billreminderd
CLEANFILES += billreminder
billreminderd: billreminderd.in
-sed -e s!\@PYTHONDIR\@!$(pythondir)! \
......
......@@ -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 @@ CLEANFILES += $(autostart_DATA)
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 @@ install-data-local:
endif
EXTRA_DIST = \
$(config_DATA) \
$(schemas_DATA) \
$(schemas_in_files) \
$(service_in_files) \
$(desktop_in_files) \
$(autostart_in_files)
uninstall-hook:
rm -fr $(configdir)
......@@ -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>
......
......@@ -43,19 +43,6 @@ install-data-local:
@-$(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 @@ install-data-hook:
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
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment