OpenIndiana and Solaris port

cde/.gitignore

@@ -76,6 +76,19 @@ admin/IntegTools/post_install/netbsd/configRun
 admin/IntegTools/post_install/netbsd/configShlibs
 admin/IntegTools/post_install/netbsd/configTT
 
+admin/IntegTools/post_install/sun/CDE-MIN.list
+admin/IntegTools/post_install/sun/CDE-MIN.lst
+admin/IntegTools/post_install/sun/CDE-RUN.list
+admin/IntegTools/post_install/sun/CDE-RUN.lst
+admin/IntegTools/post_install/sun/CDE-SHLIBS.list
+admin/IntegTools/post_install/sun/CDE-SHLIBS.lst
+admin/IntegTools/post_install/sun/CDE-TT.list
+admin/IntegTools/post_install/sun/CDE-TT.lst
+admin/IntegTools/post_install/sun/configMin
+admin/IntegTools/post_install/sun/configRun
+admin/IntegTools/post_install/sun/configShlibs
+admin/IntegTools/post_install/sun/configTT
+
 admin/IntegTools/post_install/configDemos
 admin/IntegTools/post_install/configFonts
 admin/IntegTools/post_install/configHelp
@@ -90,6 +103,12 @@ admin/IntegTools/post_install/configPrg
 admin/IntegTools/post_install/configShlibs
 
 install.dt
+install.dt.dec
+install.dt.hp
+install.dt.ibm
+install.dt.sun
+install.dt.usl
+install.dt.uxp
 dinstall.dt
 dinstallCDE
 installCDE
@@ -367,9 +386,25 @@ doc/C/man/man3/
 doc/C/man/man4/
 doc/C/man/man5/
 doc/C/man/man6/
+doc/de_DE.ISO8859-1/cde.dti/
+doc/de_DE.ISO8859-1/guides/infoUGd/TOC.sgm
+doc/de_DE.ISO8859-1/guides/sysAdminGuide/TOC.sgm
+doc/de_DE.ISO8859-1/guides/usersGuide/TOC.sgm
 doc/de_DE.ISO8859-1/help-sdl/
+doc/es_ES.ISO8859-1/cde.dti/
+doc/es_ES.ISO8859-1/guides/infoUGd/TOC.sgm
+doc/es_ES.ISO8859-1/guides/sysAdminGuide/TOC.sgm
+doc/es_ES.ISO8859-1/guides/usersGuide/TOC.sgm
 doc/es_ES.ISO8859-1/help-sdl/
+doc/fr_FR.ISO8859-1/cde.dti/
+doc/fr_FR.ISO8859-1/guides/infoUGd/TOC.sgm
+doc/fr_FR.ISO8859-1/guides/sysAdminGuide/TOC.sgm
+doc/fr_FR.ISO8859-1/guides/usersGuide/TOC.sgm
 doc/fr_FR.ISO8859-1/help-sdl/
+doc/it_IT.ISO8859-1/cde.dti/
+doc/it_IT.ISO8859-1/guides/infoUGd/TOC.sgm
+doc/it_IT.ISO8859-1/guides/sysAdminGuide/TOC.sgm
+doc/it_IT.ISO8859-1/guides/usersGuide/TOC.sgm
 doc/it_IT.ISO8859-1/help-sdl/
 doc/ja_JP.dt-eucJP/m-guides/
 doc/tmp/
@@ -1094,6 +1129,7 @@ programs/dtksh/ksh93/src/lib/libvdelta/MAM.list
 programs/dtksh/ksh93/src/lib/libvdelta/MAM.time
 
 # programs/dtlogin
+programs/dtlogin/config/0015.sun.env
 programs/dtlogin/config/0060.dtsysenv
 programs/dtlogin/config/Dtlogin
 programs/dtlogin/config/Xaccess
@@ -1110,6 +1146,8 @@ programs/dtlogin/config/Xservers.con
 programs/dtlogin/config/Xservers.nc
 programs/dtlogin/config/Xsession
 programs/dtlogin/config/Xsession.ive
+programs/dtlogin/config/Xsession.ow
+programs/dtlogin/config/Xsession.ow2
 programs/dtlogin/config/Xsetup
 programs/dtlogin/config/Xstartup
 programs/dtlogin/config/current.session
@@ -1182,6 +1220,16 @@ programs/fontaliases/netbsd/C/dtinfo.pcf
 programs/fontaliases/netbsd/C/dtinfo.pcf.gz
 programs/fontaliases/netbsd/C/dtinfo.pcf.Z
 programs/fontaliases/netbsd/C/fonts.dir
+programs/fontaliases/sun/C/dtinfo.bdf
+programs/fontaliases/sun/C/dtinfo.pcf
+programs/fontaliases/sun/C/dtinfo.pcf.gz
+programs/fontaliases/sun/C/dtinfo.pcf.Z
+programs/fontaliases/sun/C/fonts.dir
+programs/fontaliases/sun/ja/dtinfo.bdf
+programs/fontaliases/sun/ja/dtinfo.pcf
+programs/fontaliases/sun/ja/dtinfo.pcf.gz
+programs/fontaliases/sun/ja/dtinfo.pcf.Z
+programs/fontaliases/sun/ja/fonts.dir
 
 # programs/ksh93
 programs/dtksh/ksh93/man/man1/sh.1
@@ -1235,6 +1283,8 @@ programs/localized/C/backdrops/Backdrops.nls
 programs/localized/C/backdrops/desc.C
 programs/localized/C/config/Xresources
 programs/localized/C/config/Xresources.nls
+programs/localized/C/config/Xresources.ow
+programs/localized/C/config/Xresources.ow.nls
 programs/localized/C/config/current.session
 programs/localized/C/config/current.session.nls
 programs/localized/C/config/current.session.tmsg
@@ -1401,6 +1451,8 @@ programs/localized/de_DE.ISO8859-1/backdrops/Backdrops.nls
 programs/localized/de_DE.ISO8859-1/backdrops/desc.de_DE.ISO8859-1
 programs/localized/de_DE.ISO8859-1/config/Xresources
 programs/localized/de_DE.ISO8859-1/config/Xresources.nls
+programs/localized/de_DE.ISO8859-1/config/Xresources.ow
+programs/localized/de_DE.ISO8859-1/config/Xresources.ow.nls
 programs/localized/de_DE.ISO8859-1/config/current.session
 programs/localized/de_DE.ISO8859-1/config/current.session.nls
 programs/localized/de_DE.ISO8859-1/config/current.session.tmsg
@@ -1590,6 +1642,8 @@ programs/localized/es_ES.ISO8859-1/backdrops/Backdrops.nls
 programs/localized/es_ES.ISO8859-1/backdrops/desc.es_ES.ISO8859-1
 programs/localized/es_ES.ISO8859-1/config/Xresources
 programs/localized/es_ES.ISO8859-1/config/Xresources.nls
+programs/localized/es_ES.ISO8859-1/config/Xresources.ow
+programs/localized/es_ES.ISO8859-1/config/Xresources.ow.nls
 programs/localized/es_ES.ISO8859-1/config/current.session
 programs/localized/es_ES.ISO8859-1/config/current.session.nls
 programs/localized/es_ES.ISO8859-1/config/current.session.tmsg
@@ -1779,6 +1833,8 @@ programs/localized/fr_FR.ISO8859-1/backdrops/Backdrops.nls
 programs/localized/fr_FR.ISO8859-1/backdrops/desc.fr_FR.ISO8859-1
 programs/localized/fr_FR.ISO8859-1/config/Xresources
 programs/localized/fr_FR.ISO8859-1/config/Xresources.nls
+programs/localized/fr_FR.ISO8859-1/config/Xresources.ow
+programs/localized/fr_FR.ISO8859-1/config/Xresources.ow.nls
 programs/localized/fr_FR.ISO8859-1/config/current.session
 programs/localized/fr_FR.ISO8859-1/config/current.session.nls
 programs/localized/fr_FR.ISO8859-1/config/current.session.tmsg
@@ -1968,6 +2024,8 @@ programs/localized/it_IT.ISO8859-1/backdrops/Backdrops.nls
 programs/localized/it_IT.ISO8859-1/backdrops/desc.it_IT.ISO8859-1
 programs/localized/it_IT.ISO8859-1/config/Xresources
 programs/localized/it_IT.ISO8859-1/config/Xresources.nls
+programs/localized/it_IT.ISO8859-1/config/Xresources.ow
+programs/localized/it_IT.ISO8859-1/config/Xresources.ow.nls
 programs/localized/it_IT.ISO8859-1/config/current.session
 programs/localized/it_IT.ISO8859-1/config/current.session.nls
 programs/localized/it_IT.ISO8859-1/config/current.session.tmsg

cde/admin/IntegTools/dbTools/installCDE.src

@@ -257,9 +257,13 @@ RestartInetd()
 
   OLDPWD=`pwd`
   cd /
-  if [ "$PLATFORM" = "sun" -o "$PLATFORM" = "usl" -o "$PLATFORM" = "uxp" ]
+  if [ "$PLATFORM" = "usl" -o "$PLATFORM" = "uxp" ]
   then
     /usr/sbin/inetd -s
+  elif [ "$PLATFORM" = "sun" ]
+  then
+    /usr/sbin/svcadm refresh svc:/network/inetd:default
+    /usr/sbin/svcadm restart svc:/network/inetd:default
   elif [ "$PLATFORM" = "aix" ]
   then
     startsrc -s inetd >>$LOGFILE 2>&1
@@ -601,7 +605,7 @@ XCOMM
   if [ "$PLATFORM" = "aix" ];
   then
     USER=`/bin/whoami`
-  elif [ "$PLATFORM" = "sun" -o "$PLATFORM" = "usl" -o "$PLATFORM" = "uxp" ];
+  elif [ "$PLATFORM" = "usl" -o "$PLATFORM" = "uxp" ];
   then
     USER=`/usr/ucb/whoami`
   else

cde/admin/IntegTools/dbTools/mkProd

@@ -108,7 +108,7 @@ fi
 if [ $PLATFORM = "aix" ];
 then
         USER=`/bin/whoami`
-elif [ $PLATFORM = "sun" -o $PLATFORM = "usl" -o $PLATFORM = "uxp" ];
+elif [ $PLATFORM = "usl" -o $PLATFORM = "uxp" ];
 then
         USER=`/usr/ucb/whoami`
 else

cde/admin/IntegTools/post_install/sun/configMin.src

@@ -227,8 +227,6 @@ XCOMM ###############################################################
 
     FixEtcInetdDotConf
 
-    FixEtcPamDotConf
-
     HASH
     HASH  create the /var/dt/tmp directory for the dtspcd
     HASH
@@ -245,8 +243,6 @@ XCOMM ###############################################################
 
     UnfixEtcInetdDotConf
 
-    UnfixEtcPamDotConf
-
     RemoveMinFiles
 
     VerifyInstalledFiles

cde/admin/IntegTools/post_install/sun/configRun.src

@@ -270,7 +270,7 @@ DEFAULT_PRINTER="DtPrint"
     HASH
     HASH ConfigurePrintersDir
     HASH
-    env LANG=C /usr/dt/bin/dtprintinfo -populate
+    env LANG=C /usr/dt/bin/dtprintinfo -populate 2>/dev/null
 
     HASH
     HASH Configure Xsession.d

cde/config/cf/DtInfo.rules

@@ -36,7 +36,7 @@ XCOMM $TOG: DtInfo.rules /main/21 1997/09/05 11:31:01 samborn $
  * library building stuff
  */
 
-#if defined(SunArchitecture) && CplusplusCompilerMajorVersion > 3
+#if defined(SunArchitecture) && CplusplusCompilerMajorVersion > 5
 # define makelibT(libname)					@@\
 	makelib(libname)					@@\
 								@@\
@@ -61,7 +61,7 @@ Concat3(subdir/libname/lib,libname,T.a): FRC			@@\
 	    echo STR(*** Making lib libname Templates ***) ; \	@@\
 	    $(MAKE) Concat3(libname/lib,libname,T.a) ; \	@@\
 	)
-#else /* not defined(SunArchitecture) && CplusplusCompilerMajorVersion > 3 */
+#else /* not defined(SunArchitecture) && CplusplusCompilerMajorVersion > 5 */
 # define makelibT(libname)					@@\
 	makelib(libname)
 #endif
@@ -153,7 +153,7 @@ Concat(lib,libname.a): objlist					@@\
 	$(LD) -r -o $@ objlist
 
 
-#if defined(SunArchitecture) && CplusplusCompilerMajorVersion > 3
+#if defined(SunArchitecture) && CplusplusCompilerMajorVersion > 5
 #define SimpleLibraryT(libname,objlist,libdir)			@@\
 SimpleLibrary(libname,objlist,libdir)				@@\
 								@@\
@@ -198,7 +198,7 @@ Concat(lib,libname.a): objlist otherdeps			@@\
 	@echo STR(*** Making NotSoSimpleLibrary libname.a)	@@\
 	$(LD) -r -o $@ objlist
 
-#if defined(SunArchitecture) && CplusplusCompilerMajorVersion > 3
+#if defined(SunArchitecture) && CplusplusCompilerMajorVersion > 5
 #define NotSoSimpleLibraryT(libname,objlist,libdir,otherdeps)	@@\
 NotSoSimpleLibrary(libname,objlist,libdir,otherdeps)		@@\
 								@@\

cde/config/cf/Motif.tmpl

@@ -590,6 +590,8 @@ LINTXMWIDGETLIB = $(MWIDGETSRC)/llib-l/Xm.ln
 /* check for existence of Dtinfo Motif Documents */
 #if defined(LinuxArchitecture)
       MOTIF_DOC = $(shell if test -f $(MDOCSRC)/C/guides/bookcase.bc; then echo -D_MOTIFDOC_; fi)
