diff options
Diffstat (limited to 'usr/src/lib/libzpool')
| -rw-r--r-- | usr/src/lib/libzpool/Makefile | 5 | ||||
| -rw-r--r-- | usr/src/lib/libzpool/Makefile.com | 8 | ||||
| -rw-r--r-- | usr/src/lib/libzpool/amd64/Makefile | 4 | ||||
| -rw-r--r-- | usr/src/lib/libzpool/i386/Makefile | 4 | ||||
| -rw-r--r-- | usr/src/lib/libzpool/sparcv9/Makefile | 4 |
5 files changed, 5 insertions, 20 deletions
diff --git a/usr/src/lib/libzpool/Makefile b/usr/src/lib/libzpool/Makefile index f77568c08a..764e417331 100644 --- a/usr/src/lib/libzpool/Makefile +++ b/usr/src/lib/libzpool/Makefile @@ -23,8 +23,6 @@ # Copyright 2005 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# include ../Makefile.lib @@ -35,11 +33,10 @@ all := TARGET= all clean := TARGET= clean clobber := TARGET= clobber install := TARGET= install -lint := TARGET= lint .KEEP_STATE: -all clean clobber install lint: $(SUBDIRS) +all clean clobber install: $(SUBDIRS) install_h: $(ROOTHDRS) diff --git a/usr/src/lib/libzpool/Makefile.com b/usr/src/lib/libzpool/Makefile.com index 78c9c0b29a..31bd6aa5e2 100644 --- a/usr/src/lib/libzpool/Makefile.com +++ b/usr/src/lib/libzpool/Makefile.com @@ -48,7 +48,7 @@ SRCDIR= ../common # There should be a mapfile here MAPFILES = -LIBS += $(DYNLIB) $(LINTLIB) +LIBS += $(DYNLIB) INCS += -I../common INCS += -I../../../uts/common/fs/zfs @@ -62,12 +62,9 @@ INCS += -I../../libzutil/common CLEANFILES += ../common/zfs.h CLEANFILES += $(EXTPICS) -$(LINTLIB) := SRCS= $(SRCDIR)/$(LINTSRC) -$(LINTLIB): ../common/zfs.h $(LIBS): ../common/zfs.h CSTD= $(CSTD_GNU99) -C99LMODE= -Xc99=%all CFLAGS += $(CCGDEBUG) $(CCVERBOSE) $(CNOGLOBAL) CFLAGS64 += $(CCGDEBUG) $(CCVERBOSE) $(CNOGLOBAL) @@ -77,8 +74,6 @@ NATIVE_LIBS += libz.so CPPFLAGS.first = -I$(SRC)/lib/libfakekernel/common CPPFLAGS += $(INCS) -DDEBUG -D_FAKE_KERNEL -LINTFLAGS += -erroff=E_STATIC_UNUSED $(INCS) -LINTFLAGS64 += -erroff=E_STATIC_UNUSED $(INCS) # The following is needed to fix the SmartOS build; see OS-6582. We cannot do # a conditional appendage to INCS, since that breaks the lint build. @@ -100,7 +95,6 @@ SMATCH=off all: $(LIBS) -lint: $(LINTLIB) include ../../Makefile.targ diff --git a/usr/src/lib/libzpool/amd64/Makefile b/usr/src/lib/libzpool/amd64/Makefile index f484bb496d..b780a6dba8 100644 --- a/usr/src/lib/libzpool/amd64/Makefile +++ b/usr/src/lib/libzpool/amd64/Makefile @@ -23,10 +23,8 @@ # Copyright 2005 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# include ../Makefile.com include ../../Makefile.lib.64 -install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTLINT) +install: all $(ROOTLIBS64) $(ROOTLINKS64) diff --git a/usr/src/lib/libzpool/i386/Makefile b/usr/src/lib/libzpool/i386/Makefile index 3ae822d920..703879a954 100644 --- a/usr/src/lib/libzpool/i386/Makefile +++ b/usr/src/lib/libzpool/i386/Makefile @@ -23,9 +23,7 @@ # Copyright 2005 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# include ../Makefile.com -install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) +install: all $(ROOTLIBS) $(ROOTLINKS) diff --git a/usr/src/lib/libzpool/sparcv9/Makefile b/usr/src/lib/libzpool/sparcv9/Makefile index 49cb413342..d303e3971b 100644 --- a/usr/src/lib/libzpool/sparcv9/Makefile +++ b/usr/src/lib/libzpool/sparcv9/Makefile @@ -23,12 +23,10 @@ # Copyright 2005 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# include ../Makefile.com include ../../Makefile.lib.64 sparcv9_C_PICFLAGS = $(sparcv9_C_BIGPICFLAGS) -install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTLINT) +install: all $(ROOTLIBS64) $(ROOTLINKS64) |