micropeak: fix 'make clean' and .gitignore

Make git status clean in micropeak dir

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

diff --git a/micropeak/.gitignore b/micropeak/.gitignore
index fc99b31c5dae56f5a37d4106f3ca6ebff77ec53c..ab80492bacd5045aceb24964cc5cbebd5ca47308 100644 (file)
--- a/micropeak/.gitignore
+++ b/micropeak/.gitignore
@@ -1,6 +1,19 @@
 *.jar
 Manifest.txt
+Manifest-fat.txt
 classes
 *.stamp
 micropeak
 micropeak-test
+micropeak-jdb
+micropeak-windows.log
+MicroPeak-Linux-*
+MicroPeak-Mac-*
+MicroPeak-Windows-*
+*.dll
+*.dylib
+*.so
+linux
+macosx
+CDM*.exe
+FTDI*.dmg

diff --git a/micropeak/Makefile.am b/micropeak/Makefile.am
index 06eb3115a0b00dadcf18dde14135f8431ff54184..d221de38ba05ec1c3d0e59a1f08a45e079a1f36e 100644 (file)
--- a/micropeak/Makefile.am
+++ b/micropeak/Makefile.am
@@ -74,16 +74,20 @@ all-local: micropeak-test micropeak-jdb $(JAR)
 
 clean-local:
        -rm -rf classes $(JAR) $(FATJAR) \
-               $(LINUX_DIST) $(MACOSX_DIST) windows $(WINDOWS_DIST) \
+               MicroPeak-Linux-*.tar.bz2 MicroPeak-Mac-*.dmg MicroPeak-Windows-*.exe \
                $(ALTOSLIB_CLASS) \
                $(ALTOSUILIB_CLASS) \
-               $(JFREECHART_CLASS) $(JCOMMON_CLASS) $(LIBALTOS) Manifest.txt \
-               micropeak micropeak-test macosx linux windows
+               $(JFREECHART_CLASS) $(JCOMMON_CLASS) $(LIBALTOS) Manifest.txt Manifest-fat.txt \
+               micropeak micropeak-test micropeak-jdb macosx linux windows micropeak-windows.log
 
 LINUX_DIST=MicroPeak-Linux-$(VERSION).tar.bz2
 MACOSX_DIST=MicroPeak-Mac-$(VERSION).dmg
 WINDOWS_DIST=MicroPeak-Windows-$(VERSION_DASH).exe
 
+MICROPEAK_DOC=$(top_srcdir)/doc/micropeak.pdf
+
+DOC=$(MICROPEAK_DOC)
+
 FAT_FILES=$(FATJAR) $(ALTOSLIB_CLASS) $(ALTOSUILIB_CLASS) $(FREETTS_CLASS) $(JFREECHART_CLASS) $(JCOMMON_CLASS)
 
 LINUX_FILES=$(FAT_FILES) libaltos.so $(FIRMWARE) $(DOC)
@@ -93,7 +97,7 @@ MACOSX_DRIVER_URL=http://www.ftdichip.com/Drivers/VCP/MacOSX/FTDIUSBSerialDriver
 MACOSX_DRIVER=FTDIUSBSerialDriver_v2_2_18.dmg
 MACOSX_INFO_PLIST=Info.plist
 MACOSX_README=ReadMe-Mac.rtf
-MACOSX_FILES=$(FAT_FILES) libaltos.dylib $(MACOSX_INFO_PLIST) $(MACOSX_DRIVER) $(MACOSX_README)
+MACOSX_FILES=$(FAT_FILES) libaltos.dylib $(MACOSX_INFO_PLIST) $(MACOSX_DRIVER) $(MACOSX_README) $(DOC)
 
 $(MACOSX_DRIVER):
        wget $(MACOSX_DRIVER_URL)
@@ -104,7 +108,7 @@ WINDOWS_DRIVER=CDM20824_Setup.exe
 $(WINDOWS_DRIVER):
        wget $(WINDOWS_DRIVER_URL)
 
-WINDOWS_FILES=$(FAT_FILES) altos.dll altos64.dll $(top_srcdir)/telemetrum.inf $(WINDOWS_ICON) $(WINDOWS_DRIVER)
+WINDOWS_FILES=$(FAT_FILES) altos.dll altos64.dll $(DOC) $(WINDOWS_ICON) $(WINDOWS_DRIVER)
 
 if FATINSTALL
 
@@ -228,6 +232,7 @@ $(MACOSX_DIST): $(MACOSX_FILES)
        mkdir macosx
        cp -a MicroPeak.app macosx/
        cp -a $(MACOSX_README) macosx/ReadMe.rtf
+       cp -a $(DOC) macosx
        cp -p Info.plist macosx/MicroPeak.app/Contents
        cp -p $(MACOSX_DRIVER) macosx
        mkdir -p macosx/MicroPeak.app/Contents/Resources/Java