+#elif defined(SunArchitecture)
+  MOTIF_DOC :sh = if test -f ../imports/motif/doc/C/guides/bookcase.bc; then echo -D_MOTIFDOC_; else echo; fi
 #elif defined(BSDArchitecture)
      MOTIF_DOC != if test -f $(MDOCSRC)/C/guides/bookcase.bc; then echo -D_MOTIFDOC_; else echo; fi
 #else

cde/config/cf/cde.tmpl

@@ -232,12 +232,9 @@ XCOMM $XConsortium: cde.tmpl /main/2 1996/12/04 10:13:09 swick $
 #endif
 
 #ifndef UseNSGMLS
-# ifdef SunArchitecture
+# define UseNSGMLS YES
-#  define UseNSGMLS NO
-# else
-#  define UseNSGMLS YES
-# endif
 #endif
+
 #ifndef SGMLParser
 # if UseNSGMLS
 #  define SGMLDir $(NSGMLSSRC)

cde/config/cf/site.def

@@ -56,7 +56,22 @@ XCOMM site:  $TOG: site.def /main/23 1998/03/19 18:43:26 mgreess $
 # endif
 
 # if defined(SunArchitecture)
-#  define HasSunCplusplus	YES
+#  ifndef HasSunC
+#   define HasSunC		NO
+#  endif
+#  ifndef HasSunCplusplus
+#   define HasSunCplusplus	HasSunC
+#  endif
+#  ifndef HasGcc2
+#   if HasSunC
+#    define HasGcc2		NO
+#   else
+#    define HasGcc2		YES
+#   endif
+#  endif
+#  ifndef HasGcc2ForCplusplus
+#   define HasGcc2ForCplusplus	HasGcc2
+#  endif
 # endif
 
 # if defined(UXPArchitecture) || defined(USLArchitecture) \
@@ -91,6 +106,8 @@ XCOMM site:  $TOG: site.def /main/23 1998/03/19 18:43:26 mgreess $
 #  define MotifProjectRoot	/usr/local
 # elif defined(NetBSDArchitecture)
 #  define MotifProjectRoot	/usr/pkg
+# elif defined(SunArchitecture)
+#  define MotifProjectRoot	/usr/X11
 # endif
 #endif
 

cde/config/cf/sun.cf

@@ -16,42 +16,40 @@ XCOMM operating system:  OSName (OSMajorVersion./**/OSMinorVersion./**/OSTeenyVe
 
 /*
  * Compiler setup.  This sun.cf file knows what options to use with 
- * certain compilers, including Sun C, CenterLine C, and gcc.  It 
+ * certain compilers, including Sun C and gcc.  It also understands
- * also understands how to set some of the options for various C++
+ * how to set some of the options for various C++ compilers, including
- * compilers, including Sun C++ and CenterLine C++.
+ * Sun C++ and g++.
  *
  * === C Compiler Setup ==========================================
  *
- * For SunPro C, define HasSunC to YES in site.def.  
+ * For SunPro C, define HasSunC to YES in host.def.
- * For CenterLine C, define HasCenterLineC to YES in site.def
+ * For Gnu gcc, define HasGcc2 to YES in host.def
- * For gcc or gcc2, define HasGcc or HasGcc2 to YES in site.def
+ * For other compilers, define HasSunC to NO in host.def, then
- * For other compilers, define HasSunC to NO in site.def, then 
  *    provide appropriate values for the various compiler related
  *    configuration varibles used here.
  * 
  * If you don't tell us which C compiler you have, we assume you have 
- * the SunPro C compiler under Solaris 2.x, and the bundled /bin/cc 
+ * the Gcc C compiler under Solaris 5.x.
  * under SunOS 4.1.x
  *
  * === C++ Compiler Setup ==========================================
  *
- * For SunPro C++, define HasSunCplusplus to YES in site.def
+ * For SunPro C++, define HasSunCplusplus to YES in host.def
- * For CenterLine C++, define HasCenterLineCplusplus to YES in site.def
+ * For Gnu g++ 4.x, define HasGcc2ForCplusplus to YES in host.def
- * For Gnu g++ 2.6.x, define HasGcc2ForCplusplus to YES in site.def
+ * For other compilers, define HasCplusplus to YES in host.def, and
- * For other compilers, define HasCplusplus to YES in site.def, and 
  *    check to see if you need to provide values for CplusplusOptions
  *    and/or DefaultCplusplusOptions.
  *
  * In any case, you may also need to set CplusplusDependIncludes.
  *
  * If you say you have the SunPro C++ compiler, we assume you have 
- * version 3.0.x of the compiler.  If you have version 4.0.x instead, 
+ * version 5.0.x of the compiler.  If you have version 4.0.x instead,
- * define CplusplusCompilerMajorVersion as 4 in site.def.
+ * define CplusplusCompilerMajorVersion as 4 in host.def.
  *
  */
 
 #ifndef HasSunC
-# if (HasCenterLineC || HasGcc || HasGcc2 || OSMajorVersion < 5)
+# if (HasGcc || HasGcc2 || OSMajorVersion < 5)
 #  define HasSunC NO
 # else
 #  define HasSunC YES
@@ -89,22 +87,44 @@ XCOMM SunPro C CCompilerMajorVersion./**/CCompilerMinorVersion
 XCOMM SunPro C++ CplusplusCompilerMajorVersion./**/CplusplusCompilerMinorVersion
 #endif
 
-#if HasCenterLineC
+#if HasGcc2
-# ifndef CcCmd
+# ifndef CCompilerMajorVersion
-#  define CcCmd clcc
+#  define CCompilerMajorVersion DefaultGnuCCompilerMajorVersion
 # endif
+# ifndef CCompilerMinorVersion
+#  define CCompilerMinorVersion DefaultGnuCCompilerMinorVersion
+# endif
+XCOMM Gnu C CCompilerMajorVersion./**/CCompilerMinorVersion
 #endif
 
-#if HasCenterLineCplusplus
+#if HasGcc2ForCplusplus
 # ifndef HasCplusplus
 #  define HasCplusplus YES
 # endif
-# ifndef DefaultCplusplusOptions
+# ifndef CplusplusCompilerMajorVersion
-#  define DefaultCplusplusOptions -Xa
+#  ifdef DefaultGnuCplusplusCompilerMajorVersion
+#   define CplusplusCompilerMajorVersion DefaultGnuCplusplusCompilerMajorVersion
+#  else
+#   define CplusplusCompilerMajorVersion 4
+#  endif
 # endif
-# ifndef CplusplusOptions
+# ifndef CplusplusCompilerMinorVersion
-#  define CplusplusOptions -Xa
+#  ifdef DefaultGnuCplusplusCompilerMinorVersion
+#   define CplusplusCompilerMinorVersion DefaultGnuCplusplusCompilerMinorVersion
+#  else
+#   define CplusplusCompilerMinorVersion 6
+#  endif
 # endif
+XCOMM Gnu C++ CplusplusCompilerMajorVersion./**/CplusplusCompilerMinorVersion
+#endif
+
+
+#if OSMajorVersion > 4
+#define MkdirHierCmd		mkdir -p
+#endif
+
+#ifndef OptimizedCDebugFlags
+# define OptimizedCDebugFlags	-O2
 #endif
 
 #if OSMajorVersion < 4 || (OSMajorVersion == 4 && OSMinorVersion < 1)
@@ -144,20 +164,23 @@ XCOMM SunPro C++ CplusplusCompilerMajorVersion./**/CplusplusCompilerMinorVersion
 #define ConnectionFlags		-DTCPCONN -DUNIXCONN -DLOCALCONN
 #if HasSunC
 /* 
- * Assume /opt/SUNWspro/bin/ contains symlinks to the appropriate tools
+ * Assume /opt/solarisstudio/bin/ contains symlinks to the appropriate tools
  */
 #ifndef  CcCmd
-# define CcCmd			/opt/SUNWspro/bin/cc
+# define CcCmd			/opt/solarisstudio/bin/cc
 #endif
 #ifndef  CplusplusCmd
-# define CplusplusCmd		/opt/SUNWspro/bin/CC
+# define CplusplusCmd		/opt/solarisstudio/bin/CC
 #endif
 #ifndef  CplusplusFilt
-#  define CplusplusFilt 	/opt/SUNWspro/bin/c++filt
+#  define CplusplusFilt 	/opt/solarisstudio/bin/c++filt
+#endif
+#ifndef CplusplusLibC
+#define CplusplusLibC		-L/opt/solarisstudio/lib -lCrun
 #endif
 #ifndef  CplusplusDependIncludes
 #if CplusplusCompilerMajorVersion > 3
-# define CplusplusDependIncludes	-I/opt/SUNWspro/SC4.0/include/CC
+# define CplusplusDependIncludes	-I/opt/solarisstudio/prod/include/CC -I/opt/solarisstudio/prod/include/CC/Cstd
 #elif CplusplusCompilerMajorVersion > 2
 # define CplusplusDependIncludes	-I/opt/SUNWspro/SC3.0/include/CC
 #else
@@ -165,7 +188,6 @@ XCOMM SunPro C++ CplusplusCompilerMajorVersion./**/CplusplusCompilerMinorVersion
 #endif
 #endif
 #endif
-
 # if HasSunC && (CCompilerMajorVersion < 3)
 #  define BootstrapCFlags	-DSVR4
 # else
@@ -208,7 +230,7 @@ XCOMM SunPro C++ CplusplusCompilerMajorVersion./**/CplusplusCompilerMinorVersion
 #  endif
 # endif 		/* OSMinorVersion > 1 */
 # ifndef UseExportLists
-#  define UseExportLists YES
+#  define UseExportLists   NO
 # endif
 # define HasVFork          NO
 # define InstKmemFlags	  -g sys -m 2711
@@ -217,11 +239,11 @@ XCOMM SunPro C++ CplusplusCompilerMajorVersion./**/CplusplusCompilerMinorVersion
  * Set flags for position independent code before including sv4Lib.rules
  * if the compiler in use doesn't use standard SVR4 flags
  */
-# if HasSunC || HasCenterLineC
+# if HasSunC
 #  define PositionIndependentCFlags -Kpic
 #  define LargePositionIndependentCFlags -KPIC
 # endif
-# if HasSunCplusplus || HasCenterLineCplusplus
+# if HasSunCplusplus
 #  define PositionIndependentCplusplusFlags -pic
 #  define LargePositionIndependentCplusplusFlags -PIC
 # endif
@@ -255,12 +277,10 @@ XCOMM SunPro C++ CplusplusCompilerMajorVersion./**/CplusplusCompilerMinorVersion
 #  endif
 # endif
 # if HasGcc2
-#  ifndef OptimizedCDebugFlags
+#  define SharedLibraryLoadFlags -shared
-#   ifdef i386Architecture
+#  define ExtraLoadFlags -Wl,-rpath,$(USRLIBDIRPATH)
-#    define OptimizedCDebugFlags -m486 DefaultGcc2i386Opt
+#  ifdef i386Architecture
-#   else
+#   define CcCmd		gcc
-#    define OptimizedCDebugFlags -O2
-#   endif
 #  endif
 # else
 #  define SharedLibraryCcCmd cc
@@ -296,28 +316,24 @@ XCOMM SunPro C++ CplusplusCompilerMajorVersion./**/CplusplusCompilerMinorVersion
 #  endif	
 # endif
 
-/* Set compiler-dependent options for CenterLine C */
-
-# if HasCenterLineC
-#  ifndef DefaultCCOptions
-#   define DefaultCCOptions -Xt -w1 -DANSICPP -U__HIGHC__
-#  endif
-#  ifndef NeedConstPrototypes
-#   define NeedConstPrototypes YES
-#  endif
-#  ifndef NeedNestedPrototypes
-#   define NeedNestedPrototypes YES
-#  endif
-#  ifndef NeedVarargsPrototypes
-#   define NeedVarargsPrototypes YES
-#  endif
-# endif
-
-
 # define PexCCOptions DefaultCCOptions
 
 #endif /* HasGcc || HasGcc2 (else) */
 
+#if HasGcc2
+CXXDEPENDINCLUDE :sh = CcCmd -v -x c++ /dev/null -fsyntax-only \
+		       2>&1 | sed -n 's/^ \(\/.*[cg]++.*\)/-I\1/p'
+#define CplusplusDependIncludes	$(CXXDEPENDINCLUDE)
+#endif
+
+#if HasGcc2ForCplusplus
+#define CplusplusCmd	g++
+#ifndef CplusplusLibC
+#define CplusplusLibC	-L/usr/gnu/lib -lstdc++
+#endif
+#endif /* HasGcc2ForCplusplus */
+
+
 #if OSMajorVersion < 5
 # define SharedAllocateLocalDefines -DINCLUDE_ALLOCA_H
 # define LibraryCCOptions /* don't want special floating point */
@@ -346,8 +362,12 @@ man_keywords::								@@\
 #define SharedXdmcpRev 6
 #endif
 
-#define MotifDefines			\
+#define DependFileName		.depend
-	-DNO_ISDIR -DNO_REGCOMP -DNO_ALLOCA -DBOGUS_MB_MAX -DNO_CONST
+#if HasSunC
+#define DependDefines		-D__BUILTIN_VA_ARG_INCR
+#endif
+
+#define LdPreLib		-L/usr/X11/lib -L$(BUILDLIBDIR)
 #define PamUnixDefines		-DPAM_NIS
 #define TtLargePICTable		YES
 #define DtSvcDefines		-DMULTIBYTE -DNO_REGCOMP
@@ -355,6 +375,11 @@ man_keywords::								@@\
 #define DtWidgetDefines		DtSearchDefines
 #define DtPrintDefines		DtSearchDefines
 
+/* For DtHelp TIFF processing routines. */
+#if defined(AMD64Architecture) || defined(i386Architecture)
+#define LSBBitOrder             YES
+#endif
+
 #define baseDtMailDefines	\
 	-DSunOS=OSMajorVersion\#\#OSMinorVersion -DMMAP_NORESERVE -DSPRO_V2
 #ifndef i386Architecture
@@ -367,10 +392,15 @@ man_keywords::								@@\
 
 #define TtClientExtraLibs	ExtraLibraries -ldl -lintl
 
-#define ExportListGenSource	elistgen.sun
+#ifndef TopMotifInclude
+# define TopMotifInclude	/usr/X11/include
+#endif
+
 #define ShlibExportListOpt(filename)	-M filename
 
+#define TtClientLibs $(TTLIB) $(XTOOLLIB) $(XLIB)
+#define TtClientDepLibs $(DEPTTLIB) $(DEPXTOOLLIB) $(DEPXLIB)
+
 #define CdeProjectDefines \
-	-DMULTIBYTE -DNLS16 -DMESSAGE_CAT -D_XOPEN_VERSION=4 \
+	-DMULTIBYTE -DNLS16 -DMESSAGE_CAT -D__EXTENSIONS__ \
-	-D_XOPEN_SOURCE -D__EXTENSIONS__ \
 	-DOSMAJORVERSION=OSMajorVersion -DOSMINORVERSION=OSMinorVersion

cde/config/cf/sunLib.tmpl

@@ -55,15 +55,15 @@ XCOMM $TOG: sunLib.tmpl /main/47 1997/12/12 14:53:33 kaleb $
 # define SharedPamDialAuthReqs $(LDPRELIBS) -lpam $(LDPOSTLIBS) SharedThreadReqs
 # define SharedPamRhostsAuthReqs $(LDPRELIBS) -lpam $(LDPOSTLIBS) -lsocket SharedThreadReqs
 # define SharedPamDceAuthReqs $(LDPRELIBS) -lpam $(LDPOSTLIBS) -ldce -lnsl -lsocket SharedThreadReqs
-# define SharedTtReqs -lnsl -lsocket -lintl -ldl -lc -lw
+# define SharedTtReqs $(XTOOLLIB) -lnsl -lsocket -lintl -ldl -lc -lw $(CXXLIB)
-# define SharedDtSvcReqs $(LDPRELIBS) $(TTLIB) $(XMLIB) $(XTOOLLIB) $(XPLIB) $(XLIB) $(LDPOSTLIBS) SharedThreadReqs -lgen -lc -lsocket -lnsl -ldl
+# define SharedDtSvcReqs $(LDPRELIBS) $(TTLIB) $(XMLIB) $(XTOOLLIB) $(XPLIB) $(XLIB) $(LDPOSTLIBS) SharedThreadReqs -lgen -lc -lsocket -lnsl -ldl $(CXXLIB)
 # define SharedDtMmdbReqs $(LDPRELIBS) $(DTSVCLIB) $(TTLIB) $(XMLIB) $(XTOOLLIB) $(XPLIB) $(XLIB) $(LDPOSTLIBS) SharedThreadReqs -lgen -lc -lsocket -lnsl -ldl
 # define SharedDtSearchReqs -lm -lc
 # define SharedDtWidgetReqs $(LDPRELIBS) $(DTSVCLIB) $(XMLIB) -lintl $(LDPOSTLIBS) -lw -lm -lc
-# define SharedDtHelpReqs $(LDPRELIBS) $(DTSVCLIB) $(XMLIB) $(XTOOLLIB) $(XPLIB) $(XLIB) $(LDPOSTLIBS) -lw -lgen -lm -lc
+# define SharedDtHelpReqs $(LDPRELIBS) $(DTSVCLIB) $(XMLIB) $(XTOOLLIB) $(XPLIB) $(XLIB) $(LDPOSTLIBS) -lw -lgen -lm -lc -ljpeg
 # define SharedDtPrintReqs $(LDPRELIBS) $(DTSVCLIB) $(DTHELPLIB) $(XMLIB) -lintl $(LDPOSTLIBS) -lw -lm -lc
 # define SharedDtTermReqs SharedDtHelpReqs -ldl -lgen
-# define SharedDtMrmReqs $(LDPRELIBS) $(DTTERMLIB) $(DTPRINTLIB) $(DTHELPLIB) $(DTWIDGETLIB) $(MRESOURCELIB) $(XMLIB) $(XTOOLLIB) $(XPLIB) $(XLIB) $(LDPOSTLIBS) -lw -lsocket -lnsl -lc
+# define SharedDtMrmReqs $(LDPRELIBS) $(DTTERMLIB) $(DTPRINTLIB) $(DTHELPLIB) $(DTWIDGETLIB) $(MRESOURCELIB) $(XMLIB) $(XTOOLLIB) $(XPLIB) $(XLIB) $(LDPOSTLIBS) -lw -lsocket -lnsl -lc $(CXXLIB)
 # define SharedDtMailReqs $(LDPRELIBS) -lw $(CXXLIB) -lm -ldl
 # define SharedCsaReqs $(LDPRELIBS) $(DTSVCLIB) $(XMLIB) SharedXmReqs
 
@@ -74,10 +74,10 @@ ICONV_INBUF_DEFINE = -DICONV_INBUF_CONST=const
 
 # if HasCplusplus
 #  if HasGcc2ForCplusplus
-UNSHARED_CXXLIB = -static -lC
+UNSHARED_CXXLIB =
 #  elif HasSunCplusplus
 #   if CplusplusCompilerMajorVersion > 3
-UNSHARED_CXXLIB = -lC
+UNSHARED_CXXLIB =
 #   else
 UNSHARED_CXXLIB = -Bstatic -lC -Bdynamic -lm -lc -Bstatic
 #   endif

cde/config/cf/sv4Lib.rules

@@ -61,8 +61,17 @@ install:: Concat(lib,libname.so.rev) 					@@\
 #endif /* InstallSharedLibraryData */
 
 #ifndef LinkWithExports
-# if UseExportLists
+# if defined(SunArchitecture)
-#  define LinkWithExports(libname,rev,solist,down,up) \
+#  if HasGcc2
+#   define LinkWithExports(libname,rev,solist,down,up) \
+	(cd down; $(CC) -o up/$@~ $(SHLIBLDFLAGS) -Wl,-soname,$@ solist $(REQUIREDLIBS))
+#  else
+#   define LinkWithExports(libname,rev,solist,down,up) \
+	(cd down; $(CCENVSETUP) $(CXX) -o up/$@~ $(SHLIBLDFLAGS) -h $@ solist $(REQUIREDLIBS))
+#  endif
+# else
+#  if UseExportLists
+#   define LinkWithExports(libname,rev,solist,down,up) \
 	(cd down; $(CCENVSETUP) $(LD) -o up/$@~ $(SHLIBLDFLAGS) -h $@ solist $(REQUIREDLIBS))	@@\
 	if [ -f Concat(lib,libname.elist) ]; then \			@@\
 	    $(RM) down/$@.exports $@.list; \				@@\
@@ -71,9 +80,10 @@ install:: Concat(lib,libname.so.rev) 					@@\
 	    (cd down; $(CCENVSETUP) $(LD) -o up/$@~ $(SHLIBLDFLAGS) -h $@ ShlibExportListOpt($@.exports) solist $(REQUIREDLIBS)); \	@@\
 	    $(RM) down/$@.exports $@.list; \				@@\
 	fi;
-# else
+#  else
-#  define LinkWithExports(libname,rev,solist,down,up) \
+#   define LinkWithExports(libname,rev,solist,down,up) \
 	(cd down; $(CCENVSETUP) $(LD) -o up/$@~ $(SHLIBLDFLAGS) -h $@ solist $(REQUIREDLIBS))
+#  endif
 # endif
 #endif
 

cde/config/cf/svr4.cf

@@ -101,10 +101,10 @@ XCOMM $TOG: svr4.cf /main/17 1997/06/08 20:08:31 kaleb $
 #define DefaultCCOptions -Xa -Dasm=__asm
 #endif
 #endif
-#ifndef DefaultCDebugFlags
+#if !defined(DefaultCDebugFlags) && !defined(OptimizedCDebugFlags)
 #if HasGcc2
 #ifdef i386Architecture
-#define DefaultCDebugFlags -m486 DefaultGcc2i386Opt
+#define DefaultCDebugFlags -O2
 #else
 #define DefaultCDebugFlags -O2
 #endif

cde/config/imake/Imakefile

@@ -7,6 +7,7 @@ XCOMM not exist.  Since BUILDLIBDIR may not exist yet suppress its use.
 
 DEPLIBS = 
 
+DEPEND_DEFINES = $(DEPENDDEFINES)
 INCLUDES = -I$(TOP)/include $(TOP_X_INCLUDES)/X11
 CPP_PROGRAM = CppCmd
 CPP_DEFINES = -DCPP_PROGRAM="\"$(CPP_PROGRAM)\""

cde/config/imake/imake.c

@@ -1096,8 +1096,12 @@ get_sun_compiler_versions(FILE *inFile)
 {
   char buf[PATH_MAX];
   char cmd[PATH_MAX];
-  static char* sunpro_cc = "/opt/SUNWspro/bin/cc";
+  static char* sunpro_cc = "/opt/solarisstudio/bin/cc";
-  static char* sunpro_CC = "/opt/SUNWspro/bin/CC";
+  static char* sunpro_CC = "/opt/solarisstudio/bin/CC";
+  static char* gnu_cc1 = "/usr/bin/gcc";
+  static char* gnu_cc2 = "/usr/gnu/bin/gcc";
+  static char* gnu_CC1 = "/usr/bin/g++";
+  static char* gnu_CC2 = "/usr/gnu/bin/g++";
   int cmajor, cminor;
   char* vptr;
   struct stat sb;
@@ -1142,6 +1146,56 @@ get_sun_compiler_versions(FILE *inFile)
       pclose (ccproc);
     }
   }
