diff options
| author | John Sonnenschein <johns@joyent.com> | 2012-11-08 20:10:52 +0000 |
|---|---|---|
| committer | John Sonnenschein <johns@joyent.com> | 2012-11-08 20:10:52 +0000 |
| commit | 6c3d3379cb5343df03a1bfb7dc5ff66b1c7cf1bb (patch) | |
| tree | 02f9f72e0ef1d2ddd979abf7033cc563a8ec2ed4 | |
| parent | ad2a40e16d2bee59cfe84f89db3ce92b9f15adff (diff) | |
| download | illumos-joyent-6c3d3379cb5343df03a1bfb7dc5ff66b1c7cf1bb.tar.gz | |
Fix libzdoor mismerge
| -rw-r--r-- | usr/src/lib/libzdoor/Makefile.com | 17 |
1 files changed, 3 insertions, 14 deletions
diff --git a/usr/src/lib/libzdoor/Makefile.com b/usr/src/lib/libzdoor/Makefile.com index 139c1e117c..09bde0f1b4 100644 --- a/usr/src/lib/libzdoor/Makefile.com +++ b/usr/src/lib/libzdoor/Makefile.com @@ -22,10 +22,6 @@ # Use is subject to license terms. # -LIBRARY = libpapi-common.a -VERS = .0 -OBJECTS = attribute.o common.o library.o list.o misc.o status.o uri.o - LIBRARY= libzdoor.a VERS= .1 OBJECTS= zdoor.o \ @@ -39,16 +35,9 @@ include ../../Makefile.rootfs SRCDIR = ../common SRCS = $(OBJECTS:%.o=$(SRCDIR)/%.c) -LIBS = $(DYNLIB) - -$(LINTLIB):= SRCS = $(SRCDIR)/$(LINTSRC) - -CFLAGS += $(CCVERBOSE) -CPPFLAGS += -I$(SRCDIR) - -CERRWARN += -_gcc=-Wno-switch - -MAPFILES = $(SRCDIR)/mapfile +CPPFLAGS += -I$(SRCDIR) -D_REENTRANT -D_FILE_OFFSET_BITS=64 +LIBS = $(DYNLIB) $(LINTLIB) +LDLIBS += -lc -lzonecfg -lcontract $(LINTLIB) := SRCS= $(SRCDIR)/$(LINTSRC) |