Index: branches/AddingGoogleTestEnvironment/Makefile
===================================================================
--- branches/AddingGoogleTestEnvironment/Makefile	(revision 18012)
+++ branches/AddingGoogleTestEnvironment/Makefile	(revision 18015)
@@ -21,5 +21,5 @@
 #
 #PROGRAMS = readraw merpp mars test mona status
-PROGRAMS := readdaq readraw readcorsika ceres merpp callisto star ganymed sponde showlog showplot mars mars-config
+PROGRAMS := run_tests readdaq readraw readcorsika ceres merpp callisto star ganymed sponde showlog showplot mars mars-config
 SOLIB    := libmars.so
 
@@ -134,5 +134,5 @@
 $(SOLIB): $(LIBRARIES) $(OBJS) $(HEADERS)
 	@echo " Linking shared object $@ ..."
-	$(LINKER) $(CXXFLAGS) $(SOFLAG) $(OBJS) $(SUBDIRS:=/*.o) $(ROOTGLIBS) $(LIBNOVA) -o ${RNDMNAME}
+	$(LINKER) $(CXXFLAGS) $(SOFLAG) $(OBJS) $(SUBDIRS:=/*.o) $(ROOTGLIBS) $(LIBNOVA) -o ${RNDMNAME} $(GTESTLIBS)
 	mv ${RNDMNAME} $@
 	chmod go+r $@
@@ -143,5 +143,5 @@
 $(PROGRAMS): $(PROGRAMS:=.o) $(SOLIB)
 	@echo " Linking $@ ..." 
-	$(LINKER) $(CXXFLAGS) $@.o $(MARS_LIB) $(SOLIB) $(ROOTGLIBS) -o $@
+	$(LINKER) $(CXXFLAGS) $@.o $(MARS_LIB) $(SOLIB) $(ROOTGLIBS) -o $@ $(GTESTLIBS)
 
 # Use this to link the programs statically - for gprof
@@ -152,9 +152,9 @@
 $(DYLIB): $(LIBRARIES) $(OBJS) $(HEADERS)
 	@echo " Linking dylib $(DYLIB) ..."
-	$(LINKER) $(CXXFLAGS) $(DYFLAG) $(OBJS) $(SUBDIRS:=/*.o) $(ROOTGLIBS) -o $@
+	$(LINKER) $(CXXFLAGS) $(DYFLAG) $(OBJS) $(SUBDIRS:=/*.o) $(ROOTGLIBS) -o $@ $(GTESTLIBS)
 
 $(PROGRAMS): $(PROGRAMS:=.o) $(DYLIB)
 	@echo " Linking mac executable $@ ..." 
-	$(LINKER) $(CXXFLAGS) $(ROOTGLIBS) $(DYLIB) $@.o $(MARS_LIB) -o $@
+	$(LINKER) $(CXXFLAGS) $(ROOTGLIBS) $(DYLIB) $@.o $(MARS_LIB) -o $@ $(GTESTLIBS)
 endif