XFree86 4.3.99.16 Bring the tree up to date for the Cygwin folksxf86-4_3_99_16

1 files changed, 62 insertions, 73 deletions

diff --git a/lnxLib.rules b/lnxLib.rules
index e564945..5d5407f 100644
--- a/lnxLib.rules
+++ b/lnxLib.rules
@@ -1,5 +1,5 @@
 XCOMM $Xorg: lnxLib.rules,v 1.3 2000/08/17 19:41:47 cpqbld Exp $
-XCOMM $XFree86: xc/config/cf/lnxLib.rules,v 3.44 2002/11/18 22:47:25 dawes Exp $
+XCOMM $XFree86: xc/config/cf/lnxLib.rules,v 3.52 2003/10/31 20:49:03 herrb Exp $
 
 /*
  * Linux shared library rules (DLL & ELF versions)
@@ -85,7 +85,9 @@ XCOMM $XFree86: xc/config/cf/lnxLib.rules,v 3.44 2002/11/18 22:47:25 dawes Exp $
 #   define ExtraLoadFlags -Wl,-rpath,$(USRLIBDIRPATH)
 #  endif
 # endif
-
+# ifndef HardCodeLibdirFlag
+#  define HardCodeLibdirFlag -Wl,-rpath,$(USRLIBDIRPATH)
+# endif
 # if !defined(ShlibGlobalsFlags)
 #  define ShlibGlobalsFlags -Wl,-Bsymbolic
 # endif
@@ -106,6 +108,26 @@ install:: Concat(lib,libname.so.rev) 					@@\
 	  $(LN) Concat(lib,libname.so.rev) Concat($(DESTDIR)dest/lib,libname.so)); fi
 # endif /* InstallSharedLibrary */
 
+# ifndef InstallSharedLibtoolLibrary
+
+#  define SetRevisions(rev) V=`expr rev : '\([^:]*\)'`; \		@@\
+		R=`expr rev : '.*:\([^:]*\):'`; \			@@\
+		A=`expr rev : '.*:\([^:]*\)'`; \			@@\
+		MAJ=`expr $$V - $$A`; \					@@\
+		MIN=$$A.$$R
+
+#  define	InstallSharedLibtoolLibrary(libname,rev,dest)		@@\
+install:: Concat(lib,libname.so) 					@@\
+	MakeDir($(DESTDIR)dest)						@@\
+	@set +e; SetRevisions(rev); \					@@\
+		set -xe; \						@@\
+		$(INSTALL) $(INSTALLFLAGS) $(INSTBINFLAGS) Concat(lib,libname.so.$$MAJ.$$MIN) $(DESTDIR)dest; \ @@\
+		$(RM) Concat($(DESTDIR)dest/lib,libname.so.$$MAJ); \	@@\
+		$(LN) Concat(lib,libname.so.$$MAJ.$$MIN) Concat($(DESTDIR)dest/lib,libname.so.$$MAJ); \ @@\
+		$(RM) Concat($(DESTDIR)dest/lib,libname.so); \		@@\
+		$(LN) Concat(lib,libname.so.$$MAJ.$$MIN) Concat($(DESTDIR)dest/lib,libname.so)
+# endif /* InstallSharedLibrary */
+
 /*
  * InstallSharedLibraryData - generate rules to install the shared library data
  */
@@ -120,21 +142,14 @@ install:: Concat(lib,libname.so.rev) 					@@\
  * the library gone for long periods.
  */
 # ifndef SharedLibraryTarget
-#  ifdef UseInstalled
-#   define LinkBuildSonameLibrary(lib) true
-#  else
-#   define LinkBuildSonameLibrary(lib) (RemoveFile($(BUILDLIBDIR)/lib); \
-	cd $(BUILDLIBDIR); $(LN) $(BUILDINCTOP)/$(CURRENT_DIR)/lib .)
-#  endif
-
 #  define SharedLibraryTarget(libname,rev,solist,down,up)		@@\
 AllTarget(Concat(lib,libname.so.rev))					@@\
 									@@\
 Concat(lib,libname.so.rev):  solist $(EXTRALIBRARYDEPS)			@@\
 	$(RM) $@~							@@\
-	@SONAME=`echo $@ | sed 's/\.[^\.]*$$//'`; set -x; \		@@\
-		(cd down; $(CC) -o up/$@~ $(SHLIBLDFLAGS) -Wl,-soname,$$SONAME solist $(REQUIREDLIBS) BaseShLibReqs); \ @@\
-		$(RM) $$SONAME; $(LN) $@ $$SONAME; \			@@\
+	@SONAME=`echo $@ | sed 's/\.[^\.]*$$//'`; (set -x; \		@@\
+		cd down; $(CC) -o up/$@~ $(SHLIBLDFLAGS) -Wl,-soname,$$SONAME solist $(REQUIREDLIBS) BaseShLibReqs) || exit 1; \ @@\
+		(set -x; $(RM) $$SONAME; $(LN) $@ $$SONAME); \		@@\
 		LinkBuildSonameLibrary($$SONAME)			@@\
 	$(RM) $@ 							@@\
 	$(MV) $@~ $@							@@\
