--- a/open-src/lib/libXext/Makefile	Fri Aug 08 16:28:28 2008 -0700
+++ b/open-src/lib/libXext/Makefile	Fri Aug 08 16:27:37 2008 -0700
@@ -30,14 +30,14 @@
 # or other dealings in this Software without prior written authorization
 # of the copyright holder.
 #
-# @(#)Makefile	1.1	08/03/12
+# @(#)Makefile	1.2	08/08/08
 #
 
 # Package name used in tarballs
-LIB_MODULE=libXext
+MODULE_NAME=libXext
 
 # Version number (used in path names)
-LIB_VERS=1.0.4
+MODULE_VERSION=1.0.4
 
 # Patches to apply to source after unpacking, in order
 SOURCE_PATCHES = \
@@ -50,37 +50,29 @@
 # Man pages to apply Sun footer to & attributes to list
 SUNTOUCHED_MANPAGES=man/*.man
 SUN_PACKAGE=SUNWxwplt
-LIB_STABILITY=Committed
+MODULE_STABILITY=Committed
 LIB_MAN_SUFFIX=3Xext
 
-# Library built in tree
-LIB_BUILT=$(SOURCE_DIR)/src/.libs/libXext.so.0
+
 
 # pkg-config files that need to have -R added
 FIX_PC_FILES=xext.pc.in
 
-# Command line options to GNU autoconf configure script
-LIB_ADD_CONFIG_OPTS = --with-lint --enable-lint-library
-
 # Enable Solaris-specific code
-LIB_ADD_CPPFLAGS = -DSUNSOFT
+MODULE_CPPFLAGS = -DSUNSOFT
 
 # Link with version mapfile and libraries that contain sources that used
 # to be in libXext
-LIB_ADD_LD_OPTIONS = -M $(PWD)/mapfile-vers
+MODULE_LD_OPTIONS = -M $(PWD)/mapfile-vers
 
 # Regenerate Makefile.in's from Makefile.am's after patching them
-AUTORECONF=true
+AUTORECONF=yes
+
+# Merge in additional sources from sun-src directory
+ADDITIONAL_SOURCE_DIR=sun-src
 
 ### Rules specific to this directory:
 
-# Merge in additional sources from sun-src directory
-add-sun-src:: $(LNDIR)
-	mkdir -p $(SOURCE_DIR)
-	(cd $(SOURCE_DIR) && $(LNDIR) ../../sun-src)
-
-source_gen:: add-sun-src
-
 DESTDIR=$(PROTODIR)
 INSTDIR=$(DESTDIR)$(X11_INCLUDES_DIR)/X11/extensions