diff options
Diffstat (limited to 'usr/src/lib/libsmedia/plugins')
-rw-r--r-- | usr/src/lib/libsmedia/plugins/Makefile | 12 | ||||
-rw-r--r-- | usr/src/lib/libsmedia/plugins/Makefile.com | 14 | ||||
-rw-r--r-- | usr/src/lib/libsmedia/plugins/Makefile.plugin | 7 |
3 files changed, 5 insertions, 28 deletions
diff --git a/usr/src/lib/libsmedia/plugins/Makefile b/usr/src/lib/libsmedia/plugins/Makefile index d4e3468005..c9db1892bf 100644 --- a/usr/src/lib/libsmedia/plugins/Makefile +++ b/usr/src/lib/libsmedia/plugins/Makefile @@ -22,8 +22,6 @@ # Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved. # Copyright 2013 Garrett D'Amore <garrett@damore.org> # -# lib/libsmedia/plugins/Makefile - SUBDIRS = \ blkdev \ @@ -35,17 +33,13 @@ all := TARGET= all install := TARGET= install clean := TARGET= clean clobber := TARGET= clobber -lint := TARGET= lint -modlintlib := TARGET= modlintlib -clean.lint := TARGET= clean.lint check := TARGET= check install_h := TARGET= install_h -catalog := TARGET= catalog +catalog := TARGET= catalog -all install install_h clean clobber lint catalog : $(SUBDIRS) +all install install_h clean clobber catalog: $(SUBDIRS) $(SUBDIRS) : FRC @cd $@; pwd; $(MAKE) $(TARGET) -FRC : - +FRC : diff --git a/usr/src/lib/libsmedia/plugins/Makefile.com b/usr/src/lib/libsmedia/plugins/Makefile.com index 5c239ce171..3d9bfb9bf6 100644 --- a/usr/src/lib/libsmedia/plugins/Makefile.com +++ b/usr/src/lib/libsmedia/plugins/Makefile.com @@ -29,7 +29,6 @@ LIBS = $(DYNLIB) CPPFLAGS += -I../inc -I$(SRC)/cmd/smserverd/ LDLIBS += -lc $(PLUGIN_SPECIFIC_LIB) -LINTPLUGIN = llib-$(LIBNAME).ln PLUGINDIR = $(ROOTLIBDIR)/smedia PLUGINDIR64 = $(ROOTLIBDIR)/smedia/$(MACH64) FILEMODE = 555 @@ -38,26 +37,13 @@ SOFILES = $(LIBRARY:%.a=%.so) PLUGINS = $(LIBS:%=$(PLUGINDIR)/%) PLUGINS64 = $(LIBS:%=$(PLUGINDIR64)/%) -CLEANFILES= $(LINTOUT) $(LINTPLUGIN) - SRCDIR = ../common # not linted SMATCH=off -LINTFLAGS += -xu -LINTFLAGS64 += -xu -$(LINTPLUGIN) := SRCS=$(OBJECTS:%.o=../common/%.c) -$(LINTPLUGIN) := LINTFLAGS=-nvx -$(LINTPLUGIN) := TARGET_ARCH= - -LINTSRC= $(LINTPLUGIN:%.ln=%) -ROOTLINTDIR= $(ROOTLIBDIR) -ROOTLINT= $(LINTSRC:%=$(ROOTLINTDIR)/%) - .KEEP_STATE: -lint: lintcheck objs/%.o pics/%.o: ../common/%.c $(COMPILE.c) -o $@ $< diff --git a/usr/src/lib/libsmedia/plugins/Makefile.plugin b/usr/src/lib/libsmedia/plugins/Makefile.plugin index 0dd6e561b6..331d8bfc9e 100644 --- a/usr/src/lib/libsmedia/plugins/Makefile.plugin +++ b/usr/src/lib/libsmedia/plugins/Makefile.plugin @@ -22,8 +22,6 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# LIBS = $(DYNLIB) @@ -41,9 +39,8 @@ all := TARGET= all clean := TARGET= clean clobber := TARGET= clobber install := TARGET= install -lint := TARGET= lint -all install clean lint: $(SUBDIRS) +all install clean: $(SUBDIRS) clobber : $(SUBDIRS) $(RM) -f $(POFILE) @@ -64,4 +61,4 @@ $(POFILE) : $(POFILE_SRCS) $(COMPILE.cpp) $(POFILE_SRCS) | $(XGETTEXT) $(XGETFLAGS) - $(SED) -e '/^domain/d' messages.po > $@ $(RM) messages.po - + |