Merge pull request #14 from sebastien-villemot/master

Patch currently applied to the Debian package
This commit is contained in:
Stefan Karpinski 2012-12-18 08:58:23 -08:00
commit e08651b8a9
2 changed files with 4 additions and 4 deletions

View file

@ -4,12 +4,12 @@ OS = $(shell uname)
ARCH = $(shell uname -m) ARCH = $(shell uname -m)
FC = gfortran FC = gfortran
FFLAGS = -O3 FFLAGS += -O3
USEGCC = 1 USEGCC = 1
USECLANG = 0 USECLANG = 0
CFLAGS= -std=c99 -Wall -O3 -I$(OPENLIBM_HOME) -I$(OPENLIBM_HOME)/include -I$(OPENLIBM_HOME)/ld80 -I$(OPENLIBM_HOME)/$(ARCH) -I$(OPENLIBM_HOME)/src -DASSEMBLER -D__BSD_VISIBLE -Wno-implicit-function-declaration CFLAGS += -std=c99 -Wall -O3 -I$(OPENLIBM_HOME) -I$(OPENLIBM_HOME)/include -I$(OPENLIBM_HOME)/ld80 -I$(OPENLIBM_HOME)/$(ARCH) -I$(OPENLIBM_HOME)/src -DASSEMBLER -D__BSD_VISIBLE -Wno-implicit-function-declaration
ifeq ($(USECLANG),1) ifeq ($(USECLANG),1)
USEGCC = 0 USEGCC = 0
@ -25,7 +25,7 @@ endif
default: all default: all
%.c.o: %.c %.c.o: %.c
$(CC) $(CFLAGS) -c $< -o $@ $(CC) $(CPPFLAGS) $(CFLAGS) -c $< -o $@
%.f.o: %.f %.f.o: %.f
$(FC) $(FFLAGS) -c $< -o $@ $(FC) $(FFLAGS) -c $< -o $@

View file

@ -26,7 +26,7 @@ all: libopenlibm.a libopenlibm.$(SHLIB_EXT)
libopenlibm.a: $(OBJS) libopenlibm.a: $(OBJS)
ar -rcs libopenlibm.a $(OBJS) ar -rcs libopenlibm.a $(OBJS)
libopenlibm.$(SHLIB_EXT): $(OBJS) libopenlibm.$(SHLIB_EXT): $(OBJS)
$(FC) -shared $(OBJS) -o libopenlibm.$(SHLIB_EXT) $(FC) -shared $(OBJS) $(LDFLAGS) -o libopenlibm.$(SHLIB_EXT)
distclean: distclean:
rm -f $(OBJS) *.a *.$(SHLIB_EXT) rm -f $(OBJS) *.a *.$(SHLIB_EXT)