diff options
| author | Moriah Waterland <Moriah.Waterland@Sun.COM> | 2009-09-04 10:51:44 -0600 |
|---|---|---|
| committer | Moriah Waterland <Moriah.Waterland@Sun.COM> | 2009-09-04 10:51:44 -0600 |
| commit | 22fb2eeb50dd2ffd3aefea05536263203fae0600 (patch) | |
| tree | 69b0a161ba90db6fb8be7c0bfa2adc8ed3fc2e8a /usr/src/lib | |
| parent | 3f768744d2e8c0333569a3df61dd2df1badc781e (diff) | |
| download | illumos-joyent-22fb2eeb50dd2ffd3aefea05536263203fae0600.tar.gz | |
6872091 Need to deliver instzones_api.h in SUNWinstallint
--HG--
rename : usr/src/lib/libinstzones/common/instzones_api.h => usr/src/lib/libinstzones/hdrs/instzones_api.h
Diffstat (limited to 'usr/src/lib')
| -rw-r--r-- | usr/src/lib/Makefile | 1 | ||||
| -rw-r--r-- | usr/src/lib/libinstzones/Makefile | 17 | ||||
| -rw-r--r-- | usr/src/lib/libinstzones/common/instzones_lib.h | 5 | ||||
| -rw-r--r-- | usr/src/lib/libinstzones/common/llib-linstzones | 2 | ||||
| -rw-r--r-- | usr/src/lib/libinstzones/hdrs/instzones_api.h (renamed from usr/src/lib/libinstzones/common/instzones_api.h) | 0 |
5 files changed, 21 insertions, 4 deletions
diff --git a/usr/src/lib/Makefile b/usr/src/lib/Makefile index 9ed6c90e00..2c23ad27e3 100644 --- a/usr/src/lib/Makefile +++ b/usr/src/lib/Makefile @@ -407,6 +407,7 @@ HDRSUBDIRS= \ libinetcfg \ libinetsvc \ libinetutil \ + libinstzones \ libipmi \ libipmp \ libipp \ diff --git a/usr/src/lib/libinstzones/Makefile b/usr/src/lib/libinstzones/Makefile index a00bec1cf5..12deb8b6c8 100644 --- a/usr/src/lib/libinstzones/Makefile +++ b/usr/src/lib/libinstzones/Makefile @@ -23,6 +23,14 @@ # Use is subject to license terms. # + +# include library definitions +include $(SRC)/lib/Makefile.lib + +HDRS = instzones_api.h +HDRDIR = hdrs + + SUBDIRS = $(MACH) all := TARGET = all @@ -40,4 +48,13 @@ all clean clobber install _msg lint: $(SUBDIRS) $(SUBDIRS): FRC @cd $@; pwd; $(MAKE) $(TARGET) + +install_h: $(ROOTHDRS) + +check: $(CHECKHDRS) + + FRC: + +# include library targets +include $(SRC)/lib/Makefile.targ diff --git a/usr/src/lib/libinstzones/common/instzones_lib.h b/usr/src/lib/libinstzones/common/instzones_lib.h index 3dbceabe8f..969a025a7c 100644 --- a/usr/src/lib/libinstzones/common/instzones_lib.h +++ b/usr/src/lib/libinstzones/common/instzones_lib.h @@ -19,7 +19,7 @@ * CDDL HEADER END */ /* - * Copyright 2008 Sun Microsystems, Inc. All rights reserved. + * Copyright 2009 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -46,10 +46,9 @@ #include <zone.h> #include <libzonecfg.h> #include <libcontract.h> +#include <instzones_api.h> -/* Local includes */ -#include "instzones_api.h" /* * C++ prefix diff --git a/usr/src/lib/libinstzones/common/llib-linstzones b/usr/src/lib/libinstzones/common/llib-linstzones index 9d1d8a5f69..62e629c562 100644 --- a/usr/src/lib/libinstzones/common/llib-linstzones +++ b/usr/src/lib/libinstzones/common/llib-linstzones @@ -28,4 +28,4 @@ /* LINTLIBRARY */ /* PROTOLIB1 */ -#include "instzones_api.h" +#include <instzones_api.h> diff --git a/usr/src/lib/libinstzones/common/instzones_api.h b/usr/src/lib/libinstzones/hdrs/instzones_api.h index 5fea8c0ce6..5fea8c0ce6 100644 --- a/usr/src/lib/libinstzones/common/instzones_api.h +++ b/usr/src/lib/libinstzones/hdrs/instzones_api.h |