+  cmd[0] = '\0';
+  if (lstat (gnu_cc1, &sb) == 0) {
+    strncpy (cmd, gnu_cc1, PATH_MAX);
+  }
+  else if (lstat (gnu_cc2, &sb) == 0) {
+    strncpy (cmd, gnu_cc2, PATH_MAX);
+  }
+  if (cmd[0] != '\0') {
+    strncat (cmd, " --version 2>&1", 15);
+    if ((ccproc = popen (cmd, "r")) != NULL) {
+      if (fgets (buf, PATH_MAX, ccproc) != NULL) {
+	vptr = strrchr (buf, 'G');
+	for (; !isdigit(*vptr); vptr++);
+	ret = sscanf (vptr, "%d.%d", &cmajor, &cminor);
+	fprintf (inFile,
+		 "#define DefaultGnuCCompilerMajorVersion %d\n",
+		 cmajor);
+	fprintf (inFile,
+		 "#define DefaultGnuCCompilerMinorVersion %d\n",
+		 cminor);
+      }
+      while (fgets (buf, PATH_MAX, ccproc) != NULL) {};
+      pclose (ccproc);
+    }
+  }
+  cmd[0] = '\0';
+  if (lstat (gnu_CC1, &sb) == 0) {
+    strncpy (cmd, gnu_CC1, PATH_MAX);
+  }
+  else if (lstat (gnu_CC2, &sb) == 0) {
+    strncpy (cmd, gnu_CC2, PATH_MAX);
+  }
+  if (cmd[0] != '\0') {
+    strncat (cmd, " --version 2>&1", 15);
+    if ((ccproc = popen (cmd, "r")) != NULL) {
+      if (fgets (buf, PATH_MAX, ccproc) != NULL) {
+	vptr = strrchr (buf, 'G');
+	for (; !isdigit(*vptr); vptr++);
+	ret = sscanf (vptr, "%d.%d", &cmajor, &cminor);
+	fprintf (inFile,
+		 "#define DefaultGnuCplusplusCompilerMajorVersion %d\n",
+		 cmajor);
+	fprintf (inFile,
+		 "#define DefaultGnuCplusplusCompilerMinorVersion %d\n",
+		 cminor);
+      }
+      while (fgets (buf, PATH_MAX, ccproc) != NULL) {};
+      pclose (ccproc);
+    }
+  }
   (void) ret;
 }
 #endif
