Merging XORG-CURRENT into trunk

1 files changed, 112 insertions, 45 deletions

diff --git a/ibmLib.rules b/ibmLib.rules
index 215c913..afcf700 100644
--- a/ibmLib.rules
+++ b/ibmLib.rules
@@ -1,11 +1,11 @@
 XCOMM $Xorg: ibmLib.rules,v 1.3 2000/08/17 19:41:47 cpqbld Exp $
+XCOMM $XdotOrg: xc/config/cf/ibmLib.rules,v 1.1.4.3 2003/12/15 16:42:40 kaleb Exp $
 
 /*
  * AIX shared library rules
  */
 
-XCOMM $XFree86: xc/config/cf/ibmLib.rules,v 3.6 2001/01/17 16:22:31 dawes Exp $
-
+XCOMM $XFree86: xc/config/cf/ibmLib.rules,v 3.5 2000/02/13 06:15:18 dawes Exp $
 #ifndef HasSharedLibraries
 # define HasSharedLibraries YES
 #endif
@@ -18,8 +18,12 @@ XCOMM $XFree86: xc/config/cf/ibmLib.rules,v 3.6 2001/01/17 16:22:31 dawes Exp $
 #ifndef SharedCodeDef
 # define SharedCodeDef -DSHAREDCODE
 #endif
-#ifndef SharedLibraryDef
-# define SharedLibraryDef -DAIXSHLIB
+#if OSMajorVersion < 5
+# ifndef SharedLibraryDef
+#  define SharedLibraryDef -DAIXSHLIB
+# endif
+#else
+# define SharedLibraryDef /**/
 #endif
 #ifndef ShLibIncludeFile
 # define ShLibIncludeFile <ibmLib.tmpl>
@@ -32,9 +36,9 @@ XCOMM $XFree86: xc/config/cf/ibmLib.rules,v 3.6 2001/01/17 16:22:31 dawes Exp $
 #endif
 #if !defined(LdPostLib) && !defined(UseInstalled) && OSMajorVersion > 3
 # if ThreadedX
-#  define LdPostLib -blibpath:$(USRLIBDIRPATH):/usr/lib/threads:/usr/lib:/lib
+#  define LdPostLib -bnoipath -blibpath:$(USRLIBDIRPATH):/usr/lib/threads:/usr/lib:/lib
 # else
-#  define LdPostLib -blibpath:$(USRLIBDIRPATH):/usr/lib:/lib
+#  define LdPostLib -bnoipath -blibpath:$(USRLIBDIRPATH):/usr/lib:/lib
 # endif
 # define SharedLibPostRef $(LDPOSTLIBS)
 #endif
@@ -80,51 +84,68 @@ XCOMM $XFree86: xc/config/cf/ibmLib.rules,v 3.6 2001/01/17 16:22:31 dawes Exp $
     && !defined(UseImports) && !defined(ImportX11)
    /* we want this to be defined only when building X */
 
-# if OSMajorVersion < 4
+# if OSMajorVersion < 5
+#  if OSMajorVersion < 4
 /*
  * SharedLibReferences - variables for shared libraries
  */
 
+#   ifndef SharedLibReferences
+#    define SharedLibReferences(varname,libname,libsource,revname,rev)	@@\
+Concat3(DEP,varname,LIB) = /**/						@@\
+Concat(varname,LIB) = _Use(Concat(-l,libname),Concat(libsource/lib,libname.a)) @@\
+LintLibReferences(varname,libname,libsource)
+#   endif
+
+#  else /* OSMajorVersion < 4 */
+
+#   ifndef SharedLibReferences
+#    define SharedLibReferences(varname,libname,libsource,revname,rev)	@@\
+Concat3(DEP,varname,LIB) = /**/						@@\
+Concat(varname,LIB) = _Use(Concat(-l,libname),Concat($(BUILDLIBDIR),/libname.imp) Concat3($(BUILDLIBDIR),/lib,libname.a)) @@\
+LintLibReferences(varname,libname,libsource)
+#   endif
+
+#  endif
+# else /* OSMajorVersion < 5 */
+
 #  ifndef SharedLibReferences
 #   define SharedLibReferences(varname,libname,libsource,revname,rev)	@@\
 Concat3(DEP,varname,LIB) = /**/						@@\