@@ -145,27 +160,48 @@ Concat(lib,libname.so.rev):  solist $(EXTRALIBRARYDEPS)			@@\
 	LinkBuildLibraryMaybe(Concat(lib,libname.so),$(SOSYMLINK))	@@\
 									@@\
 clean::									@@\
-	@MAJREV=`expr rev : '\([^.]*\)'`; \				@@\
+	@MAJREV=`echo rev | sed 's/\.[^\.]*$$//'`; \			@@\
 	set -x; $(RM) Concat(lib,libname.so.$$MAJREV)			@@\
 	$(RM) Concat(lib,libname.so.rev) Concat(lib,libname.so)
 
 # endif /* SharedLibraryTarget */
 
+
+# ifndef SharedLibtoolLibraryTarget
+#  define SharedLibtoolLibraryTarget(libname,rev,solist,down,up)	@@\
+AllTarget(Concat(lib,libname.so))					@@\
+									@@\
+Concat(lib,libname.so):  solist $(EXTRALIBRARYDEPS)			@@\
+	$(RM) $@~							@@\
+	@set +e; SetRevisions(rev); set -e; \				@@\
+		SONAME=$@.$$MAJ; \					@@\
+		(set -x; \						@@\
+		$(RM) $@.$$MAJ.$$MIN~; \				@@\
+		cd down; $(CC) -o up/$@.$$MAJ.$$MIN~ $(SHLIBLDFLAGS) -Wl,-soname,$$SONAME solist $(REQUIREDLIBS) BaseShLibReqs) || exit 1; \ @@\
+		(set -x; \						@@\
+		$(RM) $$SONAME; $(LN) $@.$$MAJ.$$MIN $$SONAME); \	@@\
+		LinkBuildSonameLibrary($$SONAME); \			@@\
+		(set -x; \						@@\
+		$(RM) $@.$$MAJ.$$MIN; \					@@\
+		$(MV) $@.$$MAJ.$$MIN~ $@.$$MAJ.$$MIN; \			@@\
+	  	$(RM) $@; \						@@\
+	  	$(LN) $@.$$MAJ.$$MIN $@); \				@@\
+		LinkBuildLibraryInline($@.$$MAJ.$$MIN); \		@@\
+		LinkBuildLibraryInline($@)				@@\
+									@@\
+clean::									@@\
+	@set +e; SetRevisions(rev); \					@@\
+		set -xe; \						@@\
+		$(RM) Concat(lib,libname.so.$$MAJ); \			@@\
+		$(RM) Concat(lib,libname.so.$$MAJ.$$MIN)		@@\
+	$(RM) Concat(lib,libname.so)
+
+# endif /* SharedLibtoolLibraryTarget */
+
 /*
  * SharedDepLibraryTarget - generate rules to create a shared library.
  */
 # ifndef SharedDepLibraryTarget
-#  ifdef UseInstalled
-#   ifndef LinkBuildSonameLibrary
-#    define LinkBuildSonameLibrary(lib) true
-#   endif
-#  else
-#   ifndef LinkBuildSonameLibrary
-#    define LinkBuildSonameLibrary(lib) (RemoveFile($(BUILDLIBDIR)/lib); \
-	cd $(BUILDLIBDIR); $(LN) $(BUILDINCTOP)/$(CURRENT_DIR)/lib .)
-#   endif
-#  endif
-
 #   define SharedDepLibraryTarget(libname,rev,deplist,solist,down,up)	@@\
 AllTarget(Concat(lib,libname.so.rev))					@@\
 									@@\
@@ -184,7 +220,7 @@ Concat(lib,libname.so.rev):  deplist $(EXTRALIBRARYDEPS)		@@\
 	LinkBuildLibraryMaybe(Concat(lib,libname.so),$(SOSYMLINK))	@@\
 									@@\
 clean::									@@\
-	@MAJREV=`expr rev : '\([^.]*\)'`; \				@@\
+	@MAJREV=`echo rev | sed 's/\.[^\.]*$$//'`; \			@@\
 	set -x; $(RM) Concat(lib,libname.so.$$MAJREV)			@@\
 	$(RM) Concat(lib,libname.so.rev) Concat(lib,libname.so)
 
@@ -194,17 +230,6 @@ clean::									@@\
  * SharedDepCplusplusLibraryTarget - generate rules to create a shared library.
  */
 #ifndef SharedDepCplusplusLibraryTarget
