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

linux: Use installed X11 header files rather than requiring /imports/x11/include

Browse source 
With this patch, it is no longer neccessary to create the
/imports/x11/include/X11 symlink...

Also, remove the include of xfree86.cf from linux.cf, and define our
own DefaultCCOptions.  Setup to use only -ansi, not -pendantic.
This commit is contained in:
Jon Trulson 2014-03-09 04:36:42 -06:00
parent b147e0ce12
commit de491a16de
2 changed files with 5 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

10
cde/config/cf/linux.cf
View file

@ -1,10 +1,5 @@
XCOMM platform: $TOG: linux.cf /main/47 1998/04/17 11:32:51 mgreess $ XCOMM platform: $TOG: linux.cf /main/47 1998/04/17 11:32:51 mgreess $
/* To reduce the number of warnings generated by X11 and Motif headers that
dislike -ansi and -pedantic we can include them with -isystem instead of
-I, this tells GCC to treat them as system includes out of our control */
#define TopXInclude -isystem$(TOP)/imports/x11/include
#ifndef OSName #ifndef OSName
# define OSName DefaultOSName # define OSName DefaultOSName
#endif #endif
@ -65,6 +60,8 @@ XCOMM binutils: (LinuxBinUtilsMajorVersion)
# endif # endif
#endif #endif
#define UseInstalledX11 YES
#define BuildLibPathVar LD_LIBRARY_PATH #define BuildLibPathVar LD_LIBRARY_PATH
#define HasGcc YES #define HasGcc YES
#define HasGcc2 YES #define HasGcc2 YES
@ -129,6 +126,8 @@ XCOMM binutils: (LinuxBinUtilsMajorVersion)
#define LinuxLocaleDefines /**/ #define LinuxLocaleDefines /**/
#define DefaultCCOptions -ansi
XCOMM If you have the tirpc library on your system, and you have the XCOMM If you have the tirpc library on your system, and you have the
XCOMM libtirpc-dev installed, then define HasTIRPCLib to YES in either XCOMM libtirpc-dev installed, then define HasTIRPCLib to YES in either
XCOMM your host.def or site.def file. Using the tirpc lib should XCOMM your host.def or site.def file. Using the tirpc lib should
@ -297,4 +296,3 @@ DependFileName:: @@@@\
#define TtClientDepLibs $(DEPTTLIB) $(DEPXTOOLLIB) $(DEPXLIB) #define TtClientDepLibs $(DEPTTLIB) $(DEPXTOOLLIB) $(DEPXLIB)
#include <lnxLib.rules> #include <lnxLib.rules>
#include <xfree86.cf>

2
cde/config/imake/Makefile.ini
View file

@ -11,7 +11,7 @@
BOOTSTRAPCFLAGS = BOOTSTRAPCFLAGS =
CC = cc CC = cc
CDEBUGFLAGS = -O CDEBUGFLAGS = -O
INCLUDES = -I../../include -I../../imports/x11/include/X11 INCLUDES = -I../../include -I/usr/include/X11 -I../../imports/x11/include/X11
CFLAGS = $(BOOTSTRAPCFLAGS) $(CDEBUGFLAGS) $(INCLUDES) CFLAGS = $(BOOTSTRAPCFLAGS) $(CDEBUGFLAGS) $(INCLUDES)
SHELL = /bin/sh SHELL = /bin/sh
RM = rm -f RM = rm -f