diff options
| author | jim <empty> | 1989-10-17 12:41:35 +0000 |
|---|---|---|
| committer | jim <empty> | 1989-10-17 12:41:35 +0000 |
| commit | 683d8a3b451bf18329158b2c01ecbdcb51928957 (patch) | |
| tree | 5643fe5d5781b1b74abee306233d4a8279ba5ab2 /xc/config | |
| parent | 6502424beda123611c4f98aa83e9dfca0134e456 (diff) | |
added support for merging libXext.a into libX11.a
Diffstat (limited to 'xc/config')
| -rw-r--r-- | xc/config/cf/Imake.rules | 11 | ||||
| -rw-r--r-- | xc/config/cf/Project.tmpl | 8 |
2 files changed, 16 insertions, 3 deletions
diff --git a/xc/config/cf/Imake.rules b/xc/config/cf/Imake.rules index 741efed04..8ef5cf99e 100644 --- a/xc/config/cf/Imake.rules +++ b/xc/config/cf/Imake.rules @@ -1,6 +1,6 @@ /**/########################################################################### /**/# Imake rules for building libraries, programs, scripts, and data files -/**/# rules: $XConsortium: Imake.rules,v 1.62 89/10/16 16:47:26 jim Exp $ +/**/# rules: $XConsortium: Imake.rules,v 1.63 89/10/16 18:06:56 jim Exp $ /* * MACHINE-INDEPENDENT RULES; DO NOT MODIFY @@ -314,6 +314,15 @@ install:: lib/**/libname.a @@\ #endif /* InstallLibrary */ /* + * MergeIntoInstalledLibrary - generate rules to merge one library into another + */ +#ifndef MergeIntoInstalledLibrary +#define MergeIntoInstalledLibrary(tolib,fromlib) @@\ +install:: fromlib @@\ + $(SCRIPTSRC)/mergelib tolib fromlib +#endif /* MergeIntoInstalledLibrary */ + +/* * InstallSharedLibrary - generate rules to install the shared library. */ #ifndef InstallSharedLibrary diff --git a/xc/config/cf/Project.tmpl b/xc/config/cf/Project.tmpl index fb009acbd..00c26f965 100644 --- a/xc/config/cf/Project.tmpl +++ b/xc/config/cf/Project.tmpl @@ -1,6 +1,6 @@ /**/########################################################################### /**/# X Window System Build Parameters -/**/# $XConsortium: Project.tmpl,v 1.44 89/10/16 12:09:20 jim Exp $ +/**/# $XConsortium: Project.tmpl,v 1.45 89/10/17 10:47:58 jim Exp $ /***************************************************************************** * * @@ -295,6 +295,10 @@ #define SharedXextRev 4.0 #endif +#ifndef DoInstallExtensionsIntoXlib +#define DoInstallExtensionsIntoXlib NO /* merge libXext.a into libX11.a */ +#endif + #if NeedBerklibInXlib /* what about regular Berklib */ #define BandAidLibraryNeeded YES #define BandAidLibrarySources Berklib.c @@ -312,7 +316,7 @@ Berklib.c: sysV/Berklib.c @@\ /**/########################################################################### /**/# X Window System make variables; this need to be coordinated with rules -/**/# $XConsortium: Project.tmpl,v 1.44 89/10/16 12:09:20 jim Exp $ +/**/# $XConsortium: Project.tmpl,v 1.45 89/10/17 10:47:58 jim Exp $ /* * This list must be reflected in the DIRS_TO_BUILD list in the top-level |