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>

4 files changed, 21 insertions, 18 deletions

diff --git a/usr/src/cmd/idmap/idmapd/Makefile b/usr/src/cmd/idmap/idmapd/Makefile
index f1aef3d137..b99b8677be 100644
--- a/usr/src/cmd/idmap/idmapd/Makefile
+++ b/usr/src/cmd/idmap/idmapd/Makefile
@@ -50,9 +50,6 @@ install :=	TARGET = install
 clean :=	TARGET = clean
 clobber :=	TARGET = clobber
 
-LIBSQLITE =	$(ROOT)/usr/lib/libsqlite.o
-SQLITELINT =	$(ROOT)/usr/lib/llib-lsqlite.ln
-
 include ../../Makefile.cmd
 
 CERRWARN +=	-_gcc=-Wno-type-limits
@@ -82,7 +79,9 @@ $(OBJS) := CPPFLAGS += $(INCS) -D_REENTRANT
 $(POFILE) := CPPFLAGS += $(INCS)
 
 CFLAGS += $(CCVERBOSE)
-LDLIBS += -lsecdb \
+LDLIBS += \
+	-lsqlite-sys \
+	-lsecdb \
 	-lsocket \
 	-lnsl \
 	-lidmap \
@@ -107,7 +106,6 @@ DIRMODE = 0755
 FILEMODE = 0555
 
 lint_SRCS := CPPFLAGS += $(INCS) -D_REENTRANT $(RPC_MSGOUT_OPT)
-lint := LDLIBS += $(SQLITELINT)
 
 .KEEP_STATE:
 
@@ -116,7 +114,7 @@ lint := LDLIBS += $(SQLITELINT)
 all: $(PROG)
 
 $(PROG): $(OBJS) $$(MAPFILES)
-	$(LINK.c) -o $@ $(OBJS) $(LIBSQLITE) $(LDLIBS)
+	$(LINK.c) -o $@ $(OBJS) $(LDLIBS)
 	$(POST_PROCESS)
 
 $(POFILE): $(POFILES)
diff --git a/usr/src/cmd/idmap/idmapd/idmapd.h b/usr/src/cmd/idmap/idmapd/idmapd.h
index a527f9265a..7ed2740a34 100644
--- a/usr/src/cmd/idmap/idmapd/idmapd.h
+++ b/usr/src/cmd/idmap/idmapd/idmapd.h
@@ -34,7 +34,7 @@
 #include <thread.h>
 #include <libintl.h>
 #include <strings.h>
-#include <sqlite/sqlite.h>
+#include <sqlite-sys/sqlite.h>
 #include <syslog.h>
 #include <inttypes.h>
 #include <rpcsvc/idmap_prot.h>
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) 
diff --git a/usr/src/cmd/svc/configd/Makefile b/usr/src/cmd/svc/configd/Makefile
index c6f2000e8c..07866fd0f0 100644
--- a/usr/src/cmd/svc/configd/Makefile
+++ b/usr/src/cmd/svc/configd/Makefile
@@ -48,7 +48,8 @@ $(NATIVE_BUILD)OBJS = $(MYOBJS:%.o=%-native.o)
 
 ROOTCMDDIR=	$(ROOT)/lib/svc/bin
 
-MYCPPFLAGS = -I. -I../common -I../../../common/svc -I$(ROOT)/usr/include/sqlite -D_REENTRANT
+MYCPPFLAGS = -I. -I../common -I../../../common/svc \
+	-I$(ROOT)/usr/include/sqlite-sys -D_REENTRANT
 CPPFLAGS += $(MYCPPFLAGS)
 CFLAGS	+= $(CCVERBOSE)
 CERRWARN += -_gcc=-Wno-parentheses
@@ -69,6 +70,9 @@ LIBSCF		= $(SRC)/lib/libscf
 SCRIPTFILE	= restore_repository
 ROOTSCRIPTFILE	= $(ROOTCMDDIR)/$(SCRIPTFILE)
 
+#
+# Native variant (used in ../seed)
+#
 $(NATIVE_BUILD)CC =	$(NATIVECC)
 $(NATIVE_BUILD)LD =	$(NATIVELD)
 $(NATIVE_BUILD)CFLAGS =	$(NATIVE_CFLAGS)
@@ -81,17 +85,17 @@ $(NATIVE_BUILD)LDLIBS = -L$(ADJUNCT_PROTO)/usr/lib -R$(ADJUNCT_PROTO)/usr/lib \
 DIRMODE = 0755
 FILEMODE = 0555
 
-LIBSQLITE = $(ROOT)/usr/lib/libsqlite.o
-$(NATIVE_BUILD)LIBSQLITE = $(ROOT)/usr/lib/libsqlite-native.o
-SQLITELINT = $(ROOT)/usr/lib/llib-lsqlite.ln
+OBJSQLITE =
+LIBSQLITE = -lsqlite-sys
+$(NATIVE_BUILD)OBJSQLITE = $(ROOT)/lib/libsqlite-native.o
+$(NATIVE_BUILD)LIBSQLITE =
 
-OBJS += $(LIBSQLITE)
+OBJS += $(OBJSQLITE)
+LDLIBS += $(LIBSQLITE)
 
 install := TARGET = install
 clobber := TARGET = clobber
 
-lint	:= LDLIBS += $(SQLITELINT)
-
 .KEEP_STATE:
 .PARALLEL: $(MYOBJS) $(MYOBJS:%.o=%-native.o)