@@ -1152,6 +1206,10 @@ get_gcc_incdir(FILE *inFile)
   static char* gcc_path[] = {
 #ifdef linux
     "/usr/bin/cc",	/* for Linux PostIncDir */
+#endif
+#ifdef sun
+    "/usr/bin/gcc",
+    "/usr/gnu/bin/gcc",
 #endif
     "/usr/local/bin/gcc",
     "/opt/gnu/bin/gcc"

cde/config/makedepend/Imakefile

@@ -1,4 +1,4 @@
-XCOMM $TOG: Imakefile /main/27 1997/04/30 15:38:09 kaleb $
+XCOMM $tog: Imakefile /main/27 1997/04/30 15:38:09 kaleb $
 
     SRCS = include.c main.c parse.c pr.c cppsetup.c ifparser.c 
     OBJS = include.o main.o parse.o pr.o cppsetup.o ifparser.o 
@@ -28,6 +28,7 @@ INC_DEFINES = $(PREINC_DEFINES) $(STDINC_DEFINES) $(POSTINC_DEFINES)
 OSUF = .Osuf
 OSUF_DEFINES = -DOBJSUFFIX=\"$(OSUF)\"
 MAIN_DEFINES = $(INC_DEFINES) $(SIGNAL_DEFINES) $(OSUF_DEFINES)
+DEPEND_DEFINES = $(DEPENDDEFINES)
 INCLUDES = -I$(IMAKESRC) -I$(TOP)/include $(TOP_X_INCLUDES)/X11
 
  DEPLIBS =

cde/config/makedepend/ifparser.c

@@ -81,7 +81,6 @@
 
 #include "ifparser.h"
 #include <ctype.h>
-#include <stdlib.h>
 #include <string.h>
 #include <limits.h>
 

cde/config/makedepend/ifparser.h

@@ -77,6 +77,7 @@
  *     ParseIfExpression		parse a string for #if
  */
 
+#include <stdlib.h>
 #include <stdio.h>
 
 #define const /**/

cde/config/makedepend/main.c

@@ -525,7 +525,8 @@ char *our_getline(filep)
 	lineno = filep->f_line;
 
 	for(bol = p--; ++p < eof; ) {
-		if (*p == '/' && *(p+1) == '*') { /* consume comments */
+		if (*p == '/' && (p+1) < eof && *(p+1) == '*') {
+			/* consume C comments */
 			*p++ = ' ', *p++ = ' ';
 			while (*p) {
 				if (*p == '*' && *(p+1) == '/') {
@@ -538,15 +539,31 @@ char *our_getline(filep)
 			}
 			continue;
 		}
-#ifdef WIN32
+		else if (*p == '/' && (p+1) < eof && *(p+1) == '/') {
-		else if (*p == '/' && *(p+1) == '/') { /* consume comments */
+			/* consume C++ comments */
-			*p++ = ' ', *p++ = ' ';
+			*p++ = ' ';
-			while (*p && *p != '\n')
+			*p++ = ' ';
-				*p++ = ' ';
+			while (p < eof && *p) {
-			lineno++;
+				if (*p == '\\' && (p+1) < eof &&
-			continue;
+				    *(p+1) == '\n') {
+					*(p++) = ' ';
+					lineno++;
+				}
+				else if (*p == '?' && (p+3) < eof &&
+					 *(p+1) == '?' &&
+					 *(p+2) == '/' &&
+					 *(p+3) == '\n') {
+					*(p++) = ' ';
+					*(p++) = ' ';
+					*(p++) = ' ';
+					lineno++;
+				}
+				else if (*p == '\n')
+					break;  /* to process end of line */
+				*(p++) = ' ';
+			}
+			--p;
 		}
-#endif
 		else if (*p == '\\') {
 			if (*(p+1) == '\n') {
 				*p = ' ';

cde/config/makedepend/pr.c

@@ -60,6 +60,7 @@ add_include(filep, file, file_red, include, dot, failOK)
 	struct inclist	*file, *file_red;
 	char	*include;
 	boolean	dot;
+	boolean	failOK;
 {
 	register struct inclist	*newfile;
 	register struct filepointer	*content;

cde/config/util/Imakefile

@@ -13,6 +13,8 @@ CMKDIRHIER = mkdirhier.exe
 
 PROGRAMS = xmkmf $(MDEP_PROG) mergelib ProgramTargetName(makestrs) $(EXPORTLISTGEN) $(CMKDIRHIER)
 DEPLIBS =
+DEPEND_DEFINES = $(DEPENDDEFINES)
+
 #ifndef Win32Architecture
   EXTRA_LIBRARIES =
 #endif

cde/config/util/makestrs.c

@@ -308,6 +308,7 @@ static void WriteHeader (tagline, phile, abi)
 static void WriteSourceLine (te, abi, fudge)
     TableEnt* te;
     int abi;
+    int fudge;
 {
     char* c;
 

cde/databases/CDE-FONTS.udb

@@ -629,9 +629,9 @@ programs/fontaliases/sun/C/fonts.dir
 	install_target = /usr/dt/config/xfonts/C/fonts.dir
 }
 #
-programs/fontaliases/sun/C/dtinfo.pcf
+programs/fontaliases/sun/C/dtinfo.pcf.Z
 { sun
-	install_target = /usr/dt/config/xfonts/C/dtinfo.pcf
+	install_target = /usr/dt/config/xfonts/C/dtinfo.pcf.Z
 }
 programs/fontaliases/sun/ja/fonts.alias
 #
@@ -644,9 +644,9 @@ programs/fontaliases/sun/ja/fonts.dir
 	install_target = /usr/dt/config/xfonts/ja/fonts.dir
 }
 #
-programs/fontaliases/sun/ja/dtinfo.pcf
+programs/fontaliases/sun/ja/dtinfo.pcf.Z
 { sun
-	install_target = /usr/dt/config/xfonts/C/dtinfo.pcf
+	install_target = /usr/dt/config/xfonts/C/dtinfo.pcf.Z
 }
 #
 #programs/fontaliases/sun/ko/fonts.dir

cde/databases/CDE-HELP-RUN.udb

@@ -409,79 +409,6 @@ programs/dtdocbook/doc2sdl/SGML/iso-tech.gml
 	install_target = /usr/dt/dthelp/dtdocbook/SGML/iso-tech.gml
 }
 #
-#>>---------------------------
-# XXXXX - TEMPORARY symlinks to SGML files
-# SGML files: dtdocbook
-# These should go away once Sun can compile nsgmls
-#----------------------------- 
-#
-#
-./dtinfo.af
-{ sun
-	install_target = /usr/dt/dthelp/dtdocbook/SGML/-%%Common_Desktop_Environment%%ENTITIES_DtInfo_Architectural_Forms%%EN
-	type = sym_link
-}
-#
-./docbook.dtd
-{ sun
-	install_target = /usr/dt/dthelp/dtdocbook/SGML/-%%HaL_and_O'Reilly%%DTD_DocBook%%EN
-	type = sym_link
-}
-#
-./iso-lat1.gml
-{ sun
-	install_target = /usr/dt/dthelp/dtdocbook/SGML/ISO_8879-1986%%ENTITIES_Added_Latin_1%%EN
-	type = sym_link
-}
-#
-./iso-lat2.gml
-{ sun
-	install_target = /usr/dt/dthelp/dtdocbook/SGML/ISO_8879-1986%%ENTITIES_Added_Latin_2%%EN
-	type = sym_link
-}
-#
-./iso-box.gml
-{ sun
-	install_target = /usr/dt/dthelp/dtdocbook/SGML/ISO_8879-1986%%ENTITIES_Box_and_Line_Drawing%%EN
-	type = sym_link
-}
-#
-./iso-dia.gml
-{ sun
-	install_target = /usr/dt/dthelp/dtdocbook/SGML/ISO_8879-1986%%ENTITIES_Diacritical_Marks%%EN
-	type = sym_link
-}
-#
-./iso-tech.gml
-{ sun
-	install_target = /usr/dt/dthelp/dtdocbook/SGML/ISO_8879-1986%%ENTITIES_General_Technical%%EN
-	type = sym_link
-}
-#
-./iso-grk1.gml
-{ sun
-	install_target = /usr/dt/dthelp/dtdocbook/SGML/ISO_8879-1986%%ENTITIES_Greek_Letters%%EN
-	type = sym_link
-}
-#
-./iso-grk3.gml
-{ sun
-	install_target = /usr/dt/dthelp/dtdocbook/SGML/ISO_8879-1986%%ENTITIES_Greek_Symbols%%EN
-	type = sym_link
-}
-#
-./iso-num.gml
-{ sun
-	install_target = /usr/dt/dthelp/dtdocbook/SGML/ISO_8879-1986%%ENTITIES_Numeric_and_Special_Graphic%%EN
-	type = sym_link
-}
-#
-./iso-pub.gml
-{ sun
-	install_target = /usr/dt/dthelp/dtdocbook/SGML/ISO_8879-1986%%ENTITIES_Publishing%%EN
-	type = sym_link
-}
-#
 #>>-------------------------
 #  pixmaps and helptag files
 #---------------------------

cde/databases/CDE-INFO.udb

@@ -322,318 +322,6 @@ programs/dtinfo/dtinfogen/infolib/C/SGML/styprolog.sgml
 }
 #
 #>>----------------------------- 
-# XXXXX - TEMPORARY symlinks to SGML files
-# These should go away once Sun can compile nsgmls
-#<<----------------------------- 
-#
-#
-/usr/dt/infolib/C/SGML/dtinfoBook.dtd
-{ sun
-	install_target = /usr/dt/infolib/C/SGML/-%%Common_Desktop_Environment%%DTD_DtInfo_Bookcase_Description%%EN
-	type = sym_link
-}
-#
-/usr/dt/infolib/C/SGML/dtinfoStyle.dtd
-{ sun
-	install_target = /usr/dt/infolib/C/SGML/-%%Common_Desktop_Environment%%DTD_DtInfo_Style_Sheet%%EN
-	type = sym_link
-}
-#
-/usr/dt/infolib/C/SGML/dtinfoTOC.dtd
-{ sun
-	install_target = /usr/dt/infolib/C/SGML/-%%Common_Desktop_Environment%%DTD_DtInfo_Table_of_Contents%%EN
-	type = sym_link
-}
-#
-/usr/dt/infolib/C/SGML/dtinfo.af
-{ sun
-	install_target = /usr/dt/infolib/C/SGML/-%%Common_Desktop_Environment%%ENTITIES_DtInfo_Architectural_Forms%%EN
-	type = sym_link
-}
-#
-/usr/dt/infolib/C/SGML/iso-catalog
-{ sun
-	install_target = /usr/dt/infolib/C/SGML/-%%Common_Desktop_Environment%%ENTITIES_ISO_Catalog%%EN
-	type = sym_link
-}
-#
-/usr/dt/infolib/C/SGML/proxy.ss
-{ sun
-	install_target = /usr/dt/infolib/C/SGML/-%%Common_Desktop_Environment%%ENTITIES_Dtinfo_SS_Localization%%EN
-	type = sym_link
-}
-#
-/usr/dt/infolib/C/SGML/docbook.dtd
-{ sun
-	install_target = /usr/dt/infolib/C/SGML/-%%HaL_and_O'Reilly%%DTD_DocBook%%EN
-	type = sym_link
-}
-#
-/usr/dt/infolib/C/SGML/iso-lat1.gml
-{ sun
-	install_target = /usr/dt/infolib/C/SGML/ISO_8879\:1986%%ENTITIES_Added_Latin_1%%EN
-	type = sym_link
-}
-#
-/usr/dt/infolib/C/SGML/iso-lat2.gml
-{ sun
-	install_target = /usr/dt/infolib/C/SGML/ISO_8879\:1986%%ENTITIES_Added_Latin_2%%EN
-	type = sym_link
-}
-#
-/usr/dt/infolib/C/SGML/iso-amsa.gml
-{ sun
-	install_target = /usr/dt/infolib/C/SGML/ISO_8879\:1986%%ENTITIES_Added_Math_Symbols\:_Arrow_Relations%%EN
-	type = sym_link
-}
-#
-/usr/dt/infolib/C/SGML/iso-amsb.gml
-{ sun
-	install_target = /usr/dt/infolib/C/SGML/ISO_8879\:1986%%ENTITIES_Added_Math_Symbols\:_Binary_Operators%%EN
-	type = sym_link
-}
-#
-/usr/dt/infolib/C/SGML/iso-amsc.gml
-{ sun
-	install_target = /usr/dt/infolib/C/SGML/ISO_8879\:1986%%ENTITIES_Added_Math_Symbols\:_Delimiters%%EN
-	type = sym_link
-}
-#
-/usr/dt/infolib/C/SGML/iso-amsn.gml
-{ sun
-	install_target = /usr/dt/infolib/C/SGML/ISO_8879\:1986%%ENTITIES_Added_Math_Symbols\:_Negated_Relations%%EN
-	type = sym_link
-}
-#
-/usr/dt/infolib/C/SGML/iso-amso.gml
-{ sun
-	install_target = /usr/dt/infolib/C/SGML/ISO_8879\:1986%%ENTITIES_Added_Math_Symbols\:_Ordinary%%EN
-	type = sym_link
-}
-#
-/usr/dt/infolib/C/SGML/iso-amsr.gml
-{ sun
-	install_target = /usr/dt/infolib/C/SGML/ISO_8879\:1986%%ENTITIES_Added_Math_Symbols\:_Relations%%EN
-	type = sym_link
-}
-#
-/usr/dt/infolib/C/SGML/iso-grk4.gml
-{ sun
-	install_target = /usr/dt/infolib/C/SGML/ISO_8879\:1986%%ENTITIES_Alternative_Greek_Symbols%%EN
-	type = sym_link
-}
-#
-/usr/dt/infolib/C/SGML/iso-box.gml
-{ sun
-	install_target = /usr/dt/infolib/C/SGML/ISO_8879\:1986%%ENTITIES_Box_and_Line_Drawing%%EN
-	type = sym_link
-}
-#
-/usr/dt/infolib/C/SGML/iso-dia.gml
-{ sun
-	install_target = /usr/dt/infolib/C/SGML/ISO_8879\:1986%%ENTITIES_Diacritical_Marks%%EN
-	type = sym_link
-}
-#
-/usr/dt/infolib/C/SGML/iso-tech.gml
-{ sun
-	install_target = /usr/dt/infolib/C/SGML/ISO_8879\:1986%%ENTITIES_General_Technical%%EN
-	type = sym_link
-}
-#
-/usr/dt/infolib/C/SGML/iso-grk1.gml
-{ sun
-	install_target = /usr/dt/infolib/C/SGML/ISO_8879\:1986%%ENTITIES_Greek_Letters%%EN
-	type = sym_link
-}
-#
-/usr/dt/infolib/C/SGML/iso-grk3.gml
-{ sun
-	install_target = /usr/dt/infolib/C/SGML/ISO_8879\:1986%%ENTITIES_Greek_Symbols%%EN
-	type = sym_link
-}
-#
-/usr/dt/infolib/C/SGML/iso-grk2.gml
-{ sun
-	install_target = /usr/dt/infolib/C/SGML/ISO_8879\:1986%%ENTITIES_Monotoniko_Greek%%EN
-	type = sym_link
-}
-#
-/usr/dt/infolib/C/SGML/iso-cyr2.gml
-{ sun
-	install_target = /usr/dt/infolib/C/SGML/ISO_8879\:1986%%ENTITIES_Non-Russian_Cyrillic%%EN
-	type = sym_link
-}
-#
-/usr/dt/infolib/C/SGML/iso-num.gml
-{ sun
-	install_target = /usr/dt/infolib/C/SGML/ISO_8879\:1986%%ENTITIES_Numeric_and_Special_Graphic%%EN
-	type = sym_link
-}
-#
-/usr/dt/infolib/C/SGML/iso-pub.gml
-{ sun
-	install_target = /usr/dt/infolib/C/SGML/ISO_8879\:1986%%ENTITIES_Publishing%%EN
-	type = sym_link
-}
-#
-/usr/dt/infolib/C/SGML/iso-cyr1.gml
-{ sun
-	install_target = /usr/dt/infolib/C/SGML/ISO_8879\:1986%%ENTITIES_Russian_Cyrillic%%EN
-	type = sym_link
-}
-#
-/usr/dt/infolib/C/SGML/iso-mfrk.gml
-{ sun
-	install_target = /usr/dt/infolib/C/SGML/ISO_9573-13\:1991%%ENTITIES_Math_Alphabets\:_Fraktur_%%EN
-	type = sym_link
-}
-#
-/usr/dt/infolib/C/SGML/iso-mopf.gml
-{ sun
-	install_target = /usr/dt/infolib/C/SGML/ISO_9573-13\:1991%%ENTITIES_Math_Alphabets\:_Open_Face_%%EN
-	type = sym_link
-}
-#
-/usr/dt/infolib/C/SGML/iso-mscr.gml
-{ sun
-	install_target = /usr/dt/infolib/C/SGML/ISO_9573-13\:1991%%ENTITIES_Math_Alphabets\:_Script_%%EN
-	type = sym_link
-}
-#
-/usr/dt/infolib/C/SGML/iso-lat1.gml
-{ sun
-	install_target = /usr/dt/infolib/C/SGML/ISO_8879-1986%%ENTITIES_Added_Latin_1%%EN
-	type = sym_link
-}
-#
-/usr/dt/infolib/C/SGML/iso-lat2.gml
-{ sun
-	install_target = /usr/dt/infolib/C/SGML/ISO_8879-1986%%ENTITIES_Added_Latin_2%%EN
-	type = sym_link
-}
-#
-/usr/dt/infolib/C/SGML/iso-amsa.gml
-{ sun
-	install_target = /usr/dt/infolib/C/SGML/ISO_8879-1986%%ENTITIES_Added_Math_Symbols\:_Arrow_Relations%%EN
-	type = sym_link
-}
-#
-/usr/dt/infolib/C/SGML/iso-amsb.gml
-{ sun
-	install_target = /usr/dt/infolib/C/SGML/ISO_8879-1986%%ENTITIES_Added_Math_Symbols\:_Binary_Operators%%EN
-	type = sym_link
-}
-#
-/usr/dt/infolib/C/SGML/iso-amsc.gml
-{ sun
-	install_target = /usr/dt/infolib/C/SGML/ISO_8879-1986%%ENTITIES_Added_Math_Symbols\:_Delimiters%%EN
-	type = sym_link
-}
-#
-/usr/dt/infolib/C/SGML/iso-amsn.gml
-{ sun
-	install_target = /usr/dt/infolib/C/SGML/ISO_8879-1986%%ENTITIES_Added_Math_Symbols\:_Negated_Relations%%EN
-	type = sym_link
-}
-#
-/usr/dt/infolib/C/SGML/iso-amso.gml
-{ sun
-	install_target = /usr/dt/infolib/C/SGML/ISO_8879-1986%%ENTITIES_Added_Math_Symbols\:_Ordinary%%EN
-	type = sym_link
-}
-#
-/usr/dt/infolib/C/SGML/iso-amsr.gml
-{ sun
-	install_target = /usr/dt/infolib/C/SGML/ISO_8879-1986%%ENTITIES_Added_Math_Symbols\:_Relations%%EN
-	type = sym_link
-}
-#
-/usr/dt/infolib/C/SGML/iso-grk4.gml
-{ sun
-	install_target = /usr/dt/infolib/C/SGML/ISO_8879-1986%%ENTITIES_Alternative_Greek_Symbols%%EN
-	type = sym_link
-}
-#
-/usr/dt/infolib/C/SGML/iso-box.gml
-{ sun
-	install_target = /usr/dt/infolib/C/SGML/ISO_8879-1986%%ENTITIES_Box_and_Line_Drawing%%EN
-	type = sym_link
-}
-#
-/usr/dt/infolib/C/SGML/iso-dia.gml
-{ sun
-	install_target = /usr/dt/infolib/C/SGML/ISO_8879-1986%%ENTITIES_Diacritical_Marks%%EN
-	type = sym_link
-}
-#
-/usr/dt/infolib/C/SGML/iso-tech.gml
-{ sun
-	install_target = /usr/dt/infolib/C/SGML/ISO_8879-1986%%ENTITIES_General_Technical%%EN
-	type = sym_link
-}
-#
-/usr/dt/infolib/C/SGML/iso-grk1.gml
-{ sun
-	install_target = /usr/dt/infolib/C/SGML/ISO_8879-1986%%ENTITIES_Greek_Letters%%EN
-	type = sym_link
-}
-#
-/usr/dt/infolib/C/SGML/iso-grk3.gml
-{ sun
-	install_target = /usr/dt/infolib/C/SGML/ISO_8879-1986%%ENTITIES_Greek_Symbols%%EN
-	type = sym_link
-}
-#
-/usr/dt/infolib/C/SGML/iso-grk2.gml
-{ sun
-	install_target = /usr/dt/infolib/C/SGML/ISO_8879-1986%%ENTITIES_Monotoniko_Greek%%EN
-	type = sym_link
-}
-#
-/usr/dt/infolib/C/SGML/iso-cyr2.gml
-{ sun
-	install_target = /usr/dt/infolib/C/SGML/ISO_8879-1986%%ENTITIES_Non-Russian_Cyrillic%%EN
-	type = sym_link
-}
-#
-/usr/dt/infolib/C/SGML/iso-num.gml
-{ sun
-	install_target = /usr/dt/infolib/C/SGML/ISO_8879-1986%%ENTITIES_Numeric_and_Special_Graphic%%EN
-	type = sym_link
-}
-#
-/usr/dt/infolib/C/SGML/iso-pub.gml
-{ sun
-	install_target = /usr/dt/infolib/C/SGML/ISO_8879-1986%%ENTITIES_Publishing%%EN
-	type = sym_link
-}
-#
-/usr/dt/infolib/C/SGML/iso-cyr1.gml
-{ sun
-	install_target = /usr/dt/infolib/C/SGML/ISO_8879-1986%%ENTITIES_Russian_Cyrillic%%EN
-	type = sym_link
-}
-#
-/usr/dt/infolib/C/SGML/iso-mfrk.gml
-{ sun
-	install_target = /usr/dt/infolib/C/SGML/ISO_9573-13-1991%%ENTITIES_Math_Alphabets\:_Fraktur_%%EN
-	type = sym_link
-}
-#
-/usr/dt/infolib/C/SGML/iso-mopf.gml
-{ sun
-	install_target = /usr/dt/infolib/C/SGML/ISO_9573-13-1991%%ENTITIES_Math_Alphabets\:_Open_Face_%%EN
-	type = sym_link
-}
-#
-/usr/dt/infolib/C/SGML/iso-mscr.gml
-{ sun
-	install_target = /usr/dt/infolib/C/SGML/ISO_9573-13-1991%%ENTITIES_Math_Alphabets\:_Script_%%EN
-	type = sym_link
-}
-#
-#>>----------------------------- 
 # dtinfo spec files
 #<<----------------------------- 
 #

cde/databases/CDE-RUN.udb

@@ -1071,6 +1071,12 @@ programs/backdrops/Sprinkles.pm
 	install_target = /usr/dt/share/backdrops/Sprinkles.pm
 }
 #
+#
+programs/backdrops/SunLogo.pm
+{ sun
+	install_target = /usr/dt/share/backdrops/SunLogo.pm
+}
+#
 programs/backdrops/Toronto.bm
 { default
 	install_target = /usr/dt/share/backdrops/Toronto.bm
@@ -1936,14 +1942,6 @@ programs/nsgmls/nsgmls
         mode = 0555
 }
 #
-# XXXXX - TEMPORARY until Sun can compile nsgmls
-#
-programs/dtdocbook/sgmls/sgmls
-{ sun
-        install_target = /usr/dt/infolib/etc/sgmls
-        mode = 0555
-}
-#
 #>>----------------------------- 
 # 
 # MMDB

cde/databases/CDE-SHLIBS.src

@@ -199,101 +199,6 @@ XCOMM  Sun libraries
 XCOMM <<-----------------------------
 XCOMM 
 
--
-{ sun
-	type = directory
-	install_target = /usr/dt/lib/security
-	mode = 0555
-	status = ------
-}
-XCOMM 
-lib/pam/libpam/libpam.so.2.1
-{ sun
-        install_target = /usr/dt/lib/libpam.so.2.1
-	mode = 0755
-	owner = root
-}
-XCOMM
-./libpam.so.2.1
-{ sun
-        install_target = /usr/dt/lib/libpam.so.1
-	type = sym_link
-}
-XCOMM 
-lib/pam/pam_modules/dial_auth/libpam_dial_auth.so.2.1
-{ sun
-        install_target = /usr/dt/lib/security/pam_dial_auth.so.2.1
-	mode = 0555
-	owner = root
-}
-XCOMM 
-./pam_dial_auth.so.2.1
-{ sun
-        install_target = /usr/dt/lib/security/pam_dial_auth.so.1
-	type = sym_link
-}
-XCOMM 
-lib/pam/pam_modules/rhosts_auth/libpam_rhosts_auth.so.2.1
-{ sun
-        install_target = /usr/dt/lib/security/pam_rhosts_auth.so.2.1
-	mode = 0555
-	owner = root
-}
-XCOMM 
-./pam_rhosts_auth.so.2.1
-{ sun
-        install_target = /usr/dt/lib/security/pam_rhosts_auth.so.1
-	type = sym_link
-}
-XCOMM 
-lib/pam/pam_modules/unix/libpam_unix.so.2.1
-{ sun
-        install_target = /usr/dt/lib/security/pam_unix.so.2.1
-	mode = 0555
-	owner = root
-}
-XCOMM 
-./pam_unix.so.2.1
-{ sun
-        install_target = /usr/dt/lib/security/pam_unix.so.1
-	type = sym_link
-}
-XCOMM 
-./libXm.so.2.1
-{ sun
-	install_target = /usr/dt/lib/libXm.so.1.2
-	type = sym_link
-}
-XCOMM 
-./libXm.so.2.1
-{ sun
-	install_target = /usr/dt/lib/libXm.so.3
-	type = sym_link
-}
-XCOMM 
-./libMrm.so.2.1
-{ sun
-        install_target = /usr/dt/lib/libMrm.so.1.2
-        type = sym_link
-}
-XCOMM 
-./libMrm.so.2.1
-{ sun
-        install_target = /usr/dt/lib/libMrm.so.3
-        type = sym_link
-}
-XCOMM 
-./libUil.so.2.1
-{ sun
-        install_target = /usr/dt/lib/libUil.so.1.2
-        type = sym_link
-}
-XCOMM 
-./libUil.so.2.1
-{ sun
-        install_target = /usr/dt/lib/libUil.so.3
-        type = sym_link
-}
 XCOMM 
 lib/DtHelp/libDtHelp.so.2.1
 { sun

cde/lib/DtHelp/Imakefile

@@ -13,7 +13,8 @@ XCOMM $XConsortium: Imakefile /main/25 1996/11/22 11:17:34 drk $
 #define IHaveSubdirs
 #define PassCDebugFlags	/**/
 
-#if defined(LinuxArchitecture) || defined(BSDArchitecture)
+#if defined(LinuxArchitecture) || defined(BSDArchitecture) || \
+    defined(SunArchitecture)
 SUBDIRS = il
 DONES = il/DONE
 #else
@@ -34,7 +35,7 @@ BIT_ORDER_DEFINES = -DLSB_BIT_ORDER
 #endif
 
 INCLUDES = -I. -I./il -I./jpeg
-
+DEPEND_DEFINES = $(DEPENDDEFINES)
 DEFINES = -DDTLIB $(LOCAL_DEFINES) \
 	  -DCDE_INSTALLATION_TOP='"$(CDE_INSTALLATION_TOP)"' \
 	  -DCDE_CONFIGURATION_TOP='"$(CDE_CONFIGURATION_TOP)"' \
@@ -153,7 +154,8 @@ JPEG_OBJS = \
         jpeg/jdinput.o      jpeg/jerror.o       jpeg/jutils.o
 
 SRCS = $(SRCS1) $(SRCS2) $(CVSRCS) $(LCXSRCS)
-#if defined(LinuxArchitecture) || defined(BSDArchitecture)
+#if defined(LinuxArchitecture) || defined(BSDArchitecture) || \
+    defined(SunArchitecture)
 OBJS = $(OBJS1) $(OBJS2) $(CVOBJS) $(LCXOBJS) $(IL_OBJS)
 #else
 OBJS = $(OBJS1) $(OBJS2) $(CVOBJS) $(LCXOBJS) $(IL_OBJS) $(JPEG_OBJS)

cde/lib/DtHelp/SunOS.lcx

@@ -191,6 +191,13 @@
 ! So the pattern string must be 23, not 32.  Do not go by
 ! the order of 'uname -rv' or 'uname -vr', as that is not used.
 !!!
+SunOS.?.version.<.5120:  "5\\.12.*"
+SunOS.?.version.<.5110:  "5\\.11.*"
+SunOS.?.version.<.5100:  "5\\.10.*"
+SunOS.?.version.<.590:   "5\\.9.*"
+SunOS.?.version.<.580:   "5\\.8.*"
+SunOS.?.version.<.570:   "5\\.7.*"
+SunOS.?.version.<.560:   "5\\.6.*"
 SunOS.?.version.<.550:   "5\\.5.*"
 SunOS.?.version.<.540:   "5\\.4.*"
 SunOS.?.version.<.530:   "5\\.3.*"

cde/lib/DtHelp/il/Imakefile

@@ -16,6 +16,7 @@ BIT_ORDER_DEFINES = -DLSB_BIT_ORDER
 #endif
 
 INCLUDES = -I. -I..
+DEPEND_DEFINES = $(DEPENDDEFINES)
 DEFINES = -DDTLIB $(LOCAL_DEFINES) \
 	  -DCDE_INSTALLATION_TOP='"$(CDE_INSTALLATION_TOP)"' \
 	  -DCDE_CONFIGURATION_TOP='"$(CDE_CONFIGURATION_TOP)"' \

cde/lib/DtMrm/Imakefile

@@ -14,6 +14,7 @@ XCOMM $XConsortium: Imakefile /main/2 1996/04/21 19:14:49 drk $
 REQUIREDLIBS = SharedDtMrmReqs
 #endif
 
+DEPEND_DEFINES = $(DEPENDDEFINES)
 INCLUDES = -I. -I$(DTHELPSRC) -I$(DTTERMSRC)/Term -I$(DTTERMSRC)/TermPrim
 
 

cde/lib/DtPrint/Imakefile

@@ -10,6 +10,7 @@ XCOMM $XConsortium: Imakefile /main/11 1996/10/31 02:09:04 cde-hp $
 #ifndef DtPrintDefines
 # define DtPrintDefines		-DMULTIBYTE -DI18N_MSG
 #endif
+DEPEND_DEFINES = $(DEPENDDEFINES)
 DEFINES = DtPrintDefines
 INCLUDES = -I.
 

cde/lib/DtSearch/Imakefile

@@ -17,6 +17,10 @@ EXTRA_DEFINES = -DBYTE_SWAP
 EXTRA_DEFINES = -DBYTE_SWAP
 #endif
 
+#if defined(SunArchitecture)
+EXTRA_DEFINES = -DBYTE_SWAP
+#endif
+
 MakeSubdirs($(SUBDIRS))
 ForceSubdirs($(SUBDIRS))
 DependSubdirs($(SUBDIRS))

cde/lib/DtSearch/raima/Imakefile

@@ -27,6 +27,10 @@ EXTRA_DEFINES = -D_XOPEN_SOURCE
 EXTRA_DEFINES = -DBYTE_SWAP -D_XOPEN_SOURCE=700
 #endif
 
+#if defined(SunArchitecture)
+EXTRA_DEFINES = -DBYTE_SWAP -D_XOPEN_SOURCE=700
+#endif
+
 #define DoNormalLib	NormalLibDtSearch
 #define DoSharedLib	SharedLibDtSearch
 #define DoDebugLib	DebugLibDtSearch

cde/lib/DtSearch/raima/vista.h

@@ -86,7 +86,7 @@
 # define __SVR4_I386_ABI_L1__
 #endif
 #include <limits.h>	/* pickup WORD_BIT, LONG_BIT */
-#if defined(linux) || defined(CSRG_BASED)
+#if defined(linux) || defined(CSRG_BASED) || defined(sun)
 # undef __SVR4_I386_ABI_L1__
 # ifndef WORD_BIT
 # define WORD_BIT 32

cde/lib/DtSvc/DtEncap/Imakefile

@@ -21,6 +21,7 @@ XCOMM (c) Copyright 1996 Hitachi.
 #ifndef DtSvcDefines
 # define DtSvcDefines	-DMULTIBYTE
 #endif
+DEPEND_DEFINES = $(DEPENDDEFINES)
 DEFINES = DtSvcDefines \
           -DCDE_CONFIGURATION_TOP=\"$(CDE_CONFIGURATION_TOP)\" \
           -DCDE_INSTALLATION_TOP=\"$(CDE_INSTALLATION_TOP)\" \

cde/lib/DtSvc/DtUtil1/Imakefile

@@ -14,6 +14,7 @@ XCOMM $XConsortium: Imakefile /main/6 1996/08/20 14:48:27 drk $
 #ifndef DtSvcDefines
 # define DtSvcDefines -DMULTIBYTE
 #endif
+DEPEND_DEFINES = $(DEPENDDEFINES)
 DEFINES = DtSvcDefines \
           -DCDE_INSTALLATION_TOP=\"$(CDE_INSTALLATION_TOP)\" \
           -DCDE_CONFIGURATION_TOP=\"$(CDE_CONFIGURATION_TOP)\"

cde/lib/DtSvc/DtUtil2/Imakefile

@@ -13,6 +13,7 @@ XCOMM $TOG: Imakefile /main/14 1998/04/22 14:18:31 mgreess $
 #ifndef DtSvcDefines
 # define DtSvcDefines	-DMULTIBYTE
 #endif
+DEPEND_DEFINES = $(DEPENDDEFINES)
 DEFINES = DtSvcDefines \
           -DCDE_INSTALLATION_TOP=\"$(CDE_INSTALLATION_TOP)\" \
           -DCDE_CONFIGURATION_TOP=\"$(CDE_CONFIGURATION_TOP)\"

cde/lib/DtSvc/Imakefile

@@ -30,8 +30,10 @@ INCLUDES = -I.
 
 #ifdef SharedDtSvcReqs
 #ifdef SunArchitecture
-REQUIREDLIBS = SharedDtSvcReqs -lC -lCrun
+REQUIREDLIBS = SharedDtSvcReqs
+#ifndef HasGcc2
 SHLIBLDFLAGS = -G
+#endif
 #else
 REQUIREDLIBS = SharedDtSvcReqs
 #endif

cde/lib/DtSvc/include/codelibs/dynarray.h

@@ -36,7 +36,7 @@
 #ifndef __DYNARRAY_H_
 #define __DYNARRAY_H_
 
-#if !defined(linux) && !defined(CSRG_BASED)
+#if !defined(linux) && !defined(CSRG_BASED) && !defined(sun)
 #include <generic.h>
 #endif
 #if defined(USL) || defined(__uxp__) || defined(__osf__) || defined(sun) || defined(linux) || defined(CSRG_BASED)

cde/lib/DtTerm/Term/Imakefile

@@ -10,6 +10,7 @@ XCOMM $XConsortium: Imakefile /main/1 1996/04/21 19:15:07 drk $
 
 #include <Threads.tmpl>
 
+DEPEND_DEFINES = $(DEPENDDEFINES)
 DEFINES =
 INCLUDES = -I. -I../TermPrim
 

cde/lib/DtTerm/TermPrim/Imakefile

@@ -10,6 +10,7 @@ XCOMM   $TOG: Imakefile /main/3 1998/03/16 14:41:32 mgreess $
 
 #include <Threads.tmpl>
 
+DEPEND_DEFINES = $(DEPENDDEFINES)
 DEFINES = $(ARCHITECTURE_DEFINES)
 
 INCLUDES = -I.

cde/lib/DtTerm/TermPrim/TermPrimDebug.c

@@ -39,7 +39,7 @@ static char rcs_id[] = "$XConsortium: TermPrimDebug.c /main/4 1996/11/21 19:58:1
 #include <stdio.h>
 #include <unistd.h>
 #include <stdlib.h>
-#if defined(linux) || defined(CSRG_BASED)
+#if defined(linux) || defined(CSRG_BASED) || defined(sun)
 # include <stdarg.h>
 #else
 # include <varargs.h>

cde/lib/DtTerm/TermView/Imakefile

@@ -10,6 +10,7 @@ XCOMM $XConsortium: Imakefile /main/1 1996/04/21 19:20:11 drk $
 
 #include <Threads.tmpl>
 
+DEPEND_DEFINES = $(DEPENDDEFINES)
 INCLUDES = -I. -I../TermPrim -I../Term
 
 SRCS = \

cde/lib/DtWidget/Imakefile

@@ -12,6 +12,7 @@ XCOMM $XConsortium: Imakefile /main/8 1996/04/21 19:11:16 drk $
 #ifndef DtWidgetDefines
 # define DtWidgetDefines	-DI18N_MSG -DMULTIBYTE
 #endif
+DEPEND_DEFINES = $(DEPENDDEFINES)
 DEFINES = DtWidgetDefines
 #if defined(LinuxArchitecture)
 INCLUDES = -I. -I/usr/include/freetype2

cde/lib/csa/Imakefile

@@ -24,9 +24,11 @@ REQUIREDLIBS = SharedCsaReqs
 #endif
 
 #ifdef SunArchitecture
-  EXTRA_DEFINES = -xstrconst -v -DSunOS=$(OSMAJORVERSION)$(OSMINORVERSION)
+  EXTRA_DEFINES = -v -DSunOS=$(OSMAJORVERSION)$(OSMINORVERSION)
+#ifndef HasGcc2
   SHLIBLDFLAGS = -G -z text -z defs
 #endif
+#endif
 
 #ifdef HPArchitecture
   EXTRA_DEFINES = -DHPUX

cde/lib/tt/bin/dbck/Imakefile

@@ -1,7 +1,7 @@
 XCOMM $XConsortium: Imakefile /main/14 1996/05/08 09:27:35 drk $
 
 #define CplusplusSource	YES
-DEPEND_DEFINES = $(CXXDEPENDINCLUDES)
+DEPEND_DEFINES = $(CXXDEPENDINCLUDES) $(DEPENDDEFINES)
 EXTRA_LOAD_FLAGS = ExtraLoadFlags $(UNSHARED_CXXLIB)
 
 #include <Threads.tmpl>

cde/lib/tt/bin/tt_type_comp/Imakefile

@@ -1,7 +1,7 @@
 XCOMM $XConsortium: Imakefile /main/14 1996/05/08 09:28:02 drk $
 
 #define CplusplusSource	YES
-DEPEND_DEFINES = $(CXXDEPENDINCLUDES)
+DEPEND_DEFINES = $(CXXDEPENDINCLUDES) $(DEPENDDEFINES)
 EXTRA_LOAD_FLAGS = ExtraLoadFlags $(UNSHARED_CXXLIB)
 
 #include <Threads.tmpl>

cde/lib/tt/bin/ttdbserverd/Imakefile

@@ -1,7 +1,7 @@
 XCOMM $XConsortium: Imakefile /main/15 1996/09/30 13:50:43 drk $
 
 #define CplusplusSource	YES
-DEPEND_DEFINES = $(CXXDEPENDINCLUDES)
+DEPEND_DEFINES = $(CXXDEPENDINCLUDES) $(DEPENDDEFINES)
 EXTRA_LOAD_FLAGS = ExtraLoadFlags $(UNSHARED_CXXLIB)
 
 #include <Threads.tmpl>

cde/lib/tt/bin/ttdbserverd/db_server_svc.C

@@ -214,10 +214,10 @@ main(int argc, char** argv, char **envp)
 	void install_signal_handler();
 	SVCXPRT *transp;
  	struct sockaddr_in saddr;
-#if defined(DEC) || defined(sun) || defined(HPUX)
+#if defined(DEC) || defined(HPUX)
  	int asize = sizeof(struct sockaddr);
 #else
-# if defined(linux) || defined(CSRG_BASED)
+# if defined(linux) || defined(CSRG_BASED) || defined(sun)
  	socklen_t asize;
 # else
  	size_t asize = sizeof(struct sockaddr);

cde/lib/tt/bin/ttsession/Imakefile

@@ -1,7 +1,7 @@
 XCOMM $XConsortium: Imakefile /main/15 1996/10/09 14:02:13 drk $
 
 #define CplusplusSource	YES
-DEPEND_DEFINES = $(CXXDEPENDINCLUDES)
+DEPEND_DEFINES = $(CXXDEPENDINCLUDES) $(DEPENDDEFINES)
 EXTRA_LOAD_FLAGS = ExtraLoadFlags $(UNSHARED_CXXLIB)
 
 #include <Threads.tmpl>

cde/lib/tt/bin/tttar/Imakefile

@@ -1,7 +1,7 @@
 XCOMM $XConsortium: Imakefile /main/11 1996/05/08 09:28:48 drk $
 
 #define CplusplusSource	YES
-DEPEND_DEFINES = $(CXXDEPENDINCLUDES)
+DEPEND_DEFINES = $(CXXDEPENDINCLUDES) $(DEPENDDEFINES)
 EXTRA_LOAD_FLAGS = ExtraLoadFlags $(UNSHARED_CXXLIB)
 
 #include <Threads.tmpl>

cde/lib/tt/bin/tttrace/Imakefile

@@ -1,7 +1,7 @@
 XCOMM $XConsortium: Imakefile /main/14 1996/10/09 14:02:22 drk $
 
 #define CplusplusSource	YES
-DEPEND_DEFINES = $(CXXDEPENDINCLUDES)
+DEPEND_DEFINES = $(CXXDEPENDINCLUDES) $(DEPENDDEFINES)
 EXTRA_LOAD_FLAGS = ExtraLoadFlags $(UNSHARED_CXXLIB)
 
 #include <Threads.tmpl>

cde/lib/tt/lib/Imakefile

@@ -45,8 +45,10 @@ INCLUDES = -I.
 
 #ifdef SharedTtReqs
 #ifdef SunArchitecture
-REQUIREDLIBS = SharedTtReqs -lC -lCrun
+REQUIREDLIBS = SharedTtReqs
+#ifndef HasGcc2
 SHLIBLDFLAGS = -G
+#endif
 #else
 REQUIREDLIBS = SharedTtReqs
 #endif

cde/lib/tt/lib/api/c/Imakefile

@@ -12,7 +12,7 @@ XCOMM $TOG: Imakefile /main/9 1999/08/30 10:50:55 mgreess $
 #endif
 
 #define CplusplusSource	YES
-DEPEND_DEFINES = $(CXXDEPENDINCLUDES)
+DEPEND_DEFINES = $(CXXDEPENDINCLUDES) $(DEPENDDEFINES)
 
 #include <Threads.tmpl>
 

cde/lib/tt/lib/db/Imakefile

@@ -9,7 +9,7 @@ XCOMM $XConsortium: Imakefile /main/7 1996/04/21 19:12:19 drk $
 #define LibCreate	NO
 
 #define CplusplusSource	YES
-DEPEND_DEFINES = $(CXXDEPENDINCLUDES) $(ISAM_INCLUDES)
+DEPEND_DEFINES = $(CXXDEPENDINCLUDES) $(ISAM_INCLUDES) $(DEPENDDEFINES)
 
 #include <Threads.tmpl>
 

cde/lib/tt/lib/mp/Imakefile

@@ -9,7 +9,7 @@ XCOMM $TOG: Imakefile /main/8 1999/08/30 10:52:07 mgreess $
 #define LibCreate	NO
 
 #define CplusplusSource	YES
-DEPEND_DEFINES = $(CXXDEPENDINCLUDES) $(ISAM_INCLUDES)
+DEPEND_DEFINES = $(CXXDEPENDINCLUDES) $(ISAM_INCLUDES) $(DEPENDDEFINES)
 
 #include <Threads.tmpl>
 

cde/lib/tt/lib/tt_options.h

@@ -296,13 +296,8 @@
 
 # undef  OPT_UNIX_SOCKET_RPC 
 # define OPT_TLI 
-# if defined(PROF) /* can't use dlopen if profiling. */
+# undef  OPT_DLOPEN_X11
-#  undef  OPT_DLOPEN_X11 
+# undef  OPT_DLOPEN_CE
-#  undef  OPT_DLOPEN_CE 
-# else
-#  define OPT_DLOPEN_X11 
-#  define OPT_DLOPEN_CE 
-# endif
 # undef  OPT_ADDMSG_DIRECT 
 # define OPT_SECURE_RPC 
 # undef  OPT_CLASSING_ENGINE
@@ -322,8 +317,6 @@
 # undef  OPT_DEFINE_SIG_PF
 # define OPT_TAR_HAS_EXCLUDE_OPTION
 
-# define OPT_BUG_SUNOS_5
-
 # define OPT_HAS_REALPATH
 # undef  OPT_AUTOMOUNT_PATH_FIX
 

cde/lib/tt/lib/tttk/Imakefile

@@ -12,7 +12,7 @@ XCOMM $XConsortium: Imakefile /main/6 1996/05/07 19:13:02 drk $
 #endif
 
 #define CplusplusSource	YES
-DEPEND_DEFINES = $(CXXDEPENDINCLUDES)
+DEPEND_DEFINES = $(CXXDEPENDINCLUDES) $(DEPENDDEFINES)
 
 #include <Threads.tmpl>
 

cde/lib/tt/lib/util/Imakefile

@@ -9,7 +9,7 @@ XCOMM $XConsortium: Imakefile /main/9 1996/08/29 16:11:24 barstow $
 #define LibCreate	NO
 
 #define CplusplusSource	YES
-DEPEND_DEFINES = $(CXXDEPENDINCLUDES)
+DEPEND_DEFINES = $(CXXDEPENDINCLUDES) $(DEPENDDEFINES)
 
 #include <Threads.tmpl>
 

cde/lib/tt/lib/util/tt_Xlib.C

@@ -229,6 +229,11 @@ load_xt_fns_from_handle(void *xt_handle)
 	if ( _tt_xt . fn  == (_Tt_xfn_ptr)0) {				\
 		return(0);						\
 	}								
+#define	DLINK_FNV(fn)\
+	_tt_xt . fn = (void*)(_Tt_xfn_ptr)dlsym(xt_handle, #fn);	\
+	if ( _tt_xt . fn  == (_Tt_xfn_ptr)0) {				\
+		return(0);						\
+	}
 #else /* __STDC__ */
 #define	DLINK_FN(fn)\
 	_tt_xt . fn = (_Tt_xfn_ptr)dlsym(xt_handle, "fn");		\
@@ -250,7 +255,7 @@ load_xt_fns_from_handle(void *xt_handle)
 	DLINK_FN(XtAppAddTimeOut)
 	DLINK_FN(XtRemoveTimeOut)
 	DLINK_FN(XtAppProcessEvent)
-	DLINK_FN(applicationShellWidgetClass)
+	DLINK_FNV(applicationShellWidgetClass)
 	return(1);
 }
 

cde/lib/tt/lib/util/tt_string.C

@@ -54,7 +54,7 @@
 #endif
 #include <stdlib.h>
 #include <ctype.h>
-#if defined(linux) || defined(CSRG_BASED)
+#if defined(linux) || defined(CSRG_BASED) || defined(sun)
 #include <wctype.h>
 #endif
 #include "util/tt_string.h"

cde/lib/tt/mini_isam/Imakefile

@@ -11,6 +11,7 @@ XCOMM $XConsortium: Imakefile /main/4 1996/04/21 19:12:37 drk $
 
 #include "../tooltalk.tmpl"
 
+DEPEND_DEFINES = $(DEPENDDEFINES)
 INCLUDES = -I.
 
 SRCS = isaddindex.c isamaddindex.c isopen.c isamopen.c \

cde/lib/tt/mini_isam/iscntl.c

@@ -39,7 +39,7 @@ static char sccsid[] = "@(#)iscntl.c	1.8 94/11/17";
  *	Generic control function
  */
 
-#if defined(linux) || defined(CSRG_BASED)
+#if defined(linux) || defined(CSRG_BASED) || defined(sun)
 #include <stdarg.h>
 #else
 #include <varargs.h>
@@ -79,7 +79,7 @@ static char sccsid[] = "@(#)iscntl.c	1.8 94/11/17";
 
 typedef int (* intfunc)();
 
-#if defined(linux) || defined(CSRG_BASED)
+#if defined(linux) || defined(CSRG_BASED) || defined(sun)
 int 
 iscntl(int isfd, int func, ...)
 #else
@@ -94,7 +94,7 @@ iscntl(isfd, func, va_alist)
     va_list		pvar;
     int			ret;
 
-#if defined(linux) || defined(CSRG_BASED)
+#if defined(linux) || defined(CSRG_BASED) || defined(sun)
     va_start(pvar, func);
 #else
     va_start(pvar);

cde/lib/tt/slib/Imakefile

@@ -8,7 +8,7 @@ XCOMM $TOG: Imakefile /main/7 1999/08/30 11:01:36 mgreess $
 #define LibInstall	NO
 
 #define CplusplusSource	YES
-DEPEND_DEFINES = $(CXXDEPENDINCLUDES)
+DEPEND_DEFINES = $(CXXDEPENDINCLUDES) $(DEPENDDEFINES)
 
 #include <Threads.tmpl>
 

cde/lib/tt/slib/mp_rpc_implement.C

@@ -100,7 +100,7 @@ static	gid_t	req_auth_gids[NGROUPS_MAX];
 #endif /* OPT_BUG_SUNOS_4 */
 
 #if defined(OPT_BUG_SUNOS_5)
-	typedef (*Hack_getucred)(const struct authdes_cred *,
+	typedef void (*Hack_getucred)(const struct authdes_cred *,
 				 uid_t *,
 				 gid_t *,
 				 short *,

cde/programs/backdrops/SunLogo.pm

@@ -0,0 +1,57 @@
+/* XPM */
+static char * SunLogo[] = {
+/* width height ncolors cpp [x_hot y_hot] */
+"48 48 3 1 0 0",
+/* colors */
+"     s #727288889f9f m white c #bbbbccccdddd",
+".    s #9191a8a8bfbf m black c #9191a8a8bfbf",
+"+    s #bbbbccccdddd m black c #727288889f9f",
+/* pixels */
+" ... .+++. .+++. .+++++. ... .+++. .+++. .+++++.",
+".   .+++. .+++. .+++.+++.   .+++. .+++. .+++.+++",
+".   .++. .+++. .+++. .++.   .++. .+++. .+++. .++",
+".   .+++.+++. .+++. .+++.   .+++.+++. .+++. .+++",
+" ... .+++++. .+++. .+++. ... .+++++. .+++. .+++.",
+".+++. .+++. .+++. .+++. .+++. .+++. .+++. .+++. ",
+"+++++. ... .+++. .+++. .+++++. ... .+++. .+++. .",
+"++.+++.   .+++. .+++. .+++.+++.   .+++. .+++. .+",
+"+. .+++. .+++. .+++.  .++. .+++. .+++. .+++.  .+",
+"++. .+++. .+. .+++. . .+++. .+++. .+. .+++. . .+",
+"+++. .+++. . .+++. .+. .+++. .+++. . .+++. .+. .",
+".+++. .+++. .+++. .+++. .+++. .+++. .+++. .+++. ",
+" .+++. .+++. .+. . .+++. .+++. .+++. .+. . .+++.",
+". .+++. .+++. . .+. .+++. .+++. .+++. . .+. .+++",
+"+. .+++. .+++. .+++. .+++. .+++. .+++. .+++. .++",
+"++. .+++. .+. . .+++. .+++. .+++. .+. . .+++. .+",
+"+++. .+++. . .+. .+++. .+++. .+++. . .+. .+++. .",
+".+++. .+++. .+++. .+++. .+++. .+++. .+++. .+++. ",
+" .+++. .+. .+++. . .+++. .+++. .+. .+++. . .+++.",
+". .+++. . .+++. .+. .+++. .+++. . .+++. .+. .+++",
+"+. .++.  .+++. .+++. .+++. .++.  .+++. .+++. .++",
+"++.+++. .+++. .+++.   .+++.+++. .+++. .+++.   .+",
+"+++++. .+++. .+++. ... .+++++. .+++. .+++. ... .",
+".+++. .+++. .+++. .+++. .+++. .+++. .+++. .+++. ",
+" ... .+++. .+++. .+++++. ... .+++. .+++. .+++++.",
+".   .+++. .+++. .+++.+++.   .+++. .+++. .+++.+++",
+".   .++. .+++. .+++. .++.   .++. .+++. .+++. .++",
+".   .+++.+++. .+++. .+++.   .+++.+++. .+++. .+++",
+" ... .+++++. .+++. .+++. ... .+++++. .+++. .+++.",
+".+++. .+++. .+++. .+++. .+++. .+++. .+++. .+++. ",
+"+++++. ... .+++. .+++. .+++++. ... .+++. .+++. .",
+"++.+++.   .+++. .+++. .+++.+++.   .+++. .+++. .+",
+"+. .+++. .+++. .+++.  .++. .+++. .+++. .+++.  .+",
+"++. .+++. .+. .+++. . .+++. .+++. .+. .+++. . .+",
+"+++. .+++. . .+++. .+. .+++. .+++. . .+++. .+. .",
+".+++. .+++. .+++. .+++. .+++. .+++. .+++. .+++. ",
+" .+++. .+++. .+. . .+++. .+++. .+++. .+. . .+++.",
+". .+++. .+++. . .+. .+++. .+++. .+++. . .+. .+++",
+"+. .+++. .+++. .+++. .+++. .+++. .+++. .+++. .++",
+"++. .+++. .+. . .+++. .+++. .+++. .+. . .+++. .+",
+"+++. .+++. . .+. .+++. .+++. .+++. . .+. .+++. .",
+".+++. .+++. .+++. .+++. .+++. .+++. .+++. .+++. ",
+" .+++. .+. .+++. . .+++. .+++. .+. .+++. . .+++.",
+". .+++. . .+++. .+. .+++. .+++. . .+++. .+. .+++",
+"+. .++.  .+++. .+++. .+++. .++.  .+++. .+++. .++",
+"++.+++. .+++. .+++.   .+++.+++. .+++. .+++.   .+",
+"+++++. .+++. .+++. ... .+++++. .+++. .+++. ... .",
+".+++. .+++. .+++. .+++. .+++. .+++. .+++. .+++. "};

cde/programs/dtaction/Imakefile

@@ -1,5 +1,6 @@
 XCOMM $TOG: Imakefile /main/9 1998/04/06 13:11:38 mgreess $
 
+ DEPEND_DEFINES = $(DEPENDDEFINES)
        INCLUDES = -I.
 
 DEPLIBS = $(DEPDTSVCLIB) $(DEPTTLIB) $(DEPXMLIB) $(DEPXTOOLLIB) $(DEPXLIB)

cde/programs/dtappbuilder/src/ab.tmpl

@@ -50,8 +50,8 @@ default_target: all
 /*
  * -xF and -M cause reordering of executable
  */
-LOCAL_LDFLAGS = -M Mapfile
+LOCAL_LDFLAGS =
-EXTRA_DEFINES = -D_POSIX_SOURCE=1 -Xa -xF
+EXTRA_DEFINES = -D_POSIX_SOURCE=1
 
 clean::
 	touch .make.state

cde/programs/dtappbuilder/src/abmf/Imakefile

@@ -21,8 +21,9 @@ XCOMM (c) Copyright 1996 Hitachi.
 #include "../ab.tmpl"
 #include "../ab.rules"
 
-    INCLUDES = -I. -I$(ABINCLUDES)
+      INCLUDES = -I. -I$(ABINCLUDES)
-     DEFINES =
+DEPEND_DEFINES = $(DEPENDDEFINES)
+       DEFINES =
 
 SOURCES.h.shipped =
 

cde/programs/dtappbuilder/src/libABil/Imakefile

@@ -29,8 +29,9 @@ XCOMM (c) Copyright 1996 Hitachi.
 #include "../ab.tmpl"
 #include "../ab.rules"
 
-    INCLUDES = -I. -I$(ABINCLUDES)
+      INCLUDES = -I. -I$(ABINCLUDES)
-     DEFINES =
+DEPEND_DEFINES = $(DEPENDDEFINES)
+       DEFINES =
 
 SOURCES.h.shipped=
 

cde/programs/dtappbuilder/src/libAButil/Imakefile

@@ -8,7 +8,7 @@ XCOMM $XConsortium: Imakefile /main/10 1996/10/09 14:03:49 drk $
 #define LibInstall	NO
 
 #define CplusplusSource	YES
-DEPEND_DEFINES = $(CXXDEPENDINCLUDES)
+DEPEND_DEFINES = $(CXXDEPENDINCLUDES) $(DEPENDDEFINES)
 
 #include "../ab.tmpl"
 #include "../ab.rules"

cde/programs/dtcalc/Imakefile

@@ -1,5 +1,6 @@
 XCOMM $TOG: Imakefile /main/11 1997/09/05 11:28:15 samborn $
 
+ DEPEND_DEFINES = $(DEPENDDEFINES)
         DEFINES = -DCDE_INSTALLATION_TOP=\"$(CDE_INSTALLATION_TOP)\"
        INCLUDES = -I.
 
@@ -17,7 +18,7 @@ SYS_LIBRARIES = -lmsaa -liconv
 #endif
 
 #if defined (SunArchitecture)
-SYS_LIBRARIES = -lintl -lsunmath -lm -ldl
+SYS_LIBRARIES = -lintl -lm -ldl
 #endif
 
 #if defined (USLArchitecture)

cde/programs/dtcm/dtcm/Imakefile

@@ -12,6 +12,7 @@ LOCAL_LIBRARIES = ../libDtCmP/libDtCmP.a $(CSALIB) DtClientLibs
 
  OSMAJORVERSION = OSMajorVersion
  OSMINORVERSION = OSMinorVersion
+ DEPEND_DEFINES = $(DEPENDDEFINES)
         DEFINES = -DREL="$(OSMAJORVERSION)$(OSMINORVERSION)" \
 	-DRELMAJOR="$(OSMAJORVERSION)" -DRELMINOR="$(OSMINORVERSION)" \
 	$(ICONV_INBUF_DEFINE)

cde/programs/dtcm/libDtCmP/Imakefile

@@ -12,6 +12,7 @@ INCLUDES = -I. -I$(CSASRC)
 OSMAJORVERSION = OSMajorVersion
 OSMINORVERSION = OSMinorVersion
 
+DEPEND_DEFINES = $(DEPENDDEFINES)
 DEFINES = -DRFC_MIME -DLINE_COUNT -DV2 -DOW_I18N \
 	-DREL="$(OSMAJORVERSION)$(OSMINORVERSION)" \
 	-DRELMAJOR="$(OSMAJORVERSION)" -DRELMINOR="$(OSMINORVERSION)"
@@ -38,6 +39,8 @@ OBJS =	cm_tty.o	cmfns.o		dtfns.o \
 	getdate.o	props.o		resource.o \
 	timeops.o	util.o
 
+YaccFileNoFlags(getdate)
+
 #include <Library.tmpl>
 
 DependTarget()

cde/programs/dtcreate/Imakefile

@@ -14,6 +14,7 @@ XCOMM
  * It should be set when necessary to the real library macro name.
  */
 
+ DEPEND_DEFINES = $(DEPENDDEFINES)
        INCLUDES = -I.
 #if defined (SunArchitecture)
 DEPLIBS = $(DEPDTWIDGETLIB) $(DEPDTSVCLIB) \
@@ -42,7 +43,7 @@ SYS_LIBRARIES = -lm -liconv
 #endif
 
 #if defined (SunArchitecture)
-SYS_LIBRARIES = -lm -ldl -lC
+SYS_LIBRARIES = -lm -ldl
 #endif /* SunArchitecture */
 
 #if defined (USLArchitecture)

cde/programs/dtdocbook/tcl/Imakefile

@@ -28,6 +28,8 @@ TCL_LIBRARY =	TclLibrary
 TCL_LIBRARY =	$(prefix)/tcl$(VERSION)
 #endif
 
+DEPEND_DEFINES = $(DEPENDDEFINES)
+
 #if defined(SunArchitecture)
 EXTRA_DEFINES = -DTCL_LIBRARY=\"${TCL_LIBRARY}\" \
 	-DNO_UNION_WAIT -DHAVE_UNISTD_H -DNEED_MATHERR \

cde/programs/dtexec/Imakefile

@@ -2,6 +2,7 @@ XCOMM $XConsortium: Imakefile /main/7 1996/09/14 15:17:32 drk $
 
 DEPLIBS = $(DEPTTLIB) $(DEPXTOOLLIB) $(DEPXLIB)
 LOCAL_LIBRARIES = $(TTLIB) $(XTOOLLIB) $(XLIB)
+DEPEND_DEFINES = $(DEPENDDEFINES)
 DEFINES = -DMSGLOG_CLIENT_ONLY
 INCLUDES = -I. 
 

cde/programs/dtfile/Imakefile

@@ -9,6 +9,7 @@ ForceSubdirs($(SUBDIRS))
 DependSubdirs($(SUBDIRS))
 
 
+DEPEND_DEFINES = $(DEPENDDEFINES)
 DEFINES = -DMULTIBYTE -DSHAPE -D_ILS_MACROS -DSUN_PERF \
 	-DCDE_INSTALLATION_TOP=\"$(CDE_INSTALLATION_TOP)\" \
 	-DCDE_CONFIGURATION_TOP=\"$(CDE_CONFIGURATION_TOP)\" \

cde/programs/dtfile/dtcopy/Imakefile

@@ -1,5 +1,6 @@
 XCOMM $XConsortium: Imakefile /main/7 1996/09/14 15:17:43 drk $
 
+DEPEND_DEFINES = $(DEPENDDEFINES)
 DEFINES = -DSHAPE
 
 DEPLIBS = DepDtClientLibs

cde/programs/dthello/Imakefile

@@ -11,7 +11,7 @@ EXTRA_DEFINES = -DHP_COLOR
 #endif
 
 #if defined(SunArchitecture)
-SYS_LIBRARIES = -lm -ldl -lgen -lC
+SYS_LIBRARIES = -lm -ldl -lgen
 #endif
 
 #if defined(USLArchitecture)

cde/programs/dthelp/dthelpdemo/Imakefile

@@ -10,6 +10,7 @@ XCOMM $XConsortium: Imakefile /main/7 1996/09/14 15:26:24 drk $
 
 PROGRAMS = dthelpdemo
 
+DEPEND_DEFINES = $(DEPENDDEFINES)
 DEFINES = -D_BMS
 INCLUDES =  -I.
 

cde/programs/dthelp/dthelpview/Imakefile

@@ -1,6 +1,7 @@
 XCOMM $XConsortium: Imakefile /main/7 1996/09/14 15:26:44 drk $
 PROGRAMS = dthelpview
 
+DEPEND_DEFINES = $(DEPENDDEFINES)
 DEFINES = -D_BMS
 INCLUDES = -I. 
 

cde/programs/dthelp/parser/canon1/build/build.c

@@ -71,5 +71,4 @@ while (TRUE)
     #include "case.c"
     if (m_token == ENDFILE) exit(FALSE) ;
     }
-    return 0;
 }

cde/programs/dthelp/parser/canon1/build/param.c

@@ -267,9 +267,9 @@ switch (newpar->type)
 	      ret = mbtowc(string, " ", 1);
 	      }
 	  }
-      return ;
     }
     (void) ret;
+    return;
 }
 
 /* Called at end of parameter attribute list rule */

cde/programs/dthelp/parser/canon1/build/scan.c

@@ -160,13 +160,13 @@ while (TRUE)
 	char mbyte[32]; /* bigger than the biggest multibyte char */
 
 	ret = wctomb(mbyte, c);
+	(void) ret;
 
 	fprintf(stderr, "\n'%s' (%d)", mbyte, c);
 	fprintf(m_errfile, "\n'%s' (%d)", mbyte, c);
 	m_error("Unexpected character");
 	}
     } /* End while */
