external/cde
1
0
Fork 0
mirror of git://git.code.sf.net/p/cdesktopenv/code synced 2025-02-15 04:32:24 +00:00
Code Issues Releases Wiki Activity

Enable building against an arbitrary Motif installation

Browse source 
* Give MotifProjectRoot priority over system libs
* Switch to UseInstalledMotif (but retain necessary imports)
This commit is contained in:
Matthew R. Trower 2018-06-11 19:59:44 -05:00 committed by Jon Trulson
parent aaa9305653
commit a166c36592
4 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
cde/config/cf/Motif.rules
View file

@ -653,7 +653,7 @@ clean:: @@\
/* Search the Motif ProjectRoot too if it is different. */ /* Search the Motif ProjectRoot too if it is different. */
#ifdef MotifProjectRoot #ifdef MotifProjectRoot
# define MUsrLibDirPath Concat(XUsrLibDirPath,:$(MPROJECTROOT)/lib) # define MUsrLibDirPath Concat($(MPROJECTROOT)/lib,:XUsrLibDirPath)
#else #else
# define MUsrLibDirPath XUsrLibDirPath # define MUsrLibDirPath XUsrLibDirPath
#endif #endif

2
cde/config/cf/Motif.tmpl
View file

@ -73,7 +73,7 @@ XCOMM $TOG: Motif.tmpl /main/6 1999/05/19 17:00:05 mgreess $
#endif #endif
#ifndef MTop #ifndef MTop
# if ImportMotif # if ImportMotif || UseInstalledMotif
# define MTop $(TOP)/imports/motif # define MTop $(TOP)/imports/motif
# else # else
# define MTop $(TOP) # define MTop $(TOP)

6
cde/config/cf/site.def
View file

@ -21,9 +21,11 @@ XCOMM site: $TOG: site.def /main/23 1998/03/19 18:43:26 mgreess $
/* CDE uses a .C suffix for C++ source, not the default .cxx */ /* CDE uses a .C suffix for C++ source, not the default .cxx */
# define CCsuf C # define CCsuf C
/* We will import x11 and Motif. */ /* We will import x11. */
# define ImportX11 YES # define ImportX11 YES
# define ImportMotif YES
/* We will use installed Motif. */
# define UseInstalledMotif YES
# ifndef TopLevelProject # ifndef TopLevelProject
# define TopLevelProject cde # define TopLevelProject cde

4
cde/config/cf/sun.cf
View file

@ -376,7 +376,7 @@ man_keywords:: @@\
#define DependDefines -D__BUILTIN_VA_ARG_INCR #define DependDefines -D__BUILTIN_VA_ARG_INCR
#endif #endif
#define LdPreLib -L/usr/X11/lib -L$(BUILDLIBDIR) #define LdPreLib -L$(BUILDLIBDIR)
#define PamUnixDefines -DPAM_NIS #define PamUnixDefines -DPAM_NIS
#define TtLargePICTable YES #define TtLargePICTable YES
#define DtSvcDefines -DMULTIBYTE -DNO_REGCOMP #define DtSvcDefines -DMULTIBYTE -DNO_REGCOMP
@ -406,7 +406,7 @@ man_keywords:: @@\
#define TtClientExtraLibs ExtraLibraries -ldl -lintl #define TtClientExtraLibs ExtraLibraries -ldl -lintl
#ifndef TopMotifInclude #ifndef TopMotifInclude
# define TopMotifInclude /usr/X11/include # define TopMotifInclude $(MPROJECTROOT)/include
#endif #endif
#define ShlibExportListOpt(filename) -M filename #define ShlibExportListOpt(filename) -M filename