Clean all .desktop files, ignore them too

All .desktop files are built from .desktop.in files, so just remove
all of them in make clean, and ignore all of them in .gitignore.
This makes the rename less painful.

Signed-off-by: Keith Packard <keithp@keithp.com>

diff --git a/altosui/.gitignore b/altosui/.gitignore
index b0c8264b67a48ac29cddd49180f507d24b769fe1..a9b80aa4dbcbaaf12bf0a44bb286737fbaefb112 100644 (file)
--- a/altosui/.gitignore
+++ b/altosui/.gitignore
@@ -17,7 +17,7 @@ Altos-Linux-*.tar.bz2
 Altos-Linux-*.sh
 Altos-Mac-*.zip
 Altos-Windows-*.exe
-altusmetrum-altosui.desktop
+.desktop
 *.dll
 *.dylib
 *.so

diff --git a/altosui/Makefile.am b/altosui/Makefile.am
index 45d75699bc63cf619debc957c759e0825424464b..c79e27c0629581ea5680ea78193e92618475c2bb 100644 (file)
--- a/altosui/Makefile.am
+++ b/altosui/Makefile.am
@@ -167,7 +167,7 @@ clean-local:
        -rm -rf classes $(JAR) $(FATJAR) \
                $(LINUX_DIST) $(LINUX_SH) $(MACOSX_DIST) windows $(WINDOWS_DIST) $(ALTOSLIB_CLASS) $(ALTOSUILIB_CLASS) $(FREETTS_CLASS) \
                $(JFREECHART_CLASS) $(JCOMMON_CLASS) $(LIBALTOS) Manifest.txt Manifest-fat.txt altos-windows.log altos-windows.nsi \
-               altosui altosui-test altosui-jdb macosx linux
+               altosui altosui-test altosui-jdb macosx linux *.desktop
 
 EXTRA_DIST = $(desktop_file).in
 

diff --git a/micropeak/.gitignore b/micropeak/.gitignore
index 81dd0749e57a7b0b00a114c893f9e0412c0c6cf4..2cf940a6cf46094b14f540154a847ac71dca04f1 100644 (file)
--- a/micropeak/.gitignore
+++ b/micropeak/.gitignore
@@ -11,7 +11,7 @@ micropeak-windows.nsi
 MicroPeak-Linux-*
 MicroPeak-Mac-*
 MicroPeak-Windows-*
-altusmetrum-micropeak.desktop
+*.desktop
 *.dll
 *.dylib
 *.so

diff --git a/micropeak/Makefile.am b/micropeak/Makefile.am
index 6270fd746b3a41ab261a413250402720e39c97c8..e3b77c8a17d5726041434767c553c9752513960b 100644 (file)
--- a/micropeak/Makefile.am
+++ b/micropeak/Makefile.am
@@ -95,7 +95,7 @@ clean-local:
                $(ALTOSUILIB_CLASS) \
                $(JFREECHART_CLASS) $(JCOMMON_CLASS) $(LIBALTOS) Manifest.txt Manifest-fat.txt \
                micropeak micropeak-test micropeak-jdb macosx linux windows micropeak-windows.log \
-               micropeak-windows.nsi
+               micropeak-windows.nsi *.desktop
 
 EXTRA_DIST = $(desktop_file).in
 

diff --git a/telegps/.gitignore b/telegps/.gitignore
index 37e46ad12153bf8dcd54cc339b96e61a2b49092c..1af9e0f1e2857f1968da417c7760dc27ced8de8d 100644 (file)
--- a/telegps/.gitignore
+++ b/telegps/.gitignore
@@ -17,7 +17,7 @@ TeleGPS-Linux-*.tar.bz2
 TeleGPS-Linux-*.sh
 TeleGPS-Mac-*.zip
 TeleGPS-Windows-*.exe
-altusmetrum-telegps.desktop
+*.desktop
 telegps-windows.log
 *.dll
 *.dylib

diff --git a/telegps/Makefile.am b/telegps/Makefile.am
index 3f53b949bb94eb55a540d971c2e214c77e8e8c83..6138b00465735c3978b2bca2c0caa65ed12371a3 100644 (file)
--- a/telegps/Makefile.am
+++ b/telegps/Makefile.am
@@ -112,7 +112,7 @@ clean-local:
                $(ALTOSUILIB_CLASS) \
                $(JFREECHART_CLASS) $(JCOMMON_CLASS) $(LIBALTOS) Manifest.txt Manifest-fat.txt \
                telegps telegps-test telegps-jdb macosx linux windows telegps-windows.log \
-               telegps-windows.nsi
+               telegps-windows.nsi *.desktop
 
 EXTRA_DIST = $(desktop_file).in