-Concat(varname,LIB) = _Use(Concat(-l,libname),Concat(libsource/lib,libname.a)) @@\
+Concat(varname,LIB) = _Use(Concat(-l,libname), Concat3($(BUILDLIBDIR),/lib,libname.so)) @@\
 LintLibReferences(varname,libname,libsource)
 #  endif
 
 # endif
 
-# if OSMajorVersion < 4
+# if OSMajorVersion < 5
+#  if OSMajorVersion < 4
 /*
  * SharedFontLibReferences - shared font libraries
  */
 
-#  ifndef SharedLibReferences
-#   define SharedLibReferences()					@@\
+#   ifndef SharedFontLibReferences
+#    define SharedFontLibReferences()					@@\
 DEPFONTLIB = /**/							@@\
 FONTLIB = -L$(FREETYPELIBDIR) _Use(-lXfont,$(FONTLIBSRC)/libXfont.a)	@@\
 LintLibReferences(XFONT,Xfont,$(FONTLIBSRC))
+#   endif
+#  else
+#   ifndef SharedFontLibReferences
+#    define SharedFontLibReferences()					@@\
+DEPFONTLIB = /**/							@@\
+FONTLIB = -L$(FREETYPELIBDIR) _Use(-lXfont,$(BUILDLIBDIR)/font.imp) $(BUILDLIBDI)/libXfont.a)) @@\
+LintLibReferences(XFONT,Xfont,$(FONTLIBSRC))
+#   endif
 #  endif
-
-# else
-
+# else /* OSMajorVersion < 5 */
 #  ifndef SharedFontLibReferences
 #   define SharedFontLibReferences()					@@\
 DEPFONTLIB = /**/							@@\
-FONTLIB = -L$(FREETYPELIBDIR) _Use(-lXfont,$(BUILDLIBDIR)/font.imp) $(BUILDLIBDI
-)/libXfont.a)) @@\
+FONTLIB = -L$(FREETYPELIBDIR) _Use(-lXfont,$(BUILDLIBDI)/libXfont.so)) @@\
 LintLibReferences(XFONT,Xfont,$(FONTLIBSRC))
 #  endif
 
-# else
-
-#  ifndef SharedLibReferences
-#   define SharedLibReferences(varname,libname,libsource,revname,rev)	@@\
-Concat3(DEP,varname,LIB) = /**/						@@\
-Concat(varname,LIB) = _Use(Concat(-l,libname),Concat($(BUILDLIBDIR),/libname.imp) Concat3($(BUILDLIBDIR),/lib,libname.a)) @@\
-LintLibReferences(varname,libname,libsource)
-#  endif
-
 # endif
 
 /*
@@ -154,8 +175,15 @@ LintLibReferences(varname,libname,libsource)
  * InstallSharedLibrary - generate rules to install the shared library.
  */
 #ifndef InstallSharedLibrary
-# define InstallSharedLibrary(libname,rev,dest)				@@\
+# if OSMajorVersion < 5
+#  define InstallSharedLibrary(libname,rev,dest)			@@\
 InstallLibrary(libname,dest)
+# else /* OSMajorVersion < 5 */
+#  define InstallSharedLibrary(libname,rev,dest)			@@\
+install:: Concat(lib,libname.so)					@@\
+	MakeDir($(DESTDIR)dest)						@@\
+	$(INSTALL) $(INSTALLFLAGS) $(INSTBINFLAGS) Concat(lib,libname.so) $(DESTDIR)dest
+# endif /* OSMajorVersion < 5 */
 #endif /* InstallSharedLibrary */
 
 /*
@@ -173,10 +201,11 @@ InstallLibrary(libname,dest)
  * IBM uses an unusual shared object file name (shr4.o) in some libraries. 
  * Duplicate this behavior to preserve compatibility with IBM's libraries.
  */
