From 8e887db746ef605cc38196d14500e1c28eddd79a Mon Sep 17 00:00:00 2001 From: Natanael Copa Date: Wed, 14 Sep 2011 14:16:19 +0000 Subject: build: support building lua module without shared libapk Use the build option SHARED_LIBAPK for building shared. --- src/Makefile | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/Makefile b/src/Makefile index 45f3415..41a3b32 100644 --- a/src/Makefile +++ b/src/Makefile @@ -8,7 +8,6 @@ PKGDEPS += lua shlibs-y += apk.so apk.so-objs := lua-apk.o CFLAGS_lua-apk.o := -DAPK_VERSION=\"$(FULL_VERSION)\" -LIBS_apk.so := -L$(obj) -lapk LUA_LIB-y := $(obj)/apk.so install-LUA_LIB-y := $(INSTALLDIR) $(DESTDIR)$(LUA_LIBDIR) \ $(INSTALL) $(LUA_LIB-y) $(DESTDIR)$(LUA_LIBDIR) @@ -34,12 +33,14 @@ endif ifeq ($(SHARED_LIBAPK),) apk-objs += $(libapk.so-objs) +apk.so-objs += $(libapk.so-objs) else LIBAPK := YesPlease LIBS_apk := -lapk +LIBS_apk.so := -L$(obj) -lapk endif -ifneq ($(LIBAPK),) +ifneq ($(SHARED_LIBAPK),) shlibs-y += libapk.so LIBAPK-y := $(obj)/libapk.so install-LIBAPK-y := $(INSTALLDIR) $(DESTDIR)$(LIBDIR) \ @@ -63,7 +64,7 @@ LIBS := -Wl,--as-needed \ $(obj)/apk: $(LIBAPK-y) -$(obj)/apk.so: $(obj)/libapk.so +$(obj)/apk.so: $(LIBAPK-y) install: $(obj)/apk $(LIBAPK-y) $(LUA_LIB-y) $(INSTALLDIR) $(DESTDIR)$(SBINDIR) -- cgit v1.2.3-60-g2f50