Imakefile diffs for OpenBSD.

diff --git a/cde/Imakefile b/cde/Imakefile
index 59f16e45605ca86019969c6aa41697db4f01b6ad..3cc25499ac643770c7d04fa881fde088549c8ac5 100644 (file)
--- 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 ff8e50c7e04afeb21c942455d0475ec99dae586b..70e475c4310974ffc3a80cd2b96d62ed89ca3a55 100644 (file)
--- 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 742811e2e8c5053a965faea2025554bb43919608..c775b2cfa223ee57295a88c27658b5fb9fa67530 100644 (file)
--- 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 89fe15c5c9e6f001dbdda4ef897274bdfdec71ce..eb219b5475e30c0f5ca694e1dba0c33493ed75d8 100644 (file)
--- 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 4fceb3ca9879000c8e1e6e26a949bb9ed0f6bdbe..286bcd8eec6627ee5f0b493d54c5000735cf8a83 100644 (file)
--- 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 67e2a4179f1fd41317c50e088caa88de0db93d34..9c1a80f41b00a58607950233ed597d7b6f17471c 100644 (file)
--- 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 fe1b7851c76b16967d4f8f161ec12f277bda45d8..fccccdc8aa90f3696c8accc1337b8e4af7d52f71 100644 (file)
--- 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 5375d53675a461158b7f69c73abf9d76c64bdcb4..613b4b152e5d55878248627c74e036beeb4cb219 100644 (file)
--- 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 4e36ab44a1cbf71b9eb02a1d43b958395c8c9a3e..aff082600a98d54658a70d1d2a88f03675150bfb 100644 (file)
--- 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 a1cfd4da4eb7af14b4306585955112acf7cfc530..72b7fbd65b1786c40073c910bb1ed7a70bc172df 100644 (file)
--- 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 f3158cea473fad2b7fb710185d95cadd280e1d57..9c8f536ce4377a4a3d6ba81606ef2c33262cccf6 100644 (file)
--- 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 d5b2f6c3ac670493a7ede0e5450de7b0065eb305..4805d1757d0e4db6aaec12504de5ad2b4ef8aa45 100644 (file)
--- 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 4f66b89583c5b685eb893f4b4581f5152af68b73..10a2ce72f27423a9877c909f87d3dbf5a53d69f6 100644 (file)
--- 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 2a013b7026ace5c1921cb36ebc3da068f5cbc11f..47936d91e26759cfea1c3fa617431727b7b5f12a 100644 (file)
--- 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 0f417a7220cfb536eda1822d1a8b311f04edbffd..645abedfcc378ea499f19e43cc400dd4c10a2868 100644 (file)
--- 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 1255a3dd62d29490f5ee6aa3e91e1a0498215c24..a4f422771c8ad229f647cf384951afda3703b0b4 100644 (file)
--- 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