-    (void) ret;
 }   /* End scan */
 
 #include "scanutil.c"

cde/programs/dthelp/parser/canon1/helptag/Imakefile

@@ -60,7 +60,7 @@ EXTRA_LOAD_FLAGS = -Wl,-a archive
 #endif
 
 #if defined (SunArchitecture)
-SYS_LIBRARIES = -lm -ldl -lgen -lC
+SYS_LIBRARIES = -lm -ldl -lgen
 #endif /* SunArchitecture */
 
 all:: $(OBJS)

cde/programs/dthelp/parser/canon1/parser/Imakefile

@@ -78,7 +78,7 @@ LOCAL_LIBRARIES = $(HELPUTILLIB)
 SYS_LIBRARIES = $(XLIB) DtClientSysLibs
 
 #if defined (SunArchitecture)
-SYS_LIBRARIES = $(XLIB) -lm -ldl -lgen -lC
+SYS_LIBRARIES = $(XLIB) -lm -ldl -lgen
 #endif /* SunArchitecture */
 
 all:: $(HELPTAGSRC)/dthelp_ctag1

cde/programs/dthelp/parser/canon1/util/malloc.c

@@ -98,7 +98,7 @@ void m_free(block, msg)
 #if defined(hpux) || defined(_AIX) || defined(sun) || defined(USL) || defined(__uxp__)
       snprintf(buffer, 32, "%5x:%5x",
         (unsigned int) ((unsigned long) block >> 16),
-        (unsigned int) block, msg) ;
+        (unsigned int) block) ;
 #else
       snprintf(buffer, 32, "  %9p", block) ;
 #endif

