diff options
| author | Timo Teräs <timo.teras@iki.fi> | 2010-06-11 13:41:52 +0300 |
|---|---|---|
| committer | Timo Teräs <timo.teras@iki.fi> | 2010-06-11 13:41:52 +0300 |
| commit | bcbe575c3b28997a03a65426b241bdfef4d8b747 (patch) | |
| tree | 3bc406fd2348000e23efaa6e3fc37c041083580d | |
| parent | 11925542d8f31012d3505ec64a58517f8fa65fd3 (diff) | |
| download | apk-tools-bcbe575c3b28997a03a65426b241bdfef4d8b747.tar.gz apk-tools-bcbe575c3b28997a03a65426b241bdfef4d8b747.tar.bz2 apk-tools-bcbe575c3b28997a03a65426b241bdfef4d8b747.tar.xz apk-tools-bcbe575c3b28997a03a65426b241bdfef4d8b747.zip | |
build: fix CFLAGS, and use pkg-config for lua
| -rw-r--r-- | src/Makefile | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/Makefile b/src/Makefile index a7f1419..b834246 100644 --- a/src/Makefile +++ b/src/Makefile @@ -1,4 +1,4 @@ -PKGDEPS := openssl zlib +PKGDEPS := openssl zlib lua ifeq ($(shell pkg-config --print-errors --exists $(PKGDEPS) || echo fail),fail) $(error Build dependencies are not met) @@ -11,14 +11,14 @@ libapk.so-objs := common.o state.o database.o package.o archive.o \ shlibs-y += apk.so apk.so-objs := lua-apk.o CFLAGS_lua-apk.o := -DAPK_VERSION=\"$(FULL_VERSION)\" -LIBS_apk.so := -L$(obj) -llua -lapk +LIBS_apk.so := -L$(obj) -lapk progs-y += apk apk-objs := apk.o add.o del.o fix.o update.o info.o \ search.o upgrade.o cache.o ver.o index.o fetch.o \ audit.o verify.o -CFLAGS += -D_ATFILE_SOURCE +CFLAGS_ALL += -D_ATFILE_SOURCE CFLAGS_apk.o := -DAPK_VERSION=\"$(FULL_VERSION)\" LIBS_apk := -lapk @@ -27,12 +27,11 @@ apk.static-objs := $(apk-objs) LDFLAGS_apk.static := -static LDFLAGS_apk += -nopie -L$(obj) -CFLAGS += $(shell pkg-config --cflags $(PKGDEPS)) +CFLAGS_ALL += $(shell pkg-config --cflags $(PKGDEPS)) LIBS := -Wl,--as-needed \ $(shell pkg-config --libs $(PKGDEPS)) \ -Wl,--no-as-needed - $(obj)/apk: $(obj)/libapk.so $(obj)/apk.so: $(obj)/libapk.so |