merged trunk

Makefile.in

@@ -5,7 +5,7 @@ PROGS=selective_cfi.exe
 CXX=@CXX@
 CXXFLAGS= 
 INCLUDE=-I. -I../include -I../xform -I../../beaengine/include -I../../libIRDB/include/ -I../../libMEDSannotation/include/ -I../libtransform/include/ -I../transforms
-CXXFLAGS= @EXTRA_CXXFLAGS@ $(INCLUDE) -Wall
+CXXFLAGS= @EXTRA_CXXFLAGS@ $(INCLUDE) 
 LIBS=-L../../lib -lxform -lIRDB-core -lIRDB-cfg -lBeaEngine_s_d -lpqxx  -lMEDSannotation -ltransform ../transforms/Rewrite_Utility.o
 
 
@@ -27,7 +27,7 @@ all: $(programs)
 	@#
 	@# build dependencies --  http://scottmcpeak.com/autodepend/autodepend.html
 	@#
-	$(CXX) -MM $(CXXFLAGS) $*.cpp > $*.d
+	@cpp -MM $(CXXFLAGS) $*.cpp > $*.d 2> /dev/null || true		# might fail on solaris with CXX=sun's CC.
 	@cp -f $*.d $*.d.tmp
 	@sed -e 's/.*://' -e 's/\\$$//' < $*.d.tmp | fmt -1 | sed -e 's/^ *//' -e 's/$$/:/' >> $*.d
 	@rm -f $*.d.tmp