cde/programs/dthelp/parser/pass1/build/build.c

@@ -71,5 +71,4 @@ while (TRUE)
     #include "case.c"
     if (m_token == ENDFILE) exit(FALSE) ;
     }
-    return 0;
 }

cde/programs/dthelp/parser/pass1/build/param.c

@@ -267,9 +267,9 @@ switch (newpar->type)
 	      ret = mbtowc(string, " ", 1);
 	      }
 	  }
-      return ;
     }
     (void) ret;
+    return;
 }
 
 /* Called at end of parameter attribute list rule */

cde/programs/dthelp/parser/pass1/build/scan.c

@@ -160,13 +160,13 @@ while (TRUE)
 	char mbyte[32]; /* bigger than the biggest multibyte char */
 
 	ret = wctomb(mbyte, c);
+	(void) ret;
 
 	fprintf(stderr, "\n'%s' (%d)", mbyte, c);
 	fprintf(m_errfile, "\n'%s' (%d)", mbyte, c);
 	m_error("Unexpected character");
 	}
     } /* End while */
-    (void) ret;
 }   /* End scan */
 
 #include "scanutil.c"

cde/programs/dthelp/parser/pass1/helptag/Imakefile

@@ -60,7 +60,7 @@ EXTRA_LOAD_FLAGS = -Wl,-a archive
 #endif
 
 #if defined (SunArchitecture)
