Module: kamailio Branch: master Commit: 69ba762794f585288ee367cbbdfdc6967b7b8f79 URL: https://github.com/kamailio/kamailio/commit/69ba762794f585288ee367cbbdfdc69… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-06-09T12:57:07+02:00 app_sqlang: updates to the build system for sqlang libs --- Modified: src/modules/app_sqlang/Makefile Modified: src/modules/app_sqlang/squirrel/sqstdlib/Makefile Modified: src/modules/app_sqlang/squirrel/squirrel/Makefile --- Diff: https://github.com/kamailio/kamailio/commit/69ba762794f585288ee367cbbdfdc69… Patch: https://github.com/kamailio/kamailio/commit/69ba762794f585288ee367cbbdfdc69… --- diff --git a/src/modules/app_sqlang/Makefile b/src/modules/app_sqlang/Makefile index b93ae18188..9766b2d845 100644 --- a/src/modules/app_sqlang/Makefile +++ b/src/modules/app_sqlang/Makefile @@ -20,9 +20,11 @@ endif include ../../Makefile.modules libsquirrel.a: - make -C ./squirrel/squirrel $(MKSQLANG) + make -C ./squirrel/squirrel CC_EXTRA_FLAGS="-fPIC" \ + OUT="../../libsquirrel.a" $(MKSQLANG) libsqstdlib.a: - make -C ./squirrel/sqstdlib $(MKSQLANG) + make -C ./squirrel/sqstdlib CC_EXTRA_FLAGS="-fPIC" \ + OUT="../../libsqstdlib.a" $(MKSQLANG) app_sqlang.so: libsquirrel.a libsqstdlib.a diff --git a/src/modules/app_sqlang/squirrel/sqstdlib/Makefile b/src/modules/app_sqlang/squirrel/sqstdlib/Makefile index a2066b2bd6..14c33948ea 100644 --- a/src/modules/app_sqlang/squirrel/sqstdlib/Makefile +++ b/src/modules/app_sqlang/squirrel/sqstdlib/Makefile @@ -1,8 +1,9 @@ SQUIRREL= .. -LPATH ?= .. -OUT= $(SQUIRREL)/$(LPATH)/libsqstdlib.a -INCZ= -I$(SQUIRREL)/include -I. -Iinclude +OUT?= $(SQUIRREL)/lib/libsqstdlib.a +INCZ?= -I$(SQUIRREL)/include -I. -Iinclude +DEFS= $(CC_EXTRA_FLAGS) +LIB= OBJS= \ sqstdblob.o \ @@ -26,16 +27,16 @@ SRCS= \ sq32: - gcc -O2 -fno-exceptions -fPIC -fno-rtti -Wall -fno-strict-aliasing -c $(SRCS) $(INCZ) + gcc -O2 -fno-exceptions -fPIC -fno-rtti -Wall -fno-strict-aliasing -c $(SRCS) $(INCZ) $(DEFS) ar rc $(OUT) *.o rm *.o sqprof: - gcc -O2 -pg -fno-exceptions -fno-rtti -pie -gstabs -g3 -Wall -fno-strict-aliasing -c $(SRCS) $(INCZ) + gcc -O2 -pg -fno-exceptions -fno-rtti -pie -gstabs -g3 -Wall -fno-strict-aliasing -c $(SRCS) $(INCZ) $(DEFS) ar rc $(OUT) *.o rm *.o sq64: - gcc -O2 -m64 -fno-exceptions -fPIC -D_SQ64 -fno-rtti -Wall -fno-strict-aliasing -c $(SRCS) $(INCZ) + gcc -O2 -m64 -fno-exceptions -fPIC -D_SQ64 -fno-rtti -Wall -fno-strict-aliasing -c $(SRCS) $(INCZ) $(DEFS) ar rc $(OUT) *.o rm *.o diff --git a/src/modules/app_sqlang/squirrel/squirrel/Makefile b/src/modules/app_sqlang/squirrel/squirrel/Makefile index 3f62f581a9..ce9359d2e9 100644 --- a/src/modules/app_sqlang/squirrel/squirrel/Makefile +++ b/src/modules/app_sqlang/squirrel/squirrel/Makefile @@ -1,9 +1,8 @@ SQUIRREL= .. -LPATH ?= .. -OUT= $(SQUIRREL)/$(LPATH)/libsquirrel.a -INCZ= -I$(SQUIRREL)/include -I. -Iinclude -DEFS= +OUT?= $(SQUIRREL)/lib/libsquirrel.a +INCZ?= -I$(SQUIRREL)/include -I. -Iinclude +DEFS= $(CC_EXTRA_FLAGS) LIB= OBJS= \