From 5e53a485310cc11e6add077fb4bd0b0267734ff0 Mon Sep 17 00:00:00 2001
From: Mike Beattie <mike@ethernal.org>
Date: Fri, 15 Feb 2013 21:59:08 +1300
Subject: [PATCH] all: clean up .gitignore files and Makefile clean targets

Signed-off-by: Mike Beattie <mike@ethernal.org>
---
 .gitignore            | 1 +
 altosdroid/.gitignore | 1 +
 altoslib/.gitignore   | 4 ++--
 altosui/.gitignore    | 1 +
 altosui/Makefile.am   | 2 +-
 altosuilib/.gitignore | 4 ++++
 micropeak/.gitignore  | 2 ++
 micropeak/Makefile.am | 3 ++-
 src/test/.gitignore   | 4 ++++
 src/test/Makefile     | 2 +-
 10 files changed, 19 insertions(+), 5 deletions(-)
 create mode 100644 altosuilib/.gitignore

diff --git a/.gitignore b/.gitignore
index 9f33ea3c..b7b8fda1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -35,6 +35,7 @@ ao-tools/ao-load/ao-load
 ao-tools/ao-postflight/ao-postflight
 ao-tools/ao-rawload/ao-rawload
 ao-tools/ao-send-telem/ao-send-telem
+ao-tools/ao-sky-flash/ao-sky-flash
 ao-tools/ao-view/ao-view
 ao-view/Makefile
 ao-view/ao-view
diff --git a/altosdroid/.gitignore b/altosdroid/.gitignore
index e3acba40..0d2ee6e0 100644
--- a/altosdroid/.gitignore
+++ b/altosdroid/.gitignore
@@ -1,4 +1,5 @@
 local.properties
 bin
 gen
+libs
 src/org/altusmetrum/AltosDroid/BuildInfo.java
diff --git a/altoslib/.gitignore b/altoslib/.gitignore
index a71d076c..ff0fd710 100644
--- a/altoslib/.gitignore
+++ b/altoslib/.gitignore
@@ -1,3 +1,3 @@
 bin
-classAltosLib.stamp
-AltosLib.jar
+classaltoslib.stamp
+altoslib*.jar
diff --git a/altosui/.gitignore b/altosui/.gitignore
index 6d2d8c23..f8554c6a 100644
--- a/altosui/.gitignore
+++ b/altosui/.gitignore
@@ -12,6 +12,7 @@ altosui
 altosui-test
 altosui-jdb
 classaltosui.stamp
+altos-windows.nsi
 Altos-Linux-*.tar.bz2
 Altos-Mac-*.zip
 Altos-Windows-*.exe
diff --git a/altosui/Makefile.am b/altosui/Makefile.am
index 8ae1a72e..96cf77f2 100644
--- a/altosui/Makefile.am
+++ b/altosui/Makefile.am
@@ -182,7 +182,7 @@ all-local: classes/altosui $(JAR) altosui altosui-test altosui-jdb
 clean-local:
 	-rm -rf classes $(JAR) $(FATJAR) \
 		$(LINUX_DIST) $(MACOSX_DIST) windows $(WINDOWS_DIST) $(ALTOSLIB_CLASS) $(ALTOSUILIB_CLASS) $(FREETTS_CLASS) \
-		$(JFREECHART_CLASS) $(JCOMMON_CLASS) $(LIBALTOS) Manifest.txt Manifest-fat.txt altos-windows.log \
+		$(JFREECHART_CLASS) $(JCOMMON_CLASS) $(LIBALTOS) Manifest.txt Manifest-fat.txt altos-windows.log altos-windows.nsi \
 		altosui altosui-test altosui-jdb macosx linux
 
 if FATINSTALL
diff --git a/altosuilib/.gitignore b/altosuilib/.gitignore
new file mode 100644
index 00000000..4ad8a77a
--- /dev/null
+++ b/altosuilib/.gitignore
@@ -0,0 +1,4 @@
+AltosUIVersion.java
+bin
+classaltosuilib.stamp
+altosuilib*.jar
diff --git a/micropeak/.gitignore b/micropeak/.gitignore
index ab80492b..6a6475f0 100644
--- a/micropeak/.gitignore
+++ b/micropeak/.gitignore
@@ -7,6 +7,7 @@ micropeak
 micropeak-test
 micropeak-jdb
 micropeak-windows.log
+micropeak-windows.nsi
 MicroPeak-Linux-*
 MicroPeak-Mac-*
 MicroPeak-Windows-*
@@ -17,3 +18,4 @@ linux
 macosx
 CDM*.exe
 FTDI*.dmg
+Info.plist
diff --git a/micropeak/Makefile.am b/micropeak/Makefile.am
index d45ecab9..098a00fb 100644
--- a/micropeak/Makefile.am
+++ b/micropeak/Makefile.am
@@ -78,7 +78,8 @@ clean-local:
 		$(ALTOSLIB_CLASS) \
 		$(ALTOSUILIB_CLASS) \
 		$(JFREECHART_CLASS) $(JCOMMON_CLASS) $(LIBALTOS) Manifest.txt Manifest-fat.txt \
-		micropeak micropeak-test micropeak-jdb macosx linux windows micropeak-windows.log
+		micropeak micropeak-test micropeak-jdb macosx linux windows micropeak-windows.log \
+		micropeak-windows.nsi
 
 LINUX_DIST=MicroPeak-Linux-$(VERSION).tar.bz2
 MACOSX_DIST=MicroPeak-Mac-$(VERSION).dmg
diff --git a/src/test/.gitignore b/src/test/.gitignore
index 5d528ab9..8d79d168 100644
--- a/src/test/.gitignore
+++ b/src/test/.gitignore
@@ -1,3 +1,5 @@
+ao_aprs_data.wav
+ao_aprs_test
 ao_flight_test
 ao_flight_test_baro
 ao_flight_test_accel
@@ -6,4 +8,6 @@ ao_gps_test_skytraq
 ao_convert_test
 ao_convert_pa_test
 ao_fec_test
+ao_flight_test_mm
 ao_flight_test_noisy_accel
+ao_micropeak_test
diff --git a/src/test/Makefile b/src/test/Makefile
index 1c2d771e..fccc7937 100644
--- a/src/test/Makefile
+++ b/src/test/Makefile
@@ -13,7 +13,7 @@ CFLAGS=-I.. -I. -I../core -I../drivers -I../micropeak -O0 -g -Wall
 all: $(PROGS) ao_aprs_data.wav
 
 clean:
-	rm -f $(PROGS) run-out.baro run-out.full
+	rm -f $(PROGS) ao_aprs_data.wav run-out.baro run-out.full
 
 install:
 
-- 
2.30.2