-SYS_LIBRARIES = -lm -ldl -lgen -lC
+SYS_LIBRARIES = -lm -ldl -lgen
 #endif /* SunArchitecture */
 
 all:: $(OBJS)

cde/programs/dthelp/parser/pass1/parser/Imakefile

@@ -78,7 +78,7 @@ LOCAL_LIBRARIES = $(HELPUTILLIB)
 SYS_LIBRARIES = $(XLIB) DtClientSysLibs
 
 #if defined (SunArchitecture)
-SYS_LIBRARIES = $(XLIB) -lm -ldl -lgen -lC
+SYS_LIBRARIES = $(XLIB) -lm -ldl -lgen
 #endif /* SunArchitecture */
 
 all:: $(HELPTAGSRC)/dthelp_htag1

cde/programs/dthelp/parser/pass1/util/malloc.c

@@ -98,7 +98,7 @@ void m_free(block, msg)
 #if defined(hpux) || defined(_AIX) || defined(sun) || defined(USL) || defined(__uxp__)
       snprintf(buffer, 32, "%5x:%5x",
         (unsigned int) ((unsigned long) block >> 16),
-        (unsigned int) block, msg) ;
+        (unsigned int) block) ;
 #else
       snprintf(buffer, 32, "  %9p", block) ;
 #endif

