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

Use installed X11 includes and libs

Browse source
This commit is contained in:
Ulrich Wilkens 2018-06-28 04:29:17 +02:00 committed by Jon Trulson
parent cd52651a3a
commit eb811f26f8
6 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
cde/Makefile
View file

@ -131,7 +131,7 @@ Makefile.boot: imake.proto $(DEPENDSRC)/Makefile.proto depend.bootstrap $(IMAKES
imake.proto: imake.proto:
cd $(IMAKESRC) && $(MAKE) $(FLAGS) cd $(IMAKESRC) && $(MAKE) $(FLAGS)
$(RM) $(DEPENDSRC)/Makefile.proto $(RM) $(DEPENDSRC)/Makefile.proto $(DEPENDSRC)/.depend
$(DEPENDSRC)/Makefile.proto: $(DEPENDSRC)/Makefile.proto:
$(IMAKE_CMD) -s $(DEPENDSRC)/Makefile.proto -f $(DEPENDSRC)/Imakefile -DTOPDIR=$(DEPENDTOP) -DCURDIR=$(DEPENDSRC) $(IMAKE_CMD) -s $(DEPENDSRC)/Makefile.proto -f $(DEPENDSRC)/Imakefile -DTOPDIR=$(DEPENDTOP) -DCURDIR=$(DEPENDSRC)

5
cde/config/cf/FreeBSD.cf
View file

@ -73,11 +73,8 @@ USE_GCC = UseGcc
# define HasGcc2 YES # define HasGcc2 YES
#endif #endif
/* Use installed X11 includes/libs on FreeBSD 11+ */ /* Use installed X11 includes/libs */
#if (OSMajorVersion >= 11)
#define UseInstalledX11 YES #define UseInstalledX11 YES
#endif
/* For DtHelp TIFF processing routines. */ /* For DtHelp TIFF processing routines. */
#ifdef AMD64Architecture #ifdef AMD64Architecture

2
cde/config/cf/NetBSD.cf
View file

@ -106,6 +106,8 @@ XCOMM operating system: OSName
#define GccGasOption -DGCCUSESGAS #define GccGasOption -DGCCUSESGAS
#define AsmDefines -DUSE_GAS #define AsmDefines -DUSE_GAS
/* Use installed X11 includes/libs */
#define UseInstalledX11 YES
#ifdef i386Architecture #ifdef i386Architecture
# ifndef OptimizedCDebugFlags # ifndef OptimizedCDebugFlags

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

@ -148,10 +148,8 @@ XCOMM operating system: OSName (OSMajorVersion./**/OSMinorVersion./**/OSTeenyVe
# endif # endif
#endif #endif
/* Use installed versions of Xm and X11 */ /* Use installed X11 includes/libs */
#if OSMajorVersion >= 6
# define UseInstalledX11 YES # define UseInstalledX11 YES
#endif
/* /*
* Compiler Features * Compiler Features

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

@ -376,6 +376,9 @@ man_keywords:: @@\
#define DependDefines -D__BUILTIN_VA_ARG_INCR #define DependDefines -D__BUILTIN_VA_ARG_INCR
#endif #endif
/* Use installed X11 includes/libs */
#define UseInstalledX11 YES
#define LdPreLib -L$(BUILDLIBDIR) #define LdPreLib -L$(BUILDLIBDIR)
#define PamUnixDefines -DPAM_NIS #define PamUnixDefines -DPAM_NIS
#define TtLargePICTable YES #define TtLargePICTable YES

4
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/usr/local/include/X11 -I/usr/include/X11 -I/usr/X11R6/include/X11 -I../../imports/x11/include/X11 INCLUDES = -I../../include -I/usr/local/include/X11 -I/usr/include/X11 -I/usr/X11R6/include/X11 -I/usr/X11R7/include/X11
CFLAGS = $(BOOTSTRAPCFLAGS) $(CDEBUGFLAGS) $(INCLUDES) CFLAGS = $(BOOTSTRAPCFLAGS) $(CDEBUGFLAGS) $(INCLUDES)
SHELL = /bin/sh SHELL = /bin/sh
RM = rm -f RM = rm -f
@ -47,7 +47,7 @@ relink:
clean: clean:
$(RM) ccimake imake.o imake $(RM) ccimake imake.o imake
$(RM_CMD) \#* $(RM_CMD) \#*
$(RM) -r Makefile.proto Makefile Makefile.dep bootstrap $(RM) -r Makefile.proto Makefile Makefile.dep bootstrap .depend
depend: depend: