Details: Kill an obsolete macro in the top-level Imakefile, add OpenBSD
support to a lot of other Imakefiles, don't define -DSVR4
unconditionally (this may need further patches in the headers for Linux,
but defining it unconditionally is definitely wrong), allow to specify
the location of the tcl library by defining TclLibrary; and don't build
dttype on OpenBSD (needs to be modified to not use advance/compile).
>From b35cab339f7be714ecb9ef2640c29886c4ff9af5 Mon Sep 17 00:00:00 2001
From: Pascal Stumpf <pascal.stu...@cubes.de>
Date: Thu, 9 Aug 2012 22:06:51 +0200
Subject: [PATCH] Imakefile diffs for OpenBSD.
---
cde/Imakefile | 1 -
cde/doc/C/Imakefile | 2 +-
cde/doc/ja_JP.dt-eucJP/Imakefile | 2 +-
cde/lib/DtHelp/Imakefile | 3 +++
cde/lib/DtTerm/TermPrim/Imakefile | 4 ++++
cde/lib/DtWidget/Imakefile | 2 ++
cde/lib/csa/Imakefile | 2 +-
cde/programs/Imakefile | 11 +++++++----
cde/programs/dtcm/dtcm/Imakefile | 8 ++++++--
cde/programs/dtcm/libDtCmP/Imakefile | 2 +-
cde/programs/dtcm/server/Imakefile | 2 +-
cde/programs/dtdocbook/tcl/Imakefile | 10 ++++++++++
cde/programs/dtfile/Imakefile | 4 ++++
cde/programs/dtlogin/Imakefile | 4 ++++
cde/programs/dtspcd/Imakefile | 2 +-
cde/programs/nsgmls/Imakefile | 2 +-
16 files changed, 47 insertions(+), 14 deletions(-)
diff --git a/cde/Imakefile b/cde/Imakefile
index 59f16e4..3cc2549 100644
--- a/cde/Imakefile
+++ b/cde/Imakefile
@@ -139,7 +139,6 @@ Everything.doc::
NamedTargetSubdirs(install.doc,$(DOCSUBDIRS),"installing",DESTDIR=$(DESTDIR),install)
NamedTargetSubdirs(install.man.doc,$(DOCSUBDIRS),"installing man
pages",DESTDIR=$(DESTDIR),install.man)
-InstallLinkKitSubdirs($(DOCSUBDIRS))
NamedCleanSubdirs(clean.doc,$(DOCSUBDIRS))
NamedTagSubdirs(tags.doc,$(DOCSUBDIRS))
MakeMakeSubdirs($(DOCSUBDIRS),Makefiles.doc)
diff --git a/cde/doc/C/Imakefile b/cde/doc/C/Imakefile
index ff8e50c..70e475c 100644
--- a/cde/doc/C/Imakefile
+++ b/cde/doc/C/Imakefile
@@ -3,7 +3,7 @@ XCOMM $XConsortium: Imakefile /main/10 1996/07/23 22:00:00 rws $
#define PassCDebugFlags
/* due to split-VOB setup, force help to come last in make Makefiles */
-#if defined(LinuxArchitecture)
+#if defined(LinuxArchitecture) || defined(OpenBSDArchitecture)
XCOMM we cannot build guides on linux yet
SUBDIRS = man help
BSUBDIRS = help man
diff --git a/cde/doc/ja_JP.dt-eucJP/Imakefile b/cde/doc/ja_JP.dt-eucJP/Imakefile
index 742811e..c775b2c 100644
--- a/cde/doc/ja_JP.dt-eucJP/Imakefile
+++ b/cde/doc/ja_JP.dt-eucJP/Imakefile
@@ -3,7 +3,7 @@ XCOMM $TOG: Imakefile /main/5 1997/03/05 11:10:37 damon $
#define PassCDebugFlags
/* due to split-VOB setup, force help to come last in make Makefiles */
-#if defined(LinuxArchitecture)
+#if defined(LinuxArchitecture) || defined(OpenBSDArchitecture)
XCOMM we cannot build guides on linux yet
SUBDIRS = help
BSUBDIRS = help
diff --git a/cde/lib/DtHelp/Imakefile b/cde/lib/DtHelp/Imakefile
index 89fe15c..eb219b5 100644
--- a/cde/lib/DtHelp/Imakefile
+++ b/cde/lib/DtHelp/Imakefile
@@ -28,6 +28,9 @@ BIT_ORDER_DEFINES = -DLSB_BIT_ORDER
#endif
INCLUDES = -I. -I./il -I./jpeg
+#if defined(OpenBSDArchitecture)
+INCLUDES += -I$(INCROOT)
+#endif
DEFINES = -DDTLIB -DXK_MISCELLANY $(LOCAL_DEFINES) \
-DCDE_INSTALLATION_TOP='"$(CDE_INSTALLATION_TOP)"' \
-DCDE_CONFIGURATION_TOP='"$(CDE_CONFIGURATION_TOP)"' \
diff --git a/cde/lib/DtTerm/TermPrim/Imakefile
b/cde/lib/DtTerm/TermPrim/Imakefile
index 4fceb3c..286bcd8 100644
--- a/cde/lib/DtTerm/TermPrim/Imakefile
+++ b/cde/lib/DtTerm/TermPrim/Imakefile
@@ -109,6 +109,10 @@ LinkFile(TermPrimGetPty.c,TermPrimGetPty-svr4.c)
LinkFile(TermPrimGetPty.c,TermPrimGetPty-svr4.c)
#endif
+#ifdef OpenBSDArchitecture
+LinkFile(TermPrimGetPty.c,TermPrimGetPty-bsd.c)
+#endif
+
SubdirLibraryRule($(OBJS))
DependTarget()
diff --git a/cde/lib/DtWidget/Imakefile b/cde/lib/DtWidget/Imakefile
index 67e2a41..9c1a80f 100644
--- a/cde/lib/DtWidget/Imakefile
+++ b/cde/lib/DtWidget/Imakefile
@@ -15,6 +15,8 @@ XCOMM $XConsortium: Imakefile /main/8 1996/04/21 19:11:16 drk
$
DEFINES = DtWidgetDefines
#if defined(LinuxArchitecture)
INCLUDES = -I. -I/usr/include/freetype2
+#elif defined(OpenBSDArchitecture)
+INCLUDES = -I. -I$(XPROJECTROOT)/include/freetype2
#else
INCLUDES = -I.
#endif
diff --git a/cde/lib/csa/Imakefile b/cde/lib/csa/Imakefile
index fe1b785..fccccdc 100644
--- a/cde/lib/csa/Imakefile
+++ b/cde/lib/csa/Imakefile
@@ -15,7 +15,7 @@ INCLUDES = -I.
OSMAJORVERSION = OSMajorVersion
OSMINORVERSION = OSMinorVersion
-DEFINES = -DRFC_MIME -DLINE_COUNT -DV2 -DOW_I18N -DSVR4 \
+DEFINES = -DRFC_MIME -DLINE_COUNT -DV2 -DOW_I18N \
-DREL="$(OSMAJORVERSION)$(OSMINORVERSION)" \
-DRELMAJOR="$(OSMAJORVERSION)" -DRELMINOR="$(OSMINORVERSION)"
diff --git a/cde/programs/Imakefile b/cde/programs/Imakefile
index 5375d53..613b4b1 100644
--- a/cde/programs/Imakefile
+++ b/cde/programs/Imakefile
@@ -5,11 +5,14 @@ XCOMM $XConsortium: Imakefile /main/17 1996/10/06 17:13:20
rws $
#if UseNSGMLS
NSGMLSDIR = nsgmls
#endif
-EXTRADIRS = util types localized tttypes $(NSGMLSDIR)
+EXTRADIRS = types localized tttypes $(NSGMLSDIR)
+#if !defined(OpenBSDArchitecture)
+EXTRADIRS += util
+#endif
XCOMM some of these cannot be built on linux yet.
XCOMM dtksh dtinfo
-#if defined(LinuxArchitecture)
+#if defined(LinuxArchitecture) || defined(OpenBSDArchitecture)
DTKSHDIR =
DTINFODIR =
#else
@@ -18,7 +21,7 @@ DTINFODIR = dtinfo
#endif
-SUBDIRS = dthelp dtmail dsdm dtpad dtfile dtwm dtlogin \
+SUBDIRS = dthelp dsdm dtpad dtfile dtwm dtlogin \
dtsession dthello dtstyle dtexec dtdbcache dticon dtterm \
dtcalc dtaction dtspcd \
dtscreen $(DTKSHDIR) dtcm dtsearchpath \
@@ -27,7 +30,7 @@ SUBDIRS = dthelp dtmail dsdm dtpad dtfile dtwm dtlogin \
dtudcfonted dtudcexch dtimsstart dtdocbook dtpdm dtsr \
dtpdmd $(DTINFODIR) $(EXTRADIRS)
-LINTSUBDIRS = dthelp dtmail dsdm dtpad dtfile dtlogin dtwm \
+LINTSUBDIRS = dthelp dsdm dtpad dtfile dtlogin dtwm \
dtsession dthello dtstyle dtexec dtdbcache dticon dtterm \
dtcalc dtaction dtcreate \
dtscreen $(DTKSHDIR) dtcm dtsearchpath \
diff --git a/cde/programs/dtcm/dtcm/Imakefile b/cde/programs/dtcm/dtcm/Imakefile
index 4e36ab4..aff0826 100644
--- a/cde/programs/dtcm/dtcm/Imakefile
+++ b/cde/programs/dtcm/dtcm/Imakefile
@@ -12,11 +12,11 @@ LOCAL_LIBRARIES = ../libDtCmP/libDtCmP.a $(CSALIB)
DtClientLibs
OSMAJORVERSION = OSMajorVersion
OSMINORVERSION = OSMinorVersion
- DEFINES = -DSVR4 -DREL="$(OSMAJORVERSION)$(OSMINORVERSION)" \
+ DEFINES = -DREL="$(OSMAJORVERSION)$(OSMINORVERSION)" \
-DRELMAJOR="$(OSMAJORVERSION)" -DRELMINOR="$(OSMINORVERSION)" \
$(ICONV_INBUF_DEFINE)
-#if defined(RsArchitecture) || defined(USLArchitecture) ||
defined(UXPArchitecture) || defined(LinuxArchitecture)
+#if defined(RsArchitecture) || defined(USLArchitecture) ||
defined(UXPArchitecture) || defined(LinuxArchitecture) ||
defined(OpenBSDArchitecture)
TTY_LIBRARIES = $(LOCAL_LIBRARIES)
#elif defined(AlphaArchitecture)
TTY_LIBRARIES = $(DTCMPLIB) $(CSALIB) $(DTSVCLIB) $(XTOOLLIB) $(XLIB)
@@ -32,6 +32,10 @@ EXTRA_LIBRARIES = -lrpcsvc -lPW -ldiag
EXTRA_LIBRARIES = -lrpcsvc -lV3
#endif
+#if defined(OpenBSDArchitecture)
+EXTRA_LIBRARIES = -lcompat
+#endif
+
#ifdef SunArchitecture
XCOMM Uncomment to build using Federated Naming Services. To activate
XCOMM you must set the UseFNS resource to True before runnin dtcm.
diff --git a/cde/programs/dtcm/libDtCmP/Imakefile
b/cde/programs/dtcm/libDtCmP/Imakefile
index a1cfd4d..72b7fbd 100644
--- a/cde/programs/dtcm/libDtCmP/Imakefile
+++ b/cde/programs/dtcm/libDtCmP/Imakefile
@@ -12,7 +12,7 @@ INCLUDES = -I. -I$(CSASRC)
OSMAJORVERSION = OSMajorVersion
OSMINORVERSION = OSMinorVersion
-DEFINES = -DRFC_MIME -DLINE_COUNT -DV2 -DOW_I18N -DSVR4 \
+DEFINES = -DRFC_MIME -DLINE_COUNT -DV2 -DOW_I18N \
-DREL="$(OSMAJORVERSION)$(OSMINORVERSION)" \
-DRELMAJOR="$(OSMAJORVERSION)" -DRELMINOR="$(OSMINORVERSION)"
diff --git a/cde/programs/dtcm/server/Imakefile
b/cde/programs/dtcm/server/Imakefile
index f3158ce..9c8f536 100644
--- a/cde/programs/dtcm/server/Imakefile
+++ b/cde/programs/dtcm/server/Imakefile
@@ -30,7 +30,7 @@ LOCAL_LIBRARIES = $(CSALIB) $(DTWIDGETLIB) $(DTHELPLIB)
$(DTSVCLIB) $(TTLIB) $(X
OSMAJORVERSION = OSMajorVersion
OSMINORVERSION = OSMinorVersion
- DEFINES = -DREL="$(OSMAJORVERSION)$(OSMINORVERSION)" -DSVR4 \
+ DEFINES = -DREL="$(OSMAJORVERSION)$(OSMINORVERSION)" \
-DRELMAJOR="$(OSMAJORVERSION)" \
-DRELMINOR="$(OSMINORVERSION)"
diff --git a/cde/programs/dtdocbook/tcl/Imakefile
b/cde/programs/dtdocbook/tcl/Imakefile
index d5b2f6c..4805d17 100644
--- a/cde/programs/dtdocbook/tcl/Imakefile
+++ b/cde/programs/dtdocbook/tcl/Imakefile
@@ -14,6 +14,9 @@ XCOMM Directory from which applications will reference the
library of Tcl
XCOMM scripts (note: you can set the TCL_LIBRARY environment variable at
XCOMM run-time to override this value):
TCL_LIBRARY = $(prefix)/lib/tcl$(VERSION)
+#ifdef OpenBSDArchitecture
+TCL_LIBRARY = TclLibrary
+#endif
#ifdef SunArchitecture
EXTRA_DEFINES = -DTCL_LIBRARY=\"${TCL_LIBRARY}\" \
@@ -31,10 +34,17 @@ EXTRA_DEFINES = -DTCL_LIBRARY=\"${TCL_LIBRARY}\" \
-DTCL_GOT_TIMEZONE -DTIME_WITH_SYS_TIME
# else
+# ifdef OpenBSDArchitecture
+EXTRA_DEFINES = -DTCL_LIBRARY=\"${TCL_LIBRARY}\" \
+ -DNO_UNION_WAIT -DHAVE_UNISTD_H \
+ -DTCL_GOT_TIMEZONE
+
+# else
EXTRA_DEFINES = -DTCL_LIBRARY=\"${TCL_LIBRARY}\" \
-DNO_UNION_WAIT -DHAVE_UNISTD_H -DNEED_MATHERR \
-DTCL_GOT_TIMEZONE
+# endif
# endif
# endif
#endif
diff --git a/cde/programs/dtfile/Imakefile b/cde/programs/dtfile/Imakefile
index 4f66b89..10a2ce7 100644
--- a/cde/programs/dtfile/Imakefile
+++ b/cde/programs/dtfile/Imakefile
@@ -31,6 +31,10 @@ EXTRA_CCOPTIONS = -xF
EXTRA_INCLUDES = -I/usr/include/freetype2
#endif
+#if defined(OpenBSDArchitecture)
+EXTRA_INCLUDES = -I$(XPROJECTROOT)/include/freetype2
+#endif
+
SRCS = ChangeDir.c ChangeDirP.c Command.c Common.c \
Desktop.c Directory.c Encaps.c File.c \
FileDialog.c FileManip.c FileMgr.c FileOp.c \
diff --git a/cde/programs/dtlogin/Imakefile b/cde/programs/dtlogin/Imakefile
index 2a013b7..47936d9 100644
--- a/cde/programs/dtlogin/Imakefile
+++ b/cde/programs/dtlogin/Imakefile
@@ -129,6 +129,10 @@ DEPXDMCPLIB =
INCLUDES = -I/usr/include/freetype2
#endif
+#ifdef OpenBSDArchitecture
+INCLUDES = -I$(XPROJECTROOT)/include/freetype2
+#endif
+
/**************************************************************************
*
* Source and object modules
diff --git a/cde/programs/dtspcd/Imakefile b/cde/programs/dtspcd/Imakefile
index 0f417a7..645abed 100644
--- a/cde/programs/dtspcd/Imakefile
+++ b/cde/programs/dtspcd/Imakefile
@@ -24,7 +24,7 @@ LOCAL_LIBRARIES = $(DTHELPLIB) $(DTSVCLIB) $(TTLIB) \
SYS_LIBRARIES = -lm -lgen
#endif
-#if defined(LinuxArchitecture)
+#if defined(LinuxArchitecture) || defined(OpenBSDArchitecture)
LOCAL_LIBRARIES = $(DTHELPLIB) $(DTSVCLIB) $(TTLIB) \
$(XMLIB) $(XTOOLLIB) $(XLIB)
SYS_LIBRARIES = -lm
diff --git a/cde/programs/nsgmls/Imakefile b/cde/programs/nsgmls/Imakefile
index 1255a3d..a4f4227 100644
--- a/cde/programs/nsgmls/Imakefile
+++ b/cde/programs/nsgmls/Imakefile
@@ -77,7 +77,7 @@ STLIBCENV =
M4 = /bin/m4
#endif
-#if defined(LinuxArchitecture)
+#if defined(LinuxArchitecture) || defined(OpenBSDArchitecture)
/*
* put cpp directives here rather than in CXXDEFINES because
--
1.7.6
------------------------------------------------------------------------------
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and
threat landscape has changed and how IT managers can respond. Discussions
will include endpoint security, mobile security and the latest in malware
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
_______________________________________________
cdesktopenv-devel mailing list
cdesktopenv-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/cdesktopenv-devel
