Commit 13783196 authored by dawes's avatar dawes
Browse files

Import of XFree86 4.0.1f

parent 23d67f1b
......@@ -2,7 +2,7 @@ XCOMM platform: $TOG: FreeBSD.cf /main/21 1997/10/05 20:42:34 kaleb $
XCOMM
XCOMM
XCOMM
XCOMM platform: $XFree86: xc/config/cf/FreeBSD.cf,v 3.98 2000/08/16 01:45:27 dawes Exp $
XCOMM platform: $XFree86: xc/config/cf/FreeBSD.cf,v 3.99 2000/11/14 23:58:30 dawes Exp $
#ifndef UseElfFormat
#define UseElfFormat DefaultToElfFormat
......@@ -205,6 +205,11 @@ XCOMM operating system: OSName (OSMajorVersion./**/OSMinorVersion./**/OSTeenyVe
#endif
#endif
/* PAM appeared in FreeBSD 3.1 */
#if (OSMajorVersion > 3) || (OSMajorVersion == 3 && OSMinorVersion >=1 )
#define HasPam YES
#endif
/*
* For FreeBSD 2.2.5 and later don't make any assumptions about the version
* of Tcl in the base OS.
......@@ -501,6 +506,10 @@ InstallManPageAliasesBase(file,destdir,aliases)
#define ServerExtraSysLibs IoLibrary
#ifndef PamLibraries
#define PamLibraries -lpam DlLibrary
#endif
/*
* A hack to work around an optimization problem with gcc 2.95.2
*/
......
......@@ -5,7 +5,7 @@ XCOMM
XCOMM
XCOMM
XCOMM
XCOMM rules: $XFree86: xc/config/cf/Imake.rules,v 3.81 2000/11/02 02:51:05 dawes Exp $
XCOMM rules: $XFree86: xc/config/cf/Imake.rules,v 3.82 2000/11/09 01:35:05 dawes Exp $
/*
* MACHINE-INDEPENDENT RULES; DO NOT MODIFY
......@@ -319,6 +319,10 @@ XCOMM special target for clearmake @@\
#define RunProgramWithSetup(setup,progvar,options) setup $(progvar) options
#endif
#ifndef RunPerlScript
#define RunPerlScript(script,options) $(PERL) $(PERLOPTS) script options
#endif
#ifndef RemoveFile
#define RemoveFile(file) $(RM) file
#endif /* RemoveFile */
......@@ -3246,3 +3250,4 @@ clean:: @@\
#ifndef BuildObjectFromLibrary
#define BuildObjectFromLibrary(libname,objname) BuildObjectFromLibraryWithPath(.,libname,objname)
#endif
......@@ -5,7 +5,7 @@ XCOMM
XCOMM
XCOMM
XCOMM
XCOMM $XFree86: xc/config/cf/Imake.tmpl,v 3.82 2000/08/25 13:42:15 dawes Exp $
XCOMM $XFree86: xc/config/cf/Imake.tmpl,v 3.83 2000/11/09 01:35:05 dawes Exp $
XCOMM ----------------------------------------------------------------------
/*
......@@ -186,6 +186,18 @@ XCOMM the platform-specific parameters - edit site.def to change
#define HasSymLinks YES
#endif
#ifndef HasPerl
#define HasPerl YES
#endif
#ifndef PerlCmd
#define PerlCmd perl
#endif
#ifndef PerlOptions
#define PerlOptions /**/
#endif
#ifndef BuildRman
#define BuildRman YES
#endif
......@@ -1421,6 +1433,8 @@ CXXEXTRA_INCLUDES = CplusplusExtraIncludes
RANLIBINSTFLAGS = RanlibInstFlags
#endif
RM = RmCmd
PERL = PerlCmd
PERLOPTS = PerlOptions
MANSUFFIX = ManSuffix /* suffix for command man pages */
LIBMANSUFFIX = LibManSuffix /* suffix for library man pages */
FILEMANSUFFIX = FileManSuffix /* suffix for file format man pages */
......
......@@ -5,7 +5,7 @@ XCOMM
XCOMM
XCOMM
XCOMM
XCOMM $XFree86: xc/config/cf/X11.tmpl,v 1.79 2000/11/02 20:39:05 dawes Exp $
XCOMM $XFree86: xc/config/cf/X11.tmpl,v 1.81 2000/11/14 00:07:00 dawes Exp $
/***************************************************************************
* *
......@@ -1165,11 +1165,17 @@ XCOMM X Window System make variables; these need to be coordinated with rules
FONTC = $(BINDIR)/bdftopcf
MKFONTDIR = $(BINDIR)/mkfontdir
MKHTMLINDEX = $(BINDIR)/mkhtmlindex
UCS2ANY = $(BINDIR)/ucs2any.pl
BDFTRUNCATE = $(BINDIR)/bdftruncate.pl
UCSMAPPREFIX = $(FONTDIR)/util/map-
#else
RGB = $(CLIENTENVSETUP) $(XBUILDBINDIR)/rgb
FONTC = $(CLIENTENVSETUP) $(XBUILDBINDIR)/bdftopcf
MKFONTDIR = $(CLIENTENVSETUP) $(XBUILDBINDIR)/mkfontdir
MKHTMLINDEX = $(SHELL) $(CONFIGSRC)/util/mkhtmlindex.sh
UCS2ANY = $(FONTSRC)/util/ucs2any.pl
BDFTRUNCATE = $(FONTSRC)/util/bdftruncate.pl
UCSMAPPREFIX = $(FONTSRC)/util/map-
#endif
HTMLINDEXCMD = HtmlIndexCmd
......@@ -2329,7 +2335,7 @@ InstallNamedTargetNoClobber(install,file.ad,$(INSTAPPFLAGS),$(XAPPLOADDIR),class
all:: fonts.dir @@\
@@\
fonts.dir: deplist @@\
RunProgram(MKFONTDIR,.) @@\
RunProgram(MKFONTDIR, $(MKFONTDIROPTS) .) @@\
@@\
clean:: @@\
RemoveFile(fonts.dir)
......@@ -2395,13 +2401,13 @@ InstallTarget(install,fonts.scale,$(INSTDATFLAGS),dest)
#endif /* InstallFontScale */
/*
* UncompressedFontTarget
* UncompressedFontTargetLong
*/
#ifndef UncompressedFontTarget
#define UncompressedFontTarget(basename) @@\
FontBaseObj(basename): FontSrc(basename) @@\
#ifndef UncompressedFontTargetLong
#define UncompressedFontTargetLong(sname,tname) @@\
FontBaseObj(tname): FontSrc(sname) @@\
RunProgram(FONTC,$(FONTCFLAGS) $? -o $@)
#endif /* UncompressedFontTarget */
#endif /* UncompressedFontTargetLong */
/*
* CompressedFontTarget
......@@ -2410,20 +2416,32 @@ FontBaseObj(basename): FontSrc(basename) @@\
#define GzipFontCompression NO
#endif
#ifndef CompressedFontTarget
#ifndef CompressedFontTargetLong
#if GzipFontCompression
#define CompressedFontTarget(basename) @@\
FontBaseObj(basename).gz: FontSrc(basename) @@\
#define CompressedFontTargetLong(sname,tname) @@\
FontBaseObj(tname).gz: FontSrc(sname) @@\
RunProgram(FONTC,$(FONTCFLAGS) $?) | $(GZIPCMD) > $@
#else
#define CompressedFontTarget(basename) @@\
FontBaseObj(basename).Z: FontSrc(basename) @@\
#define CompressedFontTargetLong(sname,tname) @@\
FontBaseObj(tname).Z: FontSrc(sname) @@\
RunProgram(FONTC,$(FONTCFLAGS) $?) | $(COMPRESS) > $@
#endif
#endif /* CompressedFontTargetLong */
/*
* UncompressedFontTarget
*/
#ifndef UncompressedFontTarget
#define UncompressedFontTarget(basename) UncompressedFontTargetLong(basename,basename)
#endif /* UncompressedFontTarget */
#ifndef CompressedFontTarget
#define CompressedFontTarget(basename) CompressedFontTargetLong(basename,basename)
#endif /* CompressedFontTarget */
#if !defined(FontTarget) && !defined(FontObj)
#if CompressAllFonts
#define FontTargetLong(sname,tname) CompressedFontTargetLong(sname,tname)
#define FontTarget(basename) CompressedFontTarget(basename)
#if GzipFontCompression
#define FontObj(basename) FontBaseObj(basename).gz
......@@ -2431,11 +2449,13 @@ FontBaseObj(basename).Z: FontSrc(basename) @@\
#define FontObj(basename) FontBaseObj(basename).Z
#endif
#else
#define FontTargetLong(sname,tname) UncompressedFontTargetLong(sname,tname)
#define FontTarget(basename) UncompressedFontTarget(basename)
#define FontObj(basename) FontBaseObj(basename)
#endif /* CompressAllFonts */
#endif
#ifndef EncObj
#define EncObj(basename) basename.enc
#endif
......@@ -2505,6 +2525,35 @@ InstallNamedTarget(install,edir/encodings.dir,$(INSTDATFLAGS),fdir,encodings.dir
#endif
#ifndef MakeBdfFontFromUCSMaster
#if HasPerl
#define MakeBdfFontFromUCSMaster(font,enc) @@\
includes:: font-enc.bdf @@\
@@\
font-enc.bdf: font.bdf $(UCS2ANY) @@\
RemoveFile($@) @@\
RunPerlScript($(UCS2ANY),font.bdf $(UCSMAPPREFIX)enc enc) @@\
@@\
clean:: @@\
RemoveFile(font-enc.bdf)
#endif
#endif
#ifndef MakeTruncatedUCSBdfFont
#if HasPerl
#define MakeTruncatedUCSBdfFont(font,trunc,name) @@\
includes:: name.bdf @@\
@@\
name.bdf: font.bdf $(BDFTRUNCATE) @@\
RemoveFile($@) @@\
RunPerlScript($(BDFTRUNCATE),trunc < font.bdf > name.bdf) @@\
@@\
clean:: @@\
RemoveFile(name.bdf)
#endif
#endif
/*
* MakeXkbDir
*/
......
XCOMM platform: $XFree86: xc/config/cf/gnu.cf,v 1.7 2000/07/07 20:06:56 tsi Exp $
XCOMM platform: $XFree86: xc/config/cf/gnu.cf,v 1.8 2000/11/14 18:20:31 dawes Exp $
#ifndef OSName
#define OSName GNU
#define OSName DefaultOSName
#endif
#ifndef OSVendor
#define OSVendor /**/
#endif
......@@ -17,108 +18,168 @@ XCOMM platform: $XFree86: xc/config/cf/gnu.cf,v 1.7 2000/07/07 20:06:56 tsi Exp
#endif
XCOMM operating system: OSName (OSMajorVersion./**/OSMinorVersion./**/OSTeenyVersion)
#define GccUsesGas YES
#define UseGas YES
#define GnuCpp YES
#define UseGccMakeDepend YES
#define HasGnuMake YES
#ifndef HasGcc2ForCplusplus
#define HasGcc2ForCplusplus YES
#endif
#define GNUSourceDefines -D_POSIX_C_SOURCE=199309L \
-D_POSIX_SOURCE -D_XOPEN_SOURCE \
-D_BSD_SOURCE -D_SVID_SOURCE
#define XserverNeedsSetUID YES
XCOMM XXXMB: What about _GNU_SOURCE, see Linux/UseInstalled?
#define ProjectRoot /usr/X11R6
#define YaccCmd bison -y
#define LexCmd flex
#ifndef LexLib
#define LexLib -lfl
#endif
#define ArCmd ar clq
#define AsCmd as
#define CcCmd gcc
#define CppCmd /lib/gcc-lib/i586--gnu/egcs-2.91.60/cpp
#define PreProcessCmd CcCmd -EP -x c
#define RanlibCmd ranlib
#define LdCmd ld
#if defined(UseInstalled)
#define DefaultCCOptions /**/
#else
#define DefaultCCOptions -ansi -pedantic GccWarningOptions
#endif
#define GccGasOption -DGCCUSESGAS
#define DefaultGcc2i386Opt -O2
#if defined(HasGcc2) && defined(i386Architecture)
#define OptimizedCDebugFlags DefaultGcc2i386Opt
#else
#define OptimizedCDebugFlags
#endif
#define XawI18nDefines -DHAS_WCHAR_H -DHAS_WCTYPE_H -DNO_WIDEC_H
XCOMM Enable this when we have pthreads.
XCOMM #define HasPosixThreads YES
XCOMM #define ThreadedX YES
XCOMM #define HasThreadSafeAPI YES
XCOMM #define ThreadsLibraries -lpthread
XCOMM #define SystemMTDefines -D_REENTRANT
#define AsmDefines -DUSE_GAS
#define BootstrapCFlags
#define ExtensionOSDefines
#ifdef i386Architecture
#define ServerExtraDefines GccGasOption XFree86ServerDefines -DNO_ALLOCA
#else
#define ServerExtraDefines GccGasOption
#ifndef HasLibCrypt
#define HasLibCrypt YES
#endif
#define StandardCppOptions -traditional
#define StandardCppDefines StandardDefines
#define StandardDefines -D_XOPEN_SOURCE -D_POSIX_SOURCE -D_BSD_SOURCE -D__ELF__
#define ServerOSDefines XFree86ServerOSDefines -DDDXTIME
#define ConnectionFlags -DTCPCONN
#define HasBSD44Sockets YES
#define HasSockets YES
#define UseElfFormat YES
#define HasSharedLibraries YES
#define BuildLibPathVar LD_LIBRARY_PATH
#define HasGcc YES
#define HasGcc2 YES
#ifndef HasGcc2ForCplusplus
# define HasGcc2ForCplusplus YES
#endif
#define GccUsesGas YES
#define UseGas YES
#define GnuCpp YES
#define HasDlopen YES
#define DlLibrary -ldl
#define HasPlugin YES
#define VendorHasX11R6_3libXext YES /* XC or XFree86 >= 3.3.1 */
#define DoLoadableServer YES
#ifndef HasShadowPasswd
# define HasShadowPasswd YES
#endif
#define HasPutenv YES
XCOMM Not implemented and will always fail.
#define HasShm YES
#include <gnuLib.rules>
#define HasBSD44Sockets YES
#define HasSockets YES
#define HasSnprintf YES
#define HasMkstemp YES
#define HasUsableFileMmap YES
#ifndef HasNCurses
#define HasNCurses YES
#endif
#define BuildXCSecurity YES
#define AvoidNullMakeCommand YES
#ifndef DebuggableLibraries
#define DebuggableLibraries NO
#endif
#define CompressAllFonts YES
#define DirFailPrefix -
#define HasNdbm YES
#define HasPutenv YES
#define Malloc0ReturnsNull NO
#define Malloc0ReturnsNull YES
#define NeedConstPrototypes YES
#define NeedFunctionPrototypes YES
#define NeedNestedPrototypes YES
#define NeedVarargsPrototypes YES
#ifndef NeedWidePrototypes
#define NeedWidePrototypes NO
#ifndef HasLibCrypt
# define HasLibCrypt YES
#endif
#define HasPoll YES
#define SetTtyGroup YES
#define TermcapLibrary -lncurses
#ifndef UseStaticTermcapLib
#define UseStaticTermcapLib NO
#endif
#ifndef GnuMallocLibrary
#define GnuMallocLibrary /* -lgnumalloc */
#define MkdirHierCmd mkdir -p
#ifndef CcCmd
#define CcCmd gcc
#endif
#ifndef AsCmd
#define AsCmd as
#endif
#ifndef LdCmd
#define LdCmd ld
#endif
#ifdef InstallCmd
#undef InstallCmd
#define AsmDefines -D__ELF__
#define CplusplusCmd c++
#ifndef TermcapLibrary
#if UseStaticTermcapLib
#define TermcapLibrary StaticLibrary(/usr/lib,ncurses)
#else
#define TermcapLibrary -lncurses
#endif
#define InstallCmd /bin/install
#endif
#ifndef DoLoadableServer
#define DoLoadableServer YES
#endif
#ifndef
#define CppCmd /lib/cpp
#endif
#define YaccCmd bison -y
#define LexCmd flex -l
#define LexLib -lfl
#define PreProcessCmd CcCmd -E
#define PostIncDir DefaultGccIncludeDir
#define LdCombineFlags -r
#ifndef LdPostLib
#define LdPostLib /* Never needed */
#endif
#define HasWChar32 YES
#define StandardCppOptions -traditional
#define StandardCppDefines StandardDefines
#define TroffCmd groff -Tps
#define HasVarRun YES
#define VarDbDirectory /var/state
#ifndef ExtraFilesToClean
# define ExtraFilesToClean *.core
XCOMM i386Architecture
#define OptimizedCDebugFlags DefaultGcc2i386Opt
#define GNUMachineDefines -D__i386__
#define ServerOSDefines XFree86ServerOSDefines -DDDXTIME -DPART_NET
#define ServerExtraDefines -DGCCUSESGAS XFree86ServerDefines
#define HasPlugin YES
#define VendorHasX11R6_3libXext YES
#ifndef StandardDefines
#define StandardDefines -D__GNU__ GNUMachineDefines GNUSourceDefines
#endif
#define BuildXTrueType NO
#define DlLibrary -rdynamic -ldl
#define ServerExtraSysLibs /**/
#ifdef i386Architecture
# include <xfree86.cf>
#define ConnectionFlags -DUNIXCONN -DTCPCONN
/* Some of these man page defaults are overriden in the above OS sections */
#ifndef ManSuffix
# define ManSuffix 1x
#endif
#ifndef ManDir
# define ManDir $(MANSOURCEPATH)1
#endif
#ifndef LibManSuffix
# define LibManSuffix 3x
#endif
#ifndef LibmanDir
# define LibmanDir $(MANSOURCEPATH)3
#endif
#ifndef FileManSuffix
# define FileManSuffix 5x
#endif
#ifndef FileManDir
# define FileManDir $(MANSOURCEPATH)5
#endif
#ifndef StaticLibrary
#define StaticLibrary(libpath,libname) -Wl,-Bstatic Concat(-L,libpath) Concat(-l,libname) -Wl,-Bdynamic
#endif
#define HasGnuMake YES
#define MakeNamedTargetSubdir(dir,flags,subname)\
$(MAKE) -C dir $(MFLAGS) $(PARALLELMFLAGS) flags subname
#define ArchitectureDefines -DGNU_ARCHITECTURE
#define XserverNeedsSetUID YES
#include <gnuLib.rules>
XCOMM XXX Might need this if they are not careful with slashes.
XCOMM #define DirFailPrefix -
#include <xfree86.cf>
XCOMM $XFree86: xc/config/cf/gnuLib.rules,v 1.3 1999/06/06 08:47:44 dawes Exp $
/*
* GNU/Hurd shared library rules
*
* $XFree86: xc/config/cf/gnuLib.rules,v 1.4 2000/11/14 18:20:31 dawes Exp $
*/
#ifndef UseElfFormat
#define UseElfFormat YES
#endif
/*
* GNU/Hurd shared library rules
* Cloned from NetBSD/FreeBSD (ELF) shared library rules
* Cloned from Linux (ELF) shared library rules
*
*/
......@@ -18,13 +14,18 @@ XCOMM $XFree86: xc/config/cf/gnuLib.rules,v 1.3 1999/06/06 08:47:44 dawes Exp $
#define HasSharedLibraries YES
#endif
#ifndef ForceNormalLib
#define ForceNormalLib YES
#define ForceNormalLib NO
#endif
#ifndef BaseShLibReqs
#define BaseShLibReqs /* -lc implied by $(CC) */
#ifndef SharedOldX
#define SharedOldX NO
#endif
#undef SpecialMalloc
#define SpecialMalloc NO
#define BaseShLibReqs -lc
#ifndef SharedDataSeparation
#define SharedDataSeparation NO
#endif
......@@ -38,7 +39,9 @@ XCOMM $XFree86: xc/config/cf/gnuLib.rules,v 1.3 1999/06/06 08:47:44 dawes Exp $
#define ShLibIncludeFile <gnuLib.tmpl>
#endif
#ifndef SharedLibraryLoadFlags
#define SharedLibraryLoadFlags -shared -Wl,-rpath=$(USRLIBDIR)
XCOMM XXX To rpath or not to rpath...
XCOMM #define SharedLibraryLoadFlags -shared -Wl,-rpath=$(USRLIBDIR)
#define SharedLibraryLoadFlags -shared
#endif
#ifndef PositionIndependentCFlags
#define PositionIndependentCFlags -fPIC
......@@ -48,9 +51,10 @@ XCOMM $XFree86: xc/config/cf/gnuLib.rules,v 1.3 1999/06/06 08:47:44 dawes Exp $
#endif
#ifndef ExtraLoadFlags
#ifdef UseInstalled
#define ExtraLoadFlags -Wl,-rpath=$(USRLIBDIRPATH)
XCOMM XXX Maybe superfluous.
#define ExtraLoadFlags -Wl,-rpath-link=$(USRLIBDIRPATH)
#else
#define ExtraLoadFlags -Wl,-dynamic-linker=/lib/ld.so.1 -Wl,-rpath=/lib:$(USRLIBDIRPATH) -Wl,-rpath-link=$(BUILDLIBDIR)
#define ExtraLoadFlags -Wl,-rpath-link=$(BUILDLIBDIR)
#endif
#endif
......@@ -63,11 +67,9 @@ XCOMM $XFree86: xc/config/cf/gnuLib.rules,v 1.3 1999/06/06 08:47:44 dawes Exp $
install:: Concat(lib,libname.so.rev) @@\
MakeDir($(DESTDIR)dest) @@\
$(INSTALL) $(INSTALLFLAGS) $(INSTBINFLAGS) Concat(lib,libname.so.rev) $(DESTDIR)dest @@\
(T=`echo Concat($(DESTDIR)dest/lib,libname.so.rev) | sed 's/\.[^\.]*$$//'`;\
$(RM) $$T && $(LN) Concat(lib,libname.so.rev) $$T) @@\
(T=`echo Concat($(DESTDIR)dest/lib,libname.so.rev) | sed 's/\.so.*$$/.so/'`;\
$(RM) $$T && $(LN) Concat(lib,libname.so.rev) $$T) @@\
@if $(SOSYMLINK); then (set -x; \ @@\
@T=`echo Concat($(DESTDIR)dest/lib,libname.so.rev) | sed 's/\.[^\.]*$$//'`;\
set -x; $(RM) $$T && $(LN) Concat(lib,libname.so.rev) $$T @@\
@if $(SOSYMLINK); then (set -x; \
$(RM) Concat($(DESTDIR)dest/lib,libname.so); \ @@\
$(LN) Concat(lib,libname.so.rev) Concat($(DESTDIR)dest/lib,libname.so)); fi
#endif /* InstallSharedLibrary */
......@@ -96,9 +98,9 @@ install:: Concat(lib,libname.so.rev) @@\
#define SharedLibraryTarget(libname,rev,solist,down,up) @@\
AllTarget(Concat(lib,libname.so.rev)) @@\
@@\
Concat(lib,libname.so.rev): solist @@\
Concat(lib,libname.so.rev): solist $(EXTRALIBRARYDEPS) @@\
$(RM) $@~ @@\
SONAME=`echo $@ | sed 's/\.[^\.]*$$//'`; \ @@\
@SONAME=`echo $@ | sed 's/\.[^\.]*$$//'`; set -x; \ @@\
(cd down; $(CC) -o up/$@~ $(SHLIBLDFLAGS) -Wl,-soname,$$SONAME solist $(REQUIREDLIBS) BaseShLibReqs); \ @@\
$(RM) $$SONAME; $(LN) $@ $$SONAME; \ @@\
LinkBuildSonameLibrary($$SONAME) @@\
......@@ -111,33 +113,48 @@ Concat(lib,libname.so.rev): solist @@\
LinkBuildLibraryMaybe(Concat(lib,libname.so),$(SOSYMLINK)) @@\
@@\
clean:: @@\
$(RM) Concat(lib,libname.so.rev)
#endif /* SharedLibraryTarget */
@MAJREV=`expr rev : '\(.*\)\.'`; \ @@\
set -x; $(RM) Concat(lib,libname.so.$$MAJREV) @@\
$(RM) Concat(lib,libname.so.rev) Concat(lib,libname.so)
/*
* SharedLibraryDataTarget - generate rules to create shlib data file;
*/
#ifndef SharedLibraryDataTarget
#define SharedLibraryDataTarget(libname,rev,salist)
#endif /* SharedLibraryTarget */
/*
* 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)) @@\
@@\
Concat(lib,libname.so.rev): deplist $(EXTRALIBRARYDEPS) @@\
$(RM) $@~ @@\
(cd down; $(CC) -o up/$@~ $(SHLIBLDFLAGS) solist $(REQUIREDLIBS)) @@\
$(RM) $@ @@\
@SONAME=`echo $@ | sed 's/\.[^\.]*$$//'`; set -x; \ @@\
(cd down; $(CC) -o up/$@~ $(SHLIBLDFLAGS) -Wl,-soname,$$SONAME solist $(REQUIREDLIBS) BaseShLibReqs); \ @@\
$(RM) $$SONAME; $(LN) $@ $$SONAME; \ @@\
LinkBuildSonameLibrary($$SONAME) @@\
$(RM) $@ @@\
$(MV) $@~ $@ @@\
@if $(SOSYMLINK); then (set -x; \ @@\
$(RM) Concat(lib,libname.so); \ @@\
$(LN) $@ Concat(lib,libname.so)); fi @@\
LinkBuildLibrary($@) @@\
LinkBuildLibraryMaybe(Concat(lib,libname.so),$(SOSYMLINK)) @@\
@@\
clean:: @@\
$(RM) Concat(lib,libname.so.rev)
@MAJREV=`expr rev : '\(.*\)\.'`; \ @@\
set -x; $(RM) Concat(lib,libname.so.$$MAJREV) @@\
$(RM) Concat(lib,libname.so.rev) Concat(lib,libname.so)
#endif /* SharedDepLibraryTarget */
......@@ -147,7 +164,7 @@ AllTarget(name) @@\
@@\
name: deps @@\
$(RM) $@~ @@\
$(LD) -o $@~ $(SHLIBLDFLAGS) solist $(REQUIREDLIBS) @@\
$(CC) -o $@~ $(SHLIBLDFLAGS) solist $(REQUIREDLIBS) BaseShLibReqs @@\
$(RM) $@ @@\
$(MV) $@~ $@ @@\
@@\
......@@ -161,30 +178,4 @@ clean:: @@\
*/
#ifndef SharedLibraryDataTarget
#define SharedLibraryDataTarget(libname,rev,salist)
#endif /* SharedLibraryDataTarget */
#ifndef InstallSharedLibraryData
#define InstallSharedLibraryData(libname,rev,dest)
#endif /* InstallSharedLibraryData */
/*
* SharedLibReferences - variables for shared libraries
*/
#ifndef SharedLibReferences
#define SharedLibReferences(varname,libname,libsource,revname,rev) @@\
revname = rev @@\
Concat3(DEP,varname,LIB) = SharedLibDependencies(libname,libsource,revname) @@\
Concat(varname,LIB) = LoaderLibPrefix Concat(-l,libname) @@\