-#ifdef UseInstalled
-#ifndef LinkBuildSonameLibrary
-#define LinkBuildSonameLibrary(lib) true
-#endif
-#else
-#ifndef LinkBuildSonameLibrary
-#define LinkBuildSonameLibrary(lib) (RemoveFile($(BUILDLIBDIR)/lib); \
-	cd $(BUILDLIBDIR); $(LN) $(BUILDINCTOP)/$(CURRENT_DIR)/lib .)
-#endif
-#endif
-
 #define SharedDepCplusplusLibraryTarget(libname,rev,deplist,solist,down,up) @@\
 AllTarget(Concat(lib,libname.so.rev))					@@\
 									@@\
@@ -223,7 +248,7 @@ Concat(lib,libname.so.rev):  deplist $(EXTRALIBRARYDEPS)		@@\
 	LinkBuildLibraryMaybe(Concat(lib,libname.so),$(SOSYMLINK))	@@\
 									@@\
 clean::									@@\
-	@MAJREV=`expr rev : '\([^.]*\)'`; \				@@\
+	@MAJREV=`echo rev | sed 's/\.[^\.]*$$//'`; \			@@\
 	set -x; $(RM) Concat(lib,libname.so.$$MAJREV)			@@\
 	$(RM) Concat(lib,libname.so.rev) Concat(lib,libname.so)
 
@@ -450,42 +475,6 @@ JUMP_LDLIBS_Xaw = $(JUMP_ROOT_Xt)/libXt.sa $(JUMP_ROOT_Xt)/libXmu.sa \
 	$(JUMP_ROOT_Xt)/libXext.sa $(JUMP_ROOT_X11)/libX11.sa \
 	$(JUMP_LDLIBS_libc)
 
-# libPEX.so (PEX5)
-JUMP_ROOT_PEX5 = $(PEXLIBSRC)
-JUMP_IS_HOST_PEX5 = YES
-JUMP_STUBLIBS_PEX5 = libPEX5.sa
-JUMP_SUBDIRS_PEX5 = $(JUMP_ROOT_X11)
-JUMP_DIR_PEX5 = $(JUMP_ROOT_PEX5)/shared
-JUMP_VARS_PEX5 = $(JUMP_ROOT_PEX5)/jump_vars
-JUMP_FUNCS_PEX5 = $(JUMP_ROOT_PEX5)/jump_funcs
-JUMP_IGNORE_PEX5 = $(JUMP_ROOT_PEX5)/jump_ignore
-JUMP_EXPORT_PEX5 = $(JUMP_DIR_PEX5)/jump.vars
-JUMP_IMPORT_PEX5 = $(JUMP_EXPORT_X11)
-JUMP_ADDRESS_PEX5 = 0x60b00000
-JUMP_JUMPTABLESIZE_PEX5 = 0x4000
-JUMP_GOTSIZE_PEX5 = 4096
-JUMP_STUBNAMES_PEX5 = libPEX5
-JUMP_STUBS_IMPORT_PEX5 = $(JUMP_STUBS_IMPORT_X11) $(LIBM_SA)
-JUMP_LDLIBS_PEX5 = $(JUMP_ROOT_X11)/libX11.sa $(JUMP_LDLIBS_libc) -lm
-
-# libXIE.so (XIE)
-JUMP_ROOT_XIE = $(XIELIBSRC)
-JUMP_IS_HOST_XIE = YES
-JUMP_STUBLIBS_XIE = libXIE.sa
-JUMP_SUBDIRS_XIE = $(JUMP_ROOT_X11)
-JUMP_DIR_XIE = $(JUMP_ROOT_XIE)/shared
-JUMP_VARS_XIE = $(JUMP_ROOT_XIE)/jump_vars
-JUMP_FUNCS_XIE = $(JUMP_ROOT_XIE)/jump_funcs
-JUMP_IGNORE_XIE = $(JUMP_ROOT_XIE)/jump_ignore
-JUMP_EXPORT_XIE = $(JUMP_DIR_XIE)/jump.vars
-JUMP_IMPORT_XIE = $(JUMP_EXPORT_X11)
-JUMP_ADDRESS_XIE = 0x60be0000
-JUMP_JUMPTABLESIZE_XIE = 0x4000
-JUMP_GOTSIZE_XIE = 4096
-JUMP_STUBNAMES_XIE = libXIE
-JUMP_STUBS_IMPORT_XIE = $(JUMP_STUBS_IMPORT_X11) $(LIBM_SA)
-JUMP_LDLIBS_XIE = $(JUMP_ROOT_X11)/libX11.sa $(JUMP_LDLIBS_libc) -lm
-
 # endif /* !UseInstalled */
 
 /*