-#if OSMajorVersion < 4
+#if OSMajorVersion < 5
+# if OSMajorVersion < 4
 
-# ifndef SharedLibraryTarget
-#  define SharedLibraryTarget(libname,rev,solist,down,up)		@@\
+#  ifndef SharedLibraryTarget
+#   define SharedLibraryTarget(libname,rev,solist,down,up)		@@\
 AllTarget(Concat(lib,libname.a))					@@\
 									@@\
 Concat(lib,libname.a):  solist $(UNSHAREDOBJS) $(EXTRALIBRARYDEPS)	@@\
@@ -194,12 +223,12 @@ Concat(lib,libname.a):  solist $(UNSHAREDOBJS) $(EXTRALIBRARYDEPS)	@@\
 									@@\
 clean::									@@\
 	$(RM) Concat(lib,libname.a)
-# endif /* SharedLibraryTarget */
+#  endif /* SharedLibraryTarget */
 
-#else /* OSMajorVersion >= 4 */
+# else /* OSMajorVersion < 4 */
 
-# ifndef SharedLibraryTarget
-#  define SharedLibraryTarget(libname,rev,solist,down,up)		@@\
+#  ifndef SharedLibraryTarget
+#   define SharedLibraryTarget(libname,rev,solist,down,up)		@@\
 AllTarget(Concat(lib,libname.a))					@@\
 									@@\
 Concat(lib,libname.a):  solist $(UNSHAREDOBJS) $(EXTRALIBRARYDEPS)	@@\
@@ -218,23 +247,42 @@ Concat(lib,libname.a):  solist $(UNSHAREDOBJS) $(EXTRALIBRARYDEPS)	@@\
 									@@\
 clean::									@@\
 	$(RM) Concat(lib,libname.a)
-# endif /* SharedLibraryTarget */
+#  endif /* SharedLibraryTarget */
+# endif /* OSMajorVersion < 4 */
+#else /* OSMajorVersion < 5 */
+# ifndef SharedLibraryTarget
+#  define SharedLibraryTarget(libname,rev,solist,down,up)		@@\
+AllTarget(Concat(lib,libname.so))					@@\
+									@@\
+Concat(lib,libname.so): solist $(EXTRALIBRARYDEPS)			@@\
+	$(RM) $@~							@@\
+	$(AR) $*.a solist						@@\
+	dump -g $*.a | sed -n -e 's/^[  ]*[0-9][0-9]*[[:space:]]*\([_[:alpha:]][[:alnum:]]*\)/\1/p' | egrep -v \\\. | sort | uniq > $*.syms	@@\
+	$(LD) -bnoipath -bnoentry -bM\:SRE -bE\:$*.syms -o $@~ solist $(REQUIREDLIBS) BaseShLibReqs -lc	@@\
+	$(RM) $@ $*.a $*.syms						@@\
+	$(MV) $@~ $@							@@\
+	LinkBuildLibrary($@)						@@\
+									@@\
+clean::									@@\
+	$(RM) Concat(lib,libname.so.rev) Concat(lib,libname.so)
 
-#endif
+# endif /* SharedLibraryTarget */
+#endif /* OSMajorVersion < 5 */
 
 /*
  * SharedDepLibraryTarget - generate rules to create a shared library.
  */
-#if OSMajorVersion < 4
+#if OSMajorVersion < 5
+# if OSMajorVersion < 4
 
