mirror of
git://git.code.sf.net/p/cdesktopenv/code
synced 2025-02-15 04:32:24 +00:00
Find correct system includes and libs on FreeBSD.
This commit is contained in:
parent
006a00ed4a
commit
3bbcda35b9
6 changed files with 11 additions and 8 deletions
|
@ -6,7 +6,7 @@ XCOMM $XConsortium: Imakefile /main/17 1996/10/06 17:13:20 rws $
|
||||||
NSGMLSDIR = nsgmls
|
NSGMLSDIR = nsgmls
|
||||||
#endif
|
#endif
|
||||||
EXTRADIRS = types localized tttypes $(NSGMLSDIR)
|
EXTRADIRS = types localized tttypes $(NSGMLSDIR)
|
||||||
#if !defined(OpenBSDArchitecture)
|
#if !defined(OpenBSDArchitecture) && !defined(FreeBSDArchitecture)
|
||||||
EXTRADIRS += util
|
EXTRADIRS += util
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
|
@ -16,7 +16,7 @@ LOCAL_LIBRARIES = ../libDtCmP/libDtCmP.a $(CSALIB) DtClientLibs
|
||||||
-DRELMAJOR="$(OSMAJORVERSION)" -DRELMINOR="$(OSMINORVERSION)" \
|
-DRELMAJOR="$(OSMAJORVERSION)" -DRELMINOR="$(OSMINORVERSION)" \
|
||||||
$(ICONV_INBUF_DEFINE)
|
$(ICONV_INBUF_DEFINE)
|
||||||
|
|
||||||
#if defined(RsArchitecture) || defined(USLArchitecture) || defined(UXPArchitecture) || defined(LinuxArchitecture) || defined(OpenBSDArchitecture)
|
#if defined(RsArchitecture) || defined(USLArchitecture) || defined(UXPArchitecture) || defined(LinuxArchitecture) || defined(OpenBSDArchitecture) || defined(FreeBSDArchitecture)
|
||||||
TTY_LIBRARIES = $(LOCAL_LIBRARIES)
|
TTY_LIBRARIES = $(LOCAL_LIBRARIES)
|
||||||
#elif defined(AlphaArchitecture)
|
#elif defined(AlphaArchitecture)
|
||||||
TTY_LIBRARIES = $(DTCMPLIB) $(CSALIB) $(DTSVCLIB) $(XTOOLLIB) $(XLIB)
|
TTY_LIBRARIES = $(DTCMPLIB) $(CSALIB) $(DTSVCLIB) $(XTOOLLIB) $(XLIB)
|
||||||
|
|
|
@ -120,16 +120,19 @@ SYS_LIBRARIES = -ls
|
||||||
SYS_LIBRARIES = -lm -lXdmcp
|
SYS_LIBRARIES = -lm -lXdmcp
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef LinuxArchitecture
|
#if defined(LinuxArchitecture) || defined(FreeBSDArchitecture)
|
||||||
SYS_LIBRARIES = -lm -lcrypt
|
SYS_LIBRARIES = -lm -lcrypt
|
||||||
/* On Linux, just use the system provided Xau and Xdmcp*/
|
/* just use the system provided Xau and Xdmcp*/
|
||||||
DEPXAUTHLIB =
|
DEPXAUTHLIB =
|
||||||
DEPXDMCPLIB =
|
DEPXDMCPLIB =
|
||||||
|
#endif
|
||||||
|
|
||||||
/* Add in freetype header locations, required for modern Motif libs */
|
/* Add in freetype header locations, required for modern Motif libs */
|
||||||
|
#ifdef LinuxArchitecture
|
||||||
INCLUDES = -I/usr/include/freetype2
|
INCLUDES = -I/usr/include/freetype2
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef OpenBSDArchitecture
|
#if defined(OpenBSDArchitecture) || defined(FreeBSDArchitecture)
|
||||||
INCLUDES = -I$(XPROJECTROOT)/include/freetype2
|
INCLUDES = -I$(XPROJECTROOT)/include/freetype2
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
|
@ -12,7 +12,7 @@ DEPEND_DEFINES = $(CXXDEPENDINCLUDES)
|
||||||
|
|
||||||
#include <Threads.tmpl>
|
#include <Threads.tmpl>
|
||||||
|
|
||||||
INCLUDES = -I. -I../../include -I../../include/utils -I$(CDELIBSRC)
|
INCLUDES = -I. -I../../include -I../../include/utils -I$(CDELIBSRC) $(STD_INCLUDES)
|
||||||
|
|
||||||
#if HasVFork
|
#if HasVFork
|
||||||
VFORK_DEFINES = -DHAS_VFORK
|
VFORK_DEFINES = -DHAS_VFORK
|
||||||
|
|
|
@ -12,7 +12,7 @@ DEPEND_DEFINES = $(CXXDEPENDINCLUDES)
|
||||||
|
|
||||||
#include <Threads.tmpl>
|
#include <Threads.tmpl>
|
||||||
|
|
||||||
INCLUDES = -I. -I../Common -I../../include -I../../include/utils -I$(CDELIBSRC)
|
INCLUDES = -I. -I../Common -I../../include -I../../include/utils -I$(CDELIBSRC) $(STD_INCLUDES)
|
||||||
|
|
||||||
#if HasVFork
|
#if HasVFork
|
||||||
VFORK_DEFINES = -DHAS_VFORK
|
VFORK_DEFINES = -DHAS_VFORK
|
||||||
|
|
|
@ -36,7 +36,7 @@ OBJS = dispatch.o dtpdmd.o mailbox.o \
|
||||||
manager.o records.o setup.o \
|
manager.o records.o setup.o \
|
||||||
util.o nlmsg.o
|
util.o nlmsg.o
|
||||||
|
|
||||||
#ifdef LinuxArchitecture
|
#if defined(LinuxArchitecture) || defined(FreeBSDArchitecture)
|
||||||
/* On Linux, just use the system provided Xau */
|
/* On Linux, just use the system provided Xau */
|
||||||
DEPXAUTHLIB =
|
DEPXAUTHLIB =
|
||||||
#endif
|
#endif
|
||||||
|
|
Loading…
Reference in a new issue