summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKeith Packard <keithp@keithp.com>2014-06-24 20:31:50 -0700
committerKeith Packard <keithp@keithp.com>2014-06-24 20:58:49 -0700
commitb2c5f7d10265794a5778546f2e3eca7d763eab56 (patch)
treebae3475ebb32b6642c02df9812e9443a3ff833df
parentd1065424d144b8dab949db7e57140ffdf244bd48 (diff)
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>
-rw-r--r--altosui/.gitignore2
-rw-r--r--altosui/Makefile.am2
-rw-r--r--micropeak/.gitignore2
-rw-r--r--micropeak/Makefile.am2
-rw-r--r--telegps/.gitignore2
-rw-r--r--telegps/Makefile.am2
6 files changed, 6 insertions, 6 deletions
diff --git a/altosui/.gitignore b/altosui/.gitignore
index b0c8264b..a9b80aa4 100644
--- 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 45d75699..c79e27c0 100644
--- 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 81dd0749..2cf940a6 100644
--- 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 6270fd74..e3b77c8a 100644
--- 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 37e46ad1..1af9e0f1 100644
--- 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 3f53b949..6138b004 100644
--- 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