From 4e038ef82b626b47adf9e28531235cdca9066be7 Mon Sep 17 00:00:00 2001 From: Matthias Melcher Date: Fri, 28 Apr 2006 01:10:00 +0000 Subject: STR #1169: Fixed 'make distclean' to remove binaries inside MacOS app packages git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@5040 ea41ed52-d2ee-0310-a9c1-e6b18d33e121 --- CHANGES | 2 ++ Makefile | 4 ++-- fluid/Makefile | 1 + test/Makefile | 2 ++ 4 files changed, 7 insertions(+), 2 deletions(-) diff --git a/CHANGES b/CHANGES index 3beb0fbcb..6f623e3a1 100644 --- a/CHANGES +++ b/CHANGES @@ -1,5 +1,7 @@ CHANGES IN FLTK 1.1.8 + - Fixed 'make distclean' to remove binaries inside + MacOS app packages (STR #1169) - Fluid Code Viewer is now truly a viewer, not a text editor because edited text can not be saved. - Fl_Spinner is now fully supported by Fluid (STR #1158) diff --git a/Makefile b/Makefile index d2d64fcf3..4c90ab132 100644 --- a/Makefile +++ b/Makefile @@ -85,8 +85,8 @@ distclean: clean $(RM) documentation/fltk.ps $(RM) -r documentation/fltk.d for file in test/*.fl; do\ - $(RM) test/`basename $file .fl`.cxx; \ - $(RM) test/`basename $file .fl`.h; \ + $(RM) test/`basename $$file .fl`.cxx; \ + $(RM) test/`basename $$file .fl`.h; \ done makeinclude: configure configh.in makeinclude.in diff --git a/fluid/Makefile b/fluid/Makefile index 92eba552a..a85634711 100644 --- a/fluid/Makefile +++ b/fluid/Makefile @@ -70,6 +70,7 @@ fluid-shared$(EXEEXT): $(OBJECTS) ../src/$(DSONAME) ../src/$(FLDSONAME) \ clean: -$(RM) *.o core.* *~ *.bck *.bck -$(RM) core fluid$(EXEEXT) fluid-shared$(EXEEXT) + -$(RM) fluid.app/Contents/MacOS/fluid depend: $(CPPFILES) makedepend -Y -I.. -f makedepend $(CPPFILES) diff --git a/test/Makefile b/test/Makefile index 3aa9463a9..12d23d6b2 100644 --- a/test/Makefile +++ b/test/Makefile @@ -173,6 +173,8 @@ include makedepend clean: -$(RM) $(ALL) $(GLALL) core -$(RM) *.o core.* *~ *.bck *.bak + -$(RM) checkers.app/Contents/MacOS/checkers + -$(RM) sudoku.app/Contents/MacOS/sudoku install: echo "Installing example programs to $(DESTDIR)$(docdir)/examples..." -- cgit v1.2.3