[Python-modules-commits] [cf-python] 07/11: Improve umread building and handling.

[Klaus Zimmermann]

This is an automated email from the git hooks/post-receive script.

zklaus-guest pushed a commit to branch master
in repository cf-python.

commit fccd1318619b628ce06d6b3247408923a27e5edd
Author: Klaus Zimmermann <klaus_zimmermann at gmx.de>
Date:   Thu Sep 22 17:02:12 2016 +0200

    Improve umread building and handling.
    
    Signed-off-by: Klaus Zimmermann <klaus_zimmermann at gmx.de>
---
 cf/um/umread/c-lib/Makefile          | 14 +++++++-------
 cf/um/umread/c-lib/type-dep/Makefile |  6 ++++--
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/cf/um/umread/c-lib/Makefile b/cf/um/umread/c-lib/Makefile
index 98d0685..48c5744 100644
--- a/cf/um/umread/c-lib/Makefile
+++ b/cf/um/umread/c-lib/Makefile
@@ -2,11 +2,11 @@ HEADERS=umfile.h umfileint.h bits/*.h
 
 LIBRARY=umfile.so
 
-CC=gcc
-CFLAGS=-Wall -fPIC -g
-CPP=gcc -E -P
-LD=ld
-LDFLAGS=-shared --build-id
+CC ?= gcc
+CFLAGS += -Wall -fPIC -g
+CPP ?= gcc -E -P
+LD ?= gcc
+LDFLAGS += -shared
 OBJS = umfile.o error.o filetype.o \
 	malloc.o linklist.o new_structs.o swap.o
 
@@ -28,10 +28,10 @@ type-dep:
 	$(MAKE) -C $(TYPE_DEP_DIR)
 
 $(LIBRARY): $(OBJS) type-dep
-	$(LD) $(LDFLAGS) -o $@ $(OBJS) --whole-archive $(TYPE_DEP_LIBRARY_PATH)
+	$(LINK.c) $(OBJS) -Wl,--whole-archive $(TYPE_DEP_LIBRARY_PATH) -Wl,--no-whole-archive \
+                  $(LOADLIBES) $(LDLIBS) -o $@
 
 %.o: %.c $(HEADERS)
-	$(CC) $(CFLAGS) -c $<
 
 #bits/protos_sgl.h: bits/type_dep_protos.h
 #	$(CPP) -DBUILD_HDR -DSINGLE $< > $@
diff --git a/cf/um/umread/c-lib/type-dep/Makefile b/cf/um/umread/c-lib/type-dep/Makefile
index 381c4a8..66633a1 100644
--- a/cf/um/umread/c-lib/type-dep/Makefile
+++ b/cf/um/umread/c-lib/type-dep/Makefile
@@ -24,11 +24,13 @@ all: $(LIB)
 clean:
 	rm -f $(OBJS) $(TMP_OBJS) $(LIB) $(REDEFINES_SGL) $(REDEFINES_DBL)
 
+%_dbl_tmp.o: CFLAGS += -DDOUBLE
 %_dbl_tmp.o: %.c $(HEADERS)
-	$(CC) $(CFLAGS) -c -DDOUBLE -o $@ $<
+	$(COMPILE.c) $(OUTPUT_OPTION) $<
 
+%_sgl_tmp.o: CFLAGS += -DSINGLE
 %_sgl_tmp.o: %.c $(HEADERS)
-	$(CC) $(CFLAGS) -c -DSINGLE -o $@ $<
+	$(COMPILE.c) $(OUTPUT_OPTION) $<
 
 %_sgl.o: %_sgl_tmp.o $(REDEFINES_SGL)
 	objcopy --redefine-syms=$(REDEFINES_SGL) $< $@

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/cf-python.git