-# ifndef SharedDepLibraryTarget
-#  define SharedDepLibraryTarget(libname,rev,deplist,solist,down,up)	@@\
+#  ifndef SharedDepLibraryTarget
+#   define SharedDepLibraryTarget(libname,rev,deplist,solist,down,up)	@@\
 AllTarget(Concat(lib,libname.a))					@@\
 									@@\
 Concat(lib,libname.a):  deplist $(UNSHAREDOBJS) $(EXTRALIBRARYDEPS)	@@\
 	$(RM) $@~ shr.o shr4.o						@@\
 	(cd down; $(AR) up/$@~ solist)					@@\
-	dump -g $@~ | sed -n -e 's/^[ 	]*[0-9][0-9]*[	 ]*\([^	 .][^	 ]*\)$$/\1/p' > $@.syms	@@\
+	dump -g $@~ | sed -n -e 's/^[   ]*[0-9][0-9]*[   ]*\([^  .][^    ]*\)$$/\1/p' > $@.syms	@@\
 	$(LD) -o shr.o $@~ -H512 -T512 -bM\:SRE -bE\:$@.syms $(REQUIREDLIBS) BaseShLibReqs SharedLibPostRef	@@\
 	$(LN) shr.o shr4.o						@@\
 	$(RM) $@~							@@\
@@ -246,12 +294,12 @@ Concat(lib,libname.a):  deplist $(UNSHAREDOBJS) $(EXTRALIBRARYDEPS)	@@\
 									@@\
 clean::									@@\
 	$(RM) Concat(lib,libname.a)
-# endif /* SharedDepLibraryTarget */
+#  endif /* SharedDepLibraryTarget */
 
-#else /* OSMajorVersion >= 4 */
+# else /* OSMajorVersion < 4 */
 
-# ifndef SharedDepLibraryTarget
-#  define SharedDepLibraryTarget(libname,rev,deplist,solist,down,up)	@@\
+#  ifndef SharedDepLibraryTarget
+#   define SharedDepLibraryTarget(libname,rev,deplist,solist,down,up)	@@\
 AllTarget(Concat(lib,libname.a))					@@\
 									@@\
 Concat(lib,libname.a):  deplist $(UNSHAREDOBJS) $(EXTRALIBRARYDEPS)	@@\
@@ -270,9 +318,28 @@ Concat(lib,libname.a):  deplist $(UNSHAREDOBJS) $(EXTRALIBRARYDEPS)	@@\
 									@@\
 clean::									@@\
 	$(RM) Concat(lib,libname.a)
-# endif /* SharedDepLibraryTarget */
+#  endif /* SharedDepLibraryTarget */
 
-#endif
+# endif /* OSMajorVersion < 4 */
+#else /* OSMajorVersion < 5 */
+# ifndef SharedDepLibraryTarget
+#  define SharedDepLibraryTarget(libname,rev,deplist,solist,down,up)	@@\
+AllTarget(Concat(lib,libname.so))					@@\
+									@@\
+Concat(lib,libname.so):  deplist $(EXTRALIBRARYDEPS)			@@\
+	$(RM) $@~							@@\
+	$(AR) $*.a solist						@@\
+	dump -g $*.a | sed -n -e 's/^[  ]*[0-9][0-9]*[[:space:]]*\([_[:alpha:]][[:alnum:]]*\)/\1/p' | egrep -v \\\. | sort | uniq > $*.syms	@@\
+	$(LD) -bnoipath -bnoentry -bsymbolic -bM\:SRE -bE\:$*.syms -o $@~ solist $(REQUIREDLIBS) BaseShLibReqs -lc	@@\
+	$(RM) $@ $*.a $*.syms						@@\
+	$(MV) $@~ $@							@@\
+	LinkBuildLibrary($@)						@@\
+									@@\
+clean::									@@\
+	$(RM) Concat(lib,libname.so) Concat(lib,libname.so)
+
+# endif /* SharedDepLibraryTarget */
+#endif /* OSMajorVersion < 5 */
 
 /*
  * SharedLibraryDataTarget - generate rules to create shlib data file;