luci-0.9: merge r6443

diff --git a/libs/px5g/Makefile b/libs/px5g/Makefile
index 2773b700dbe9feccd6586d95dc790d79584ce70e..80a650ed00329f16d2f63f2c0238152a53eb754d 100644 (file)
--- a/libs/px5g/Makefile
+++ b/libs/px5g/Makefile
@@ -3,18 +3,21 @@ include ../../build/module.mk
 include ../../build/gccconfig.mk
 
 PX5G_LIB_CFLAGS = -Isrc/ -include src/polarssl/rsa.h \
-       -include src/polarssl/x509.h
-PX5G_OBJ_CFLAGS = -Isrc/
+       -include src/polarssl/x509.h \
+       $(CPPFLAGS) $(CFLAGS) $(EXTRA_CFLAGS) $(WFLAGS)
+
+PX5G_OBJ_CFLAGS = -Isrc/ \
+       $(CPPFLAGS) $(CFLAGS) $(EXTRA_CFLAGS) $(WFLAGS)
 
 PX5G_LIB = src/library/bignum.o src/library/havege.o src/library/rsa.o \
                src/library/sha1.o src/library/timing.o src/library/x509write.o
 PX5G_OBJ = src/px5g.o
 
 src/library/%.o: src/library/%.c
-       $(COMPILE) $(PX5G_LIB_CFLAGS) $(FPIC) -c -o $@ $< 
+       $(CC) $(PX5G_LIB_CFLAGS) $(FPIC) -c -o $@ $<
 
 %.o: %.c
-       $(COMPILE) $(PX5G_OBJ_CFLAGS) $(LUA_CFLAGS) $(FPIC) -c -o $@ $<
+       $(CC) $(PX5G_OBJ_CFLAGS) $(LUA_CFLAGS) $(FPIC) -c -o $@ $<
 
 compile: $(PX5G_LIB) $(PX5G_OBJ)
        $(LINK) $(SHLIB_FLAGS) -o src/px5g.so $(PX5G_OBJ) $(PX5G_LIB)