cde/programs/dthelp/parser/pass2/build/build.c

@@ -71,5 +71,4 @@ while (TRUE)
     #include "case.c"
     if (m_token == ENDFILE) exit(FALSE) ;
     }
-    return 0;
 }

cde/programs/dthelp/parser/pass2/build/param.c

@@ -267,9 +267,9 @@ switch (newpar->type)
 	      ret = mbtowc(string, " ", 1);
 	      }
 	  }
-      return ;
     }
     (void) ret;
+    return;
 }
 
 /* Called at end of parameter attribute list rule */

cde/programs/dthelp/parser/pass2/build/scan.c

@@ -160,13 +160,13 @@ while (TRUE)
 	char mbyte[32]; /* bigger than the biggest multibyte char */
 
 	ret = wctomb(mbyte, c);
+	(void) ret;
 
 	fprintf(stderr, "\n'%s' (%d)", mbyte, c);
 	fprintf(m_errfile, "\n'%s' (%d)", mbyte, c);
 	m_error("Unexpected character");
 	}
     } /* End while */
-    (void) ret;
 }   /* End scan */
 
 #include "scanutil.c"

cde/programs/dthelp/parser/pass2/htag2/Imakefile

@@ -52,7 +52,7 @@ EXTRA_LOAD_FLAGS = -Wl,-a archive
 #endif
 
 #if defined (SunArchitecture)
-SYS_LIBRARIES = -lm -ldl -lgen -lC
+SYS_LIBRARIES = -lm -ldl -lgen
 #endif /* SunArchitecture */
 
 all:: $(OBJS)

cde/programs/dthelp/parser/pass2/parser/Imakefile

@@ -69,7 +69,7 @@ LOCAL_LIBRARIES = $(SDLUTILLIB)
 SYS_LIBRARIES = $(XLIB) DtClientSysLibs
 
 #if defined (SunArchitecture)
-SYS_LIBRARIES = $(XLIB) -lm -ldl -lgen -lC
+SYS_LIBRARIES = $(XLIB) -lm -ldl -lgen
 #endif /* SunArchitecture */
 
 all:: $(HTAG2SRC)/dthelp_htag2