diff options
| author | Gordon Ross <gwr@nexenta.com> | 2013-05-25 14:29:15 -0400 |
|---|---|---|
| committer | Gordon Ross <gwr@nexenta.com> | 2015-05-31 23:16:21 -0400 |
| commit | 91d7f85e02991954d1e1bd44673df567ad8dcc87 (patch) | |
| tree | 84ba8c28de01779ee2dadbc74dc62348227ba833 /usr/src/cmd/sqlite | |
| parent | e53cbaa96c466c221cfec0d1a481c6f75be6880d (diff) | |
| download | illumos-joyent-91d7f85e02991954d1e1bd44673df567ad8dcc87.tar.gz | |
5916 make libsqlite a real shared lib
Reviewed by: Thomas Keiser <thomas.keiser@nexenta.com>
Reviewed by: Josef 'Jeff' Sipek <jeffpc@josefsipek.net>
Approved by: Garrett D'Amore <garrett@damore.org>
Diffstat (limited to 'usr/src/cmd/sqlite')
| -rw-r--r-- | usr/src/cmd/sqlite/Makefile | 9 |
1 files changed, 5 insertions, 4 deletions
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) |