simplify build

4 files changed, 29 insertions, 14 deletions

diff --git a/ds9/macosx/Makefile.in b/ds9/macosx/Makefile.in
index 5063a8e..bfa4dbc 100644
--- a/ds9/macosx/Makefile.in
+++ b/ds9/macosx/Makefile.in
@@ -152,9 +152,8 @@ ds9base	: $(OBJS)
 	$(TK_LIBS) \
 	$(LIBS)
 
-appdir	:
-	rm -rf $(APPDIR)
-	cp -rp SAOImage\ DS9.app $(bindir)/.
+$(APPDIR):
+	cp -rp SAOImage\ DS9.app $@
 
 tcl	:
 	cp -p $(prefix)/build/tcl/Tcl.framework/Versions/8.6/Tcl $(TCLFW)/.
@@ -185,5 +184,12 @@ compiler:
 cleanup:
 	cd $(APPDIR); find . -name keepme -exec rm -rf {} \;
 
+#--------------------------clean
+
+.PHONY	: clean
+
+clean	:
+	$(RM) core *~ *# *.o
+
 include ../make.include
 
diff --git a/ds9/make.include b/ds9/make.include
index 5cf7909..61aa5c4 100644
--- a/ds9/make.include
+++ b/ds9/make.include
@@ -52,12 +52,9 @@ math	:
 	mkdir $(LIBDIR)/math
 	cp -r $(prefix)/tcllib/modules/math/*.tcl $(LIBDIR)/math/.
 
-#--------------------------cleanup
+#--------------------------distclean
 
-.PHONY	: clean distclean
-
-clean	:
-	$(RM) core *~ *# ds9base ds9 *.zip *.o
+.PHONY	: distclean
 
 distclean: clean
 	-rm -f Makefile config.cache config.log config.status
diff --git a/ds9/unix/Makefile.in b/ds9/unix/Makefile.in
index 1cc17cf..e93a345 100644
--- a/ds9/unix/Makefile.in
+++ b/ds9/unix/Makefile.in
@@ -163,9 +163,8 @@ tkAppInit.o : tkAppInit.c
 tkAppInit.c : $(prefix)/tk$(TCL_VERSION)/unix/tkAppInit.c
 	cp $(prefix)/tk$(TCL_VERSION)/unix/tkAppInit.c .
 
-appdir : 
-	rm -rf $(APPDIR)
-	mkdir $(APPDIR)
+$(APPDIR) : 
+	mkdir -p $@
 
 tcl	: $(prefix)/lib/tcl$(TCL_VERSION)
 	cp -r $(prefix)/lib/tcl$(TCL_VERSION) $(APPDIR)/.
@@ -176,6 +175,13 @@ tk	: $(prefix)/lib/tk$(TCL_VERSION)
 	rm -rf $(APPDIR)/tk$(TCL_VERSION)/images
 	rm -rf $(APPDIR)/tk$(TCL_VERSION)/demos
 
+#--------------------------clean
+
+.PHONY	: clean
+
+clean	:
+	$(RM) core *~ *# ds9base ds9 *.zip *.o
+
 include ../make.include
 
 
diff --git a/ds9/win/Makefile.in b/ds9/win/Makefile.in
index 04c69e9..6a0ad39 100755
--- a/ds9/win/Makefile.in
+++ b/ds9/win/Makefile.in
@@ -137,9 +137,8 @@ ds9.res.o: ds9.rc ds9.ico
 	--include $(prefix)/tk$(TCL_VERSION)/win/rc \
 	ds9.rc
 
-appdir	:
-	rm -rf $(APPDIR)
-	mkdir $(APPDIR)
+$(APPDIR):
+	mkdir -p $@
 
 tcl	:
 	cp -pr $(prefix)/lib/tcl8 $(APPDIR)/.
@@ -154,5 +153,12 @@ xpa	:
 vbs	:
 	cp install.vbs $(APPDIR)/.
 
+#--------------------------clean
+
+.PHONY	: clean
+
+clean	:
+	$(RM) core *~ *# *.zip *.o
+
 include ../make.include