summaryrefslogtreecommitdiff
path: root/usr/src/lib/libsqlite
diff options
context:
space:
mode:
Diffstat (limited to 'usr/src/lib/libsqlite')
-rw-r--r--usr/src/lib/libsqlite/Makefile.com11
-rw-r--r--usr/src/lib/libsqlite/i386/Makefile4
-rw-r--r--usr/src/lib/libsqlite/sparc/Makefile4
3 files changed, 10 insertions, 9 deletions
diff --git a/usr/src/lib/libsqlite/Makefile.com b/usr/src/lib/libsqlite/Makefile.com
index 49b42f553b..5bf5ebd84c 100644
--- a/usr/src/lib/libsqlite/Makefile.com
+++ b/usr/src/lib/libsqlite/Makefile.com
@@ -1,5 +1,5 @@
#
-# Copyright 2007 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2008 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
#ident "%Z%%M% %I% %E% SMI"
@@ -48,7 +48,8 @@ include $(SRC)/lib/Makefile.lib
SRCDIR = ../src
TOOLDIR = ../tool
-LIBS = $(RELOC) $(LINTLIB)
+$(DYNLIB) := LDLIBS += -lc
+LIBS = $(RELOC) $(LINTLIB) $(DYNLIB)
$(LINTLIB) := SRCS = $(LINTSRC)
@@ -88,7 +89,7 @@ SRCS = \
MYCPPFLAGS = -D_REENTRANT -DTHREADSAFE=1 -DHAVE_USLEEP=1 -I. -I.. -I$(SRCDIR)
CPPFLAGS += $(MYCPPFLAGS)
-MAPFILE = ../mapfile-sqlite
+MAPFILES = ../mapfile-sqlite
# Header files used by all library source files.
#
@@ -198,11 +199,11 @@ $(OBJS) $(OBJS:%.o=%-native.o): $(HDR)
native: $(NATIVERELOC)
$(RELOC): objs .WAIT $(OBJS)
- $(LD) -r $(MAPFILE:%=-M%) -o $(RELOC) $(OBJS)
+ $(LD) -r $(MAPFILES:%=-M%) -o $(RELOC) $(OBJS)
$(CTFMERGE) -t -f -L VERSION -o $(RELOC) $(OBJS)
$(NATIVERELOC): objs .WAIT $(OBJS:%.o=%-native.o)
- $(LD) -r $(MAPFILE:%=-M%) -o $(NATIVERELOC) $(OBJS:%.o=%-native.o)
+ $(LD) -r $(MAPFILES:%=-M%) -o $(NATIVERELOC) $(OBJS:%.o=%-native.o)
opcodes.h: $(SRCDIR)/vdbe.c
@echo "Generating $@"; \
diff --git a/usr/src/lib/libsqlite/i386/Makefile b/usr/src/lib/libsqlite/i386/Makefile
index 1cdf2c61ae..743fead699 100644
--- a/usr/src/lib/libsqlite/i386/Makefile
+++ b/usr/src/lib/libsqlite/i386/Makefile
@@ -19,7 +19,7 @@
# CDDL HEADER END
#
#
-# Copyright 2007 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2008 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
#ident "%Z%%M% %I% %E% SMI"
@@ -27,6 +27,6 @@
include ../Makefile.com
-install: $(ROOTLIBDIR)/$(RELOC)
+install: $(ROOTLIBDIR)/$(RELOC) $(ROOTLIBS) $(ROOTLINKS)
$(ROOTLIBDIR)/$(RELOC): all
diff --git a/usr/src/lib/libsqlite/sparc/Makefile b/usr/src/lib/libsqlite/sparc/Makefile
index 1cdf2c61ae..743fead699 100644
--- a/usr/src/lib/libsqlite/sparc/Makefile
+++ b/usr/src/lib/libsqlite/sparc/Makefile
@@ -19,7 +19,7 @@
# CDDL HEADER END
#
#
-# Copyright 2007 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2008 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
#ident "%Z%%M% %I% %E% SMI"
@@ -27,6 +27,6 @@
include ../Makefile.com
-install: $(ROOTLIBDIR)/$(RELOC)
+install: $(ROOTLIBDIR)/$(RELOC) $(ROOTLIBS) $(ROOTLINKS)
$(ROOTLIBDIR)/$(RELOC): all