--- a/usr/src/Makefile Thu Jan 31 00:59:48 2008 -0700
+++ b/usr/src/Makefile Mon Feb 04 17:06:52 2008 -0500
@@ -50,7 +50,7 @@
all install: headers .WAIT lib .WAIT cmd .WAIT pkgs
-clean clobber lint: $(SUBDIRS)
+clean clobber lint: $(SUBDIRS) pkgdefs
proto: headers
@@ -62,7 +62,7 @@
build-tools:
@cd tools; pwd; $(MAKE) install
-$(SUBDIRS): FRC
+$(SUBDIRS) pkgdefs: FRC
@cd $@; pwd; $(MAKE) $(TARGET)
$(SRC)/pkgdefs/awk_pkginfo:
--- a/usr/src/cmd/makeuuid/Makefile Thu Jan 31 00:59:48 2008 -0700
+++ b/usr/src/cmd/makeuuid/Makefile Mon Feb 04 17:06:52 2008 -0500
@@ -47,11 +47,6 @@
MSG_DOMAIN = SUNW_INSTALL_UUID
MSG_DIR = .
-# Where to find header files
-LOCAL =
-RELATED =
-GENERAL =
-
LDLIBS += -lsocket
CFLAGS += $(DEBUG_CFLAGS)
@@ -60,25 +55,17 @@
-DPROG_NAME=\"${PROG}\" \
$(CPPFLAGS.master)
-all: $(ARCH) $(PROG)
+CLOBBERFILES += $(MSG_DOMAIN).po
-$(PROG): $(ARCH) $(OBJECTS)
- $(PURIFY) $(LINK.c) -o $@ $(OBJECTS) $(LDFLAGS) $(LDLIBS)
- cp $@ $(ARCH)
+all: $(PROG)
-${ARCH}:
- [ -d ${ARCH} ] || (rm -f ${ARCH} ;mkdir -p ${ARCH})
-
-${ARCH}/%.o: %.c
- ${COMPILE.c} -o $@ $<
-
-
+$(PROG): $(OBJECTS)
+ $(LINK.c) -o $@ $(OBJECTS) $(LDLIBS)
+
install: all .WAIT $(ROOTUSRBINPROGS) .WAIT messages .WAIT $(INSTMSGS)
install_h:
-CLOBBERFILES+= $(MSG_DOMAIN).po
-
clean:
$(RM) $(PICS) $(OBJECTS) *.o *~
--- a/usr/src/cmd/webstart/wsreg/Makefile Thu Jan 31 00:59:48 2008 -0700
+++ b/usr/src/cmd/webstart/wsreg/Makefile Mon Feb 04 17:06:52 2008 -0500
@@ -146,11 +146,9 @@
LDFLAGS += -R/usr/lib -lm -lsecdb -ladm
LDLIBS += -L$(ROOTUSRLIB) -L$(ROOTADMINLIB)
-#CFLAGS += $(DEBUG_CFLAGS) -xs
INCLUDES= -I$(ROOTINCADMIN)
CPPFLAGS += $(INCLUDES) -O
-#CPPFLAGS += $(INCLUDES)
-
+CLOBBERFILES += $(DYNLIB) $(DYNLIBLINK) $(PROG) $(INSTALLPROG) $(MSG_DOMAIN).po
regconvert: $(REGOBJS) $(HDRS)
$(PURIFY) $(LINK.c) -o $@ $(REGOBJS) $(LDFLAGS) $(LDLIBS) -lwsreg -lc
@@ -175,8 +173,6 @@
dynamic: $(DYNLIB) $(DYNLIBLINK) $(ROOTUSRLIBDYNLIBS) $(ROOTUSRLIBDYNLIBLINK)
-CLOBBERFILES+= $(DYNLIB) $(DYNLIBLINK) $(PROG) $(INSTALLPROG) $(MSG_DOMAIN).po
-
clean:
$(RM) $(PICS) $(PRDOBJS) $(REGOBJS)
--- a/usr/src/lib/libinst/Makefile Thu Jan 31 00:59:48 2008 -0700
+++ b/usr/src/lib/libinst/Makefile Mon Feb 04 17:06:52 2008 -0500
@@ -92,7 +92,7 @@
link:
rm -f $(LIBRARY); $(LN) objs/$(ARCH)/libinst.a $(LIBRARY);
-CLOBBERFILES+= $(LB) $(LIBRARY)
+CLOBBERFILES += $(LB) $(LIBRARY) scriptvfy.c
lint: $(LINTLIB)
--- a/usr/src/lib/libspmisvc/Makefile Thu Jan 31 00:59:48 2008 -0700
+++ b/usr/src/lib/libspmisvc/Makefile Mon Feb 04 17:06:52 2008 -0500
@@ -152,6 +152,7 @@
@#
@sed 's/\\\\n/\\n/g' svc_templates.c > svc_templatesTMP.c
@$(ROOTADMIN)/bin/xgetsh -d $(MSG_DOMAIN) svc_templatesTMP.c
+ @rm svc_templatesTMP.c
@#
@# Get messages from the other C files
@#
--- a/usr/src/opensolaris_build.sh Thu Jan 31 00:59:48 2008 -0700
+++ b/usr/src/opensolaris_build.sh Mon Feb 04 17:06:52 2008 -0500
@@ -40,12 +40,12 @@
# setup the proto area, creating the necessary directory tree
rm -rf $ROOT
-dmake -k -m serial proto
+$SPRO_ROOT/bin/dmake -k -m serial proto
# create links to snadm libraries in proto area
ln -s /usr/snadm/lib/libadmutil.so $ROOT/usr/snadm/lib
ln -s /usr/snadm/lib/libadmldb.so $ROOT/usr/snadm/lib
# Build and install the individual components
-dmake -e -k -m parallel install
+$SPRO_ROOT/bin/dmake -e -k -m parallel install