| --- a/Makefile |
| +++ b/Makefile |
| @@ -1,121 +1,52 @@ |
| T=openssl |
| +.PHONY: install clean |
| |
| -PREFIX ?=/usr/local |
| -CC := $(CROSS)$(CC) |
| -AR := $(CROSS)$(AR) |
| -LD := $(CROSS)$(LD) |
| - |
| -#OS auto detect |
| -ifneq (,$(TARGET_SYS)) |
| - SYS := $(TARGET_SYS) |
| -else |
| - SYS := $(shell gcc -dumpmachine) |
| -endif |
| - |
| -#Lua auto detect |
| -LUA_VERSION := $(shell pkg-config luajit --print-provides) |
| -ifeq ($(LUA_VERSION),) |
| - # Not found luajit package, try lua |
| - LUA_VERSION := $(shell pkg-config lua --print-provides) |
| - ifeq ($(LUA_VERSION),) |
| - # Not found lua package, try from prefix |
| - LUA_VERSION := $(shell lua -e "_,_,v=string.find(_VERSION,'Lua (.+)');print(v)") |
| - LUA_CFLAGS ?= -I$(PREFIX)/include/lua$(LUA_VERSION) |
| - LUA_LIBS ?= -L$(PREFIX)/lib -llua |
| - LUA_LIBDIR ?= $(PREFIX)/lib/lua/$(LUA_VERSION) |
| - else |
| - # Found lua package |
| - LUA_VERSION := $(shell lua -e "_,_,v=string.find(_VERSION,'Lua (.+)');print(v)") |
| - LUA_CFLAGS ?= $(shell pkg-config lua --cflags) |
| - LUA_LIBS ?= $(shell pkg-config lua --libs) |
| - LUA_LIBDIR ?= $(PREFIX)/lib/lua/$(LUA_VERSION) |
| - endif |
| -else |
| - # Found luajit package |
| - LUA_VERSION := $(shell luajit -e "_,_,v=string.find(_VERSION,'Lua (.+)');print(v)") |
| - LUA_CFLAGS ?= $(shell pkg-config luajit --cflags) |
| - LUA_LIBS ?= $(shell pkg-config luajit --libs) |
| - LUA_LIBDIR ?= $(PREFIX)/lib/lua/$(LUA_VERSION) |
| -endif |
| - |
| -#OpenSSL auto detect |
| -OPENSSL_CFLAGS ?= $(shell pkg-config openssl --cflags) |
| -OPENSSL_LIBS ?= $(shell pkg-config openssl --static --libs) |
| - |
| -ifneq (, $(findstring linux, $(SYS))) |
| - # Do linux things |
| - CFLAGS = -fpic |
| - LDFLAGS = -Wl,--no-undefined -fpic -lrt -ldl -lm |
| -endif |
| - |
| -ifneq (, $(findstring apple, $(SYS))) |
| - # Do darwin things |
| - CFLAGS = -fPIC |
| - LDFLAGS = -fPIC -undefined dynamic_lookup -ldl |
| - #MACOSX_DEPLOYMENT_TARGET="10.3" |
| - CC := MACOSX_DEPLOYMENT_TARGET=${MACOSX_DEPLOYMENT_TARGET} $(CC) |
| -endif |
| +PKGC ?= pkg-config |
| |
| -ifneq (, $(findstring mingw, $(SYS))) |
| - # Do mingw things |
| - CFLAGS = -DLUA_LIB -DLUA_BUILD_AS_DLL -DWIN32_LEAN_AND_MEAN |
| -endif |
| +LIB_OPTION = -shared |
| +LUAPKGC = lua |
| |
| -ifneq (, $(findstring cygwin, $(SYS))) |
| - # Do cygwin things |
| - CFLAGS = -fPIC |
| -endif |
| +# LUA include/libraries build flags |
| +LUA_CFLAGS := $(shell $(PKGC) --cflags $(LUAPKGC)) |
| +LUA_LIBS_DIR := $(shell $(PKGC) --libs $(LUAPKGC)) |
| |
| -ifneq (, $(findstring iOS, $(SYS))) |
| - # Do iOS things |
| - CFLAGS = -fPIC |
| - LDFLAGS = -fPIC -ldl |
| -endif |
| +# openssl include/libraries build flags |
| +OPENSSL_CFLAGS ?= $(shell $(PKGC) openssl --cflags) |
| +OPENSSL_LIBS_DIR ?= $(shell $(PKGC) openssl --libs) |
| |
| -#custom config |
| +LDFLAGS = -Wl,--no-undefined -fpic -lrt -ldl -lm $(OPENSSL_LIBS_DIR) $(LUA_LIBS_DIR) |
| +CFLAGS += -fPIC -DPTHREADS $(OPENSSL_CFLAGS) $(LUA_CFLAGS) |
| ifeq (.config, $(wildcard .config)) |
| - include .config |
| +include .config |
| endif |
| |
| -LIBNAME= $T.so.$V |
| +LIBNAME= $T.so |
| |
| -CFLAGS += $(OPENSSL_CFLAGS) $(LUA_CFLAGS) $(TARGET_FLAGS) |
| -LDFLAGS += -shared $(OPENSSL_LIBS) $(LUA_LIBS) |
| # Compilation directives |
| WARN_MIN = -Wall -Wno-unused-value |
| WARN = -Wall |
| WARN_MOST = $(WARN) -W -Waggregate-return -Wcast-align -Wmissing-prototypes -Wnested-externs -Wshadow -Wwrite-strings -pedantic |
| CFLAGS += -g $(WARN_MIN) -DPTHREADS -Ideps -Ideps/lua-compat -Ideps/auxiliar |
| |
| - |
| OBJS=src/asn1.o deps/auxiliar/auxiliar.o src/bio.o src/cipher.o src/cms.o src/compat.o src/crl.o src/csr.o src/dh.o src/digest.o src/dsa.o \ |
| src/ec.o src/engine.o src/hmac.o src/lbn.o src/lhash.o src/misc.o src/ocsp.o src/openssl.o src/ots.o src/pkcs12.o src/pkcs7.o \ |
| src/pkey.o src/rsa.o src/ssl.o src/th-lock.o src/util.o src/x509.o src/xattrs.o src/xexts.o src/xname.o src/xstore.o \ |
| src/xalgor.o src/callback.o src/srp.o deps/auxiliar/subsidiar.o |
| |
| -.c.o: |
| - $(CC) $(CFLAGS) -c -o $@ $? |
| +%.o: %.c |
| + $(CC) $(CFLAGS) -c $< -o $@ |
| |
| all: $T.so |
| - @echo "Target system: "$(SYS) |
| + echo $(SYS) |
| + $(CC) $(LDFLAGS) $(LIB_OPTION) $(OBJS) -o $@ |
| |
| -$T.so: lib$T.a |
| - $(CC) -o $@ src/openssl.o -L. -l$T $(LDFLAGS) |
| - |
| -lib$T.a: $(OBJS) |
| - $(AR) rcs $@ $? |
| +$T.so: $(OBJS) |
| + echo "LUA LIBS_DIR: " $(LUA_LIBS_DIR) |
| + $(CC) $(CFLAGS) $(LIB_OPTION) -o $T.so $(OBJS) $(LDFLAGS) |
| |
| install: all |
| mkdir -p $(LUA_LIBDIR) |
| cp $T.so $(LUA_LIBDIR) |
| |
| -info: |
| - @echo "Target system: "$(SYS) |
| - @echo "CC:" $(CC) |
| - @echo "AR:" $(AR) |
| - @echo "PREFIX:" $(PREFIX) |
| - |
| clean: |
| - rm -f $T.so lib$T.a $(OBJS) |
| - |
| -# vim: ts=8 sw=8 noet |
| + rm -f $T.so $(OBJS) |