Fixes for Apple gcc 4.0.0

Makefile

@@ -16,23 +16,19 @@ XFILES = siena_diff surface_norm cylsamp groupttest
 
 SCRIPTS = siena siena_flirt siena_cal sienax siena_flow2tal
 
-OPTFLAGS=
-
-MJOPTFLAGS=-O3
-
 all:	${XFILES} docscripts
 
 siena_diff: siena_diff.c
-	$(CC) $(CFLAGS) -DFDT="float" -o siena_diff siena_diff.c $(LDFLAGS) $(LIBS)
+	$(CC) $(CFLAGS)  -DFDT="float" -o siena_diff siena_diff.c $(LDFLAGS) $(LIBS)
 
 surface_norm: ${SN_OBJS}
-	${CXX} ${CXXFLAGS} ${MJOPTFLAGS} ${LDFLAGS} -o $@ ${SN_OBJS} ${LIBCC}
+	${CXX} ${LDFLAGS} -o $@ ${SN_OBJS} ${LIBCC}
 
 cylsamp: ${CS_OBJS}
-	${CXX} ${CXXFLAGS} ${MJOPTFLAGS} ${LDFLAGS} -o $@ ${CS_OBJS} ${LIBCC}
+	${CXX} ${LDFLAGS} -o $@ ${CS_OBJS} ${LIBCC}
 
 groupttest: ${GT_OBJS}
-	${CXX} ${CXXFLAGS} ${MJOPTFLAGS} ${LDFLAGS} -o $@ ${GT_OBJS} ${LIBCC}
+	${CXX} ${LDFLAGS} -o $@ ${GT_OBJS} ${LIBCC}
 
 docscripts:
 	./makedoc