diff options
| author | Keith M Wesolowski <wesolows@foobazco.org> | 2014-01-16 23:39:29 +0000 |
|---|---|---|
| committer | Keith M Wesolowski <wesolows@foobazco.org> | 2014-01-16 23:39:57 +0000 |
| commit | 0cb8fb5c042836e97edce591b6ec05c0e5562165 (patch) | |
| tree | 24a5f4c0e17c2c13cfd484fa470d2fd317fc71c7 /usr/src/lib/libshare | |
| parent | c69ce773d7d725c37d6e6c7698e7f7f891f8fbfc (diff) | |
| download | illumos-joyent-0cb8fb5c042836e97edce591b6ec05c0e5562165.tar.gz | |
3915 Add adjuncts support to the build (fix auto-mismerge)
Diffstat (limited to 'usr/src/lib/libshare')
| -rw-r--r-- | usr/src/lib/libshare/Makefile.com | 2 | ||||
| -rw-r--r-- | usr/src/lib/libshare/autofs/Makefile.com | 2 | ||||
| -rw-r--r-- | usr/src/lib/libshare/nfs/Makefile.com | 2 | ||||
| -rw-r--r-- | usr/src/lib/libshare/smb/Makefile.com | 1 | ||||
| -rw-r--r-- | usr/src/lib/libshare/smbfs/Makefile.com | 2 |
5 files changed, 0 insertions, 9 deletions
diff --git a/usr/src/lib/libshare/Makefile.com b/usr/src/lib/libshare/Makefile.com index d827b7eac4..328ffb353a 100644 --- a/usr/src/lib/libshare/Makefile.com +++ b/usr/src/lib/libshare/Makefile.com @@ -42,8 +42,6 @@ $(LINTLIB) := SRCS = $(SRCDIR)/$(LINTSRC) #add nfs/lib directory as part of the include path CFLAGS += $(CCVERBOSE) -CPPFLAGS += -D_REENTRANT -I$(NFSLIB_DIR) \ - -I$(ADJUNCT_PROTO)/usr/include/libxml2 CERRWARN += -_gcc=-Wno-parentheses CERRWARN += -_gcc=-Wno-uninitialized CERRWARN += -_gcc=-Wno-switch diff --git a/usr/src/lib/libshare/autofs/Makefile.com b/usr/src/lib/libshare/autofs/Makefile.com index bbc3759e01..d110bf634a 100644 --- a/usr/src/lib/libshare/autofs/Makefile.com +++ b/usr/src/lib/libshare/autofs/Makefile.com @@ -46,8 +46,6 @@ LDLIBS += -lshare -lscf -lumem -lc -lxml2 #add nfs/lib directory as part of the include path CFLAGS += $(CCVERBOSE) -CPPFLAGS += -D_REENTRANT -I$(AUTOFSSMFLIB_DIR) \ - -I$(ADJUNCT_PROTO)/usr/include/libxml2 CERRWARN += -_gcc=-Wno-switch CERRWARN += -_gcc=-Wno-unused-variable CERRWARN += -_gcc=-Wno-uninitialized diff --git a/usr/src/lib/libshare/nfs/Makefile.com b/usr/src/lib/libshare/nfs/Makefile.com index 7a4da89955..ed89b6d960 100644 --- a/usr/src/lib/libshare/nfs/Makefile.com +++ b/usr/src/lib/libshare/nfs/Makefile.com @@ -46,8 +46,6 @@ LDLIBS += -lshare -lnsl -lscf -lumem -lc -lxml2 #add nfs/lib directory as part of the include path CFLAGS += $(CCVERBOSE) -CPPFLAGS += -D_REENTRANT -I$(NFSLIB_DIR) \ - -I$(ADJUNCT_PROTO)/usr/include/libxml2 -I$(SRCDIR)/../common CERRWARN += -_gcc=-Wno-parentheses CERRWARN += -_gcc=-Wno-switch CERRWARN += -_gcc=-Wno-unused-variable diff --git a/usr/src/lib/libshare/smb/Makefile.com b/usr/src/lib/libshare/smb/Makefile.com index d731566338..0fc5f66142 100644 --- a/usr/src/lib/libshare/smb/Makefile.com +++ b/usr/src/lib/libshare/smb/Makefile.com @@ -49,7 +49,6 @@ LDLIBS += -lshare -ldlpi -lnsl -lnvpair -lscf -lumem -lc all install := LDLIBS += -lxml2 CFLAGS += $(CCVERBOSE) -CPPFLAGS += -D_REENTRANT -I$(ADJUNCT_PROTO)/usr/include/libxml2 CERRWARN += -_gcc=-Wno-char-subscripts CERRWARN += -_gcc=-Wno-switch CPPFLAGS += -D_REENTRANT -I$(ADJUNCT_PROTO)/usr/include/libxml2 \ diff --git a/usr/src/lib/libshare/smbfs/Makefile.com b/usr/src/lib/libshare/smbfs/Makefile.com index 0f439bf004..36b4875560 100644 --- a/usr/src/lib/libshare/smbfs/Makefile.com +++ b/usr/src/lib/libshare/smbfs/Makefile.com @@ -41,8 +41,6 @@ LIBS = $(DYNLIB) LDLIBS += -lshare -lscf -lumem -luuid -lc -lxml2 -lsmbfs CFLAGS += $(CCVERBOSE) -CPPFLAGS += -D_REENTRANT -I$(ADJUNCT_PROTO)/usr/include/libxml2 \ - -I$(SRCDIR)/../common -I$(SRC)/lib/libsmbfs -I$(SRC)/uts/common CERRWARN += -_gcc=-Wno-switch CERRWARN += -_gcc=-Wno-uninitialized CPPFLAGS += -D_REENTRANT -I$(ADJUNCT_PROTO)/usr/include/libxml2 \ |