Index: /trunk/magic/magic/makefile
===================================================================
--- /trunk/magic/magic/makefile	(revision 24554)
+++ /trunk/magic/magic/makefile	(revision 24555)
@@ -1,32 +1,38 @@
-#
-# This makefile is used in place of the one in Paul Sydneys' tarball
-# 
-# XXX integrate with the build system
-#
-TARGETS = DetectStreaks
-SSA_SRC_DIR = ../ssa-core-cpp/src
-CFITSIO_DIR = ../cfitsio
-CFITSIO_DIR = $(PSCONFDIR)/$(PSCONFIG)
-INCLUDEDIRS = -I$(SSA_SRC_DIR) -I$(CFITSIO_DIR)/include
-# INCLUDEDIRS = -I$(SSA_SRC_DIR)
+TARGETS =  DetectStreaks
 
 CXX = c++
-CXXFLAGS = -Wall -g
-CXXFLAGS = -Wall -O3 -DNDEBUG
+CXXFLAGS = -W -Wall -O3 -DNDEBUG
+# CXXFLAGS = -W -Wall -g
 
-SRCS = $(TARGETS).cpp $(SSA_SRC_DIR)/math/Constants.cpp
-LIBS = -L$(CFITSIO_DIR) -lcfitsio
-LIBS = -L$(CFITSIO_DIR)/lib -lcfitsio
-# LIBS = -lcfitsio
+SSA_SRC_DIR = ../ssa-core-cpp/src
+INCLUDEDIRS = -I. -I$(SSA_SRC_DIR)
+OTHER_SRCS = $(SSA_SRC_DIR)/math/Constants.cpp
 
-$(TARGETS) : $(SRCS)
-	   $(CXX) $(CXXFLAGS) $(INCLUDEDIRS) $(SRCS) $(LIBS) -o $@
+# CFITSIO_DIR = ../cfitsio
+CFITSIO_DIR = $(PSCONFDIR)/$(PSCONFIG)
+
+CFITSIO_INC =  -I$(CFITSIO_DIR)
+CFITSIO_LIB = -L$(CFITSIO_DIR) -lcfitsio
+
+all : $(TARGETS)
+
+RemoveStreaks : $(OTHER_SRCS)
+
+DetectStats : $(OTHER_SRCS)
+
+% :: %.cpp
+	$(CXX) $(CXXFLAGS) $(INCLUDEDIRS) $(CFITSIO_INC) $< $(OTHER_SRCS) $(CFITSIO_LIB) -o $@
+
+.PHONY : clean
+
+.SILENT : clean
 
 clean :
-	   -rm -f $(TARGETS)
+	   - rm $(TARGETS)
 
 DESTDIR=$(PSCONFDIR)/$(PSCONFIG)
 
-install:	$(TARGETS)
+install:        $(TARGETS)
 	cp DetectStreaks $(DESTDIR)/bin
 	chmod 755  $(DESTDIR)/bin/DetectStreaks
+