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/svc | |
| parent | e53cbaa96c466c221cfec0d1a481c6f75be6880d (diff) | |
| download | illumos-gate-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/svc')
| -rw-r--r-- | usr/src/cmd/svc/configd/Makefile | 18 |
1 files changed, 11 insertions, 7 deletions
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) |