Merge branch 'master' of https://github.com/JuliaLang/openlibm

Conflicts: Makefile
2012-05-25 16:25:37 -04:00 · 2012-05-25 16:25:37 -04:00 · 1b4a845c71
parent 307d7361c5 4a9ac47ae8
commit 1b4a845c71
2 changed files with 1 additions and 3 deletions
--- a/Make.inc
+++ b/Make.inc
@ -4,7 +4,7 @@ CFLAGS= -Wall -O2 -I$(OPENLIBM_HOME) -I$(OPENLIBM_HOME)/include -I$(OPENLIBM_HOM
 default: all

 %.c.o: %.c
-	$(QUIET_CC)$(CC) $(CFLAGS) -c $< -o $@
+	$(CC) $(CFLAGS) -c $< -o $@

 %.S.o: %.S
 	$(QUIET_ASM)$(CC) $(filter -f% -m% -B% -I% -D%,$(CFLAGS)) -c $< -o $@
--- a/2
+++ b/2
@ -24,8 +24,6 @@ libopenlibm.a: $(OBJS)
 	$(QUIET_LINK)ar -rcs libopenlibm.a $(OBJS)
 libopenlibm.$(SHLIB_EXT): $(OBJS)
 	$(QUIET_LINK)$(CC) -shared -fPIC $(OBJS) -o libopenlibm.$(SHLIB_EXT)
-echo:
-	echo $(TEST)

 cleanall:
 	rm -f $(OBJS) *.a *.$(SHLIB_EXT)