From 91d7f85e02991954d1e1bd44673df567ad8dcc87 Mon Sep 17 00:00:00 2001 From: Gordon Ross Date: Sat, 25 May 2013 14:29:15 -0400 Subject: 5916 make libsqlite a real shared lib Reviewed by: Thomas Keiser Reviewed by: Josef 'Jeff' Sipek Approved by: Garrett D'Amore --- usr/src/cmd/sqlite/Makefile | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'usr/src/cmd/sqlite') diff --git a/usr/src/cmd/sqlite/Makefile b/usr/src/cmd/sqlite/Makefile index 86a329605b..795e391c96 100644 --- a/usr/src/cmd/sqlite/Makefile +++ b/usr/src/cmd/sqlite/Makefile @@ -29,8 +29,7 @@ include ../Makefile.cmd include $(SRC)/lib/Makefile.lib -SQLITEHDRDIR= $(ROOTHDRDIR)/sqlite -LIBSQLITE= $(ROOTLIBDIR)/libsqlite.o +SQLITEHDRDIR= $(ROOTHDRDIR)/sqlite-sys ROOTLIBSVCBIN= $(ROOT)/lib/svc/bin ROOTSQLITE= $(PROG:%=$(ROOTLIBSVCBIN)/%) @@ -41,6 +40,8 @@ $(OBJS) := CTFCONVERT_POST = $(CTFCONVERT_O) CERRWARN += -_gcc=-Wno-empty-body +LDLIBS += -lsqlite-sys + .KEEP_STATE: $(ROOTSQLITE) := FILEMODE= 555 @@ -53,8 +54,8 @@ CPPFLAGS += -D_REENTRANT -DTHREADSAFE=1 -DHAVE_USLEEP=1 \ $(PROG): $(OBJS) $(SQLITEHDRDIR)/sqlite.h $(LINK.c) -o $@ $(OBJS) \ - $(MAPFILE.NES:%=-M%) $(MAPFILE.NED:%=-M%) $(LIBSQLITE) - $(CTFMERGE) -t -L VERSION -o $@ $(OBJS) $(LIBSQLITE) + $(MAPFILE.NES:%=-M%) $(MAPFILE.NED:%=-M%) $(LDLIBS) + $(CTFMERGE) -t -L VERSION -o $@ $(OBJS) $(POST_PROCESS) all: $(PROG) -- cgit v1.2.3