diff --git a/cde/configure.ac b/cde/configure.ac
index a40350e9e..177ff42a9 100644
--- a/cde/configure.ac
+++ b/cde/configure.ac
@@ -1,7 +1,7 @@
 AC_INIT([cde-desktop], [2.3.1], [jon@radscan.com])
 AC_CONFIG_HEADERS([include/autotools_config.h])
 AC_CONFIG_MACRO_DIRS([m4])
-AM_INIT_AUTOMAKE([foreign])
+AM_INIT_AUTOMAKE([foreign subdir-objects])
 AC_PREFIX_DEFAULT(/usr/dt)
 
 
@@ -314,6 +314,34 @@ lib/DtMrm/Makefile
 
 lib/csa/Makefile
 
+programs/Makefile
+programs/dthelp/Makefile
+programs/dthelp/dthelpgen/Makefile
+programs/dthelp/dthelpprint/Makefile
+programs/dthelp/parser/pass1/helptag/Makefile
+programs/dthelp/parser/pass1/Makefile
+programs/dthelp/parser/pass1/eltdef/Makefile
+programs/dthelp/parser/pass1/build/Makefile
+programs/dthelp/parser/Makefile
+programs/dthelp/parser/canon1/Makefile
+programs/dthelp/parser/pass2/Makefile
+programs/dthelp/dthelpview/Makefile
+
+programs/dsdm/Makefile
+
+programs/dtmail/Makefile
+programs/dtmail/dtmail/Makefile
+programs/dtmail/MotifApp/Makefile
+programs/dtmail/dtmailpr/Makefile
+programs/dtmail/libDtMail/Makefile
+programs/dtmail/libDtMail/RFC/Makefile
+programs/dtmail/libDtMail/Common/Makefile
+
+programs/dtpad/Makefile
+
+programs/dtfile/Makefile
+programs/dtfile/dtcopy/Makefile
+
 ])
 
 AC_OUTPUT
diff --git a/cde/programs/dsdm/Makefile.am b/cde/programs/dsdm/Makefile.am
index 5da9c0c74..5d68caa3b 100644
--- a/cde/programs/dsdm/Makefile.am
+++ b/cde/programs/dsdm/Makefile.am
@@ -1,8 +1,8 @@
-bin_PROGAMS = dsdm
+bin_PROGRAMS = dsdm
 
 dsdm_LDADD = ${X_LIBS}
 
-if SUN
+if SOLARIS
 dsdm_LDADD += -ldl
 endif
 
diff --git a/cde/programs/dtfile/Makefile.am b/cde/programs/dtfile/Makefile.am
index 700ce117d..fd17af0fa 100644
--- a/cde/programs/dtfile/Makefile.am
+++ b/cde/programs/dtfile/Makefile.am
@@ -4,6 +4,8 @@ SUBDIRS = dtcopy
 
 bin_PROGRAMS = dtfile
 
+BUILT_SOURCES = dtfile.config dtfile_error
+
 dist_config_DATA = dtfile.config
 
 dist_bin_SCRIPTS = dtfile_error
@@ -25,8 +27,8 @@ if LINUX
 dtfile_CPPFLAGS += -DFILE_MAP_OPTIMIZE
 endif
 
-if SUN
-dtfile_CFLAGS += -xF
+if SOLARIS
+dtfile_CFLAGS = -xF
 dtfile_LDADD += -lintl -lresolv
 endif
 
@@ -40,10 +42,10 @@ dtfile_SOURCES = ChangeDir.c     ChangeDirP.c    Command.c       Common.c \
 		 Prefs.c         PrefsP.c        SharedMsgs.c    SharedProcs.c \
 		 ToolTalk.c      Trash.c         Utils.c         fsDialog.c
 
-CPPSRC = dtfile.config.cpp
-CPPTARGET = dtfile.config
-include $(srcdir)/include/cppfile.tmpl
+dtfile.config: dtfile.config.cpp
+	$(RM) dtfile.config
+	$(CPP) -P -DXCOMM=# $(AM_CPPFLAGS) dtfile.config.cpp -o dtfile.config
 
-CPPSRC = dtfile_error
-CPPTARGET = dtfile_error
-include $(srcdir)/include/cppfile.tmpl
+dtfile_error: dtfile_error.cpp
+	$(RM) dtfile_error
+	$(CPP) -P -DXCOMM=# $(AM_CPPFLAGS) dtfile_error.cpp -o dtfile_error
diff --git a/cde/programs/dtfile/dtcopy/Makefile.am b/cde/programs/dtfile/dtcopy/Makefile.am
index afe9726ef..41b6ccf13 100644
--- a/cde/programs/dtfile/dtcopy/Makefile.am
+++ b/cde/programs/dtfile/dtcopy/Makefile.am
@@ -4,7 +4,7 @@ bin_PROGRAMS = dtfile_copy
 
 dtfile_copy_CFLAGS = -DSHAPE
 
-if SUN
+if SOLARIS
 dtfile_copy_CFLAGS += -xF
 endif
 
diff --git a/cde/programs/dthelp/dthelpgen/Makefile.am b/cde/programs/dthelp/dthelpgen/Makefile.am
index 7a74b53ad..d333252b8 100644
--- a/cde/programs/dthelp/dthelpgen/Makefile.am
+++ b/cde/programs/dthelp/dthelpgen/Makefile.am
@@ -1,4 +1,8 @@
-bin_PROGRAM = dthelpgen dthelpgen.dtsh
+MAINTAINERCLEANFILES = Makefile.in
+
+bin_PROGRAMS = dthelpgen
+
+bin_SCRIPTS = dthelpgen.dtsh
 
 dthelpgen_CPPFLAGS = -I.. -DCDE_INSTALLATION_TOP=\"${prefix}\" \
 		   -DCDE_CONFIGURATION_TOP=\"$(CDE_CONFIGURATION_TOP)\"
diff --git a/cde/programs/dthelp/dthelpprint/Makefile.am b/cde/programs/dthelp/dthelpprint/Makefile.am
index 347e4897f..7ee85f0ec 100644
--- a/cde/programs/dthelp/dthelpprint/Makefile.am
+++ b/cde/programs/dthelp/dthelpprint/Makefile.am
@@ -5,7 +5,7 @@ dthelpprint_CPPFLAGS = -I.. -DCDE_CONFIGURATION_TOP='"${prefix}"' \
 
 dthelpprint_LDADD = $(LIBSVC) $(LIBTT) $(LIBHELP) $(XTOOLLIB) ${X_LIBS}
 
-if SUN
+if SOLARIS
 dthelpprint_LDADD += -lw -ldl -lgen -lm
 endif
 
diff --git a/cde/programs/dthelp/parser/pass1/build/Makefile.am b/cde/programs/dthelp/parser/pass1/build/Makefile.am
index 573876c27..19f53ca9a 100644
--- a/cde/programs/dthelp/parser/pass1/build/Makefile.am
+++ b/cde/programs/dthelp/parser/pass1/build/Makefile.am
@@ -20,10 +20,10 @@ build_CFLAGS = -I$(HELPUTILSRC)
 build_LDADD = -l$(HELPUTILLIB)
 
 if HPUX
-build_LDADD += -Wl,-a archive
+build_LDFLAGS = -Wl,-a archive
 endif
 
-if SUN
+if SOLARIS
 .NO_PARALLEL:
 endif
 
diff --git a/cde/programs/dthelp/parser/pass1/eltdef/Makefile.am b/cde/programs/dthelp/parser/pass1/eltdef/Makefile.am
index 79850a486..8b3c8d6f3 100644
--- a/cde/programs/dthelp/parser/pass1/eltdef/Makefile.am
+++ b/cde/programs/dthelp/parser/pass1/eltdef/Makefile.am
@@ -20,10 +20,10 @@ HELPTSSFILE   = $(HELPTAGSRC)/htag.tss
 eltdef_LDADD = -l$(HELPUTILLIB)
 
 if HPUX
-eltdef += -Wl,-a archive
+eltdef_LDFLAGS = -Wl,-a archive
 endif
 
-if SUN
+if SOLARIS
 .NO_PARALLEL:
 endif
 
diff --git a/cde/programs/dthelp/parser/pass1/helptag/Makefile.am b/cde/programs/dthelp/parser/pass1/helptag/Makefile.am
index 71438f8d3..ca07559ac 100644
--- a/cde/programs/dthelp/parser/pass1/helptag/Makefile.am
+++ b/cde/programs/dthelp/parser/pass1/helptag/Makefile.am
@@ -6,8 +6,6 @@ ARCCMD = arc u
 UNARCCMD = arc x
 ARCDELCMD = arc d
 
-.SUFFIXES : .e .arc .c .h
-
 HELPTAG       = ..
 HELPTAGSRC    = $(HELPTAG)/helptag
 HELPPARSERSRC = $(HELPTAG)/parser
@@ -21,12 +19,12 @@ HELPTSSFILE   = $(HELPTAGSRC)/htag.tss
 
 XLATESRC  = $(DTHELPSRC)
 XLATEHDRS = $(XLATESRC)/XlationSvc.h $(XLATESRC)/LocaleXlate.h
-XLATESRCS = ${srcdir}/lib/DtSvc/DtUtil2/XlationSvc.c \
-	    ${srcdir}/lib/DtSvc/DtUtil2/LocaleXlate.c
+XLATESRCS = ${top_srcdir}/lib/DtSvc/DtUtil2/XlationSvc.c \
+	    ${top_srcdir}/lib/DtSvc/DtUtil2/LocaleXlate.c
 
 ELTHDRS = $(HELPUTILSRC)/entdef.h $(HELPUTILSRC)/entext.h
 
-XCOMM PARSEHDRS are header files used by many parser routines
+# PARSEHDRS are header files used by many parser routines
 PARSEHDRS = $(HELPUTILSRC)/basic.h $(HELPUTILSRC)/trie.h \
         $(HELPUTILSRC)/common.h $(HELPUTILSRC)/dtddef.h \
         $(HELPUTILSRC)/dtdext.h $(HELPUTILSRC)/sparse.h \
@@ -45,17 +43,17 @@ dthelp_htag1_CFLAGS = -I$(HELPUTILSRC) -I$(HELPPARSERSRC) -I$(HELPELTDEFSRC) \
 dthelp_htag1_LDADD = $(HELPUTILLIB)
 
 if HPUX
-dthelp_htag1_LDADD += -Wl,-a archive
+dthelp_htag1_LDFLAGS = -Wl,-a archive
 endif
 
-if SUN
+if SOLARIS
 dthelp_htag1_LDADD += -lm -ldl -lgen
 endif
 
-dthelp_htag1_LDADD += custom.c default.c help.c make.c option.c out.c \
+dthelp_htag1_SOURCES = custom.c default.c help.c make.c option.c out.c \
 		      special.c xref.c $(XLATESRCS)
 
-dthelp_htag1: $(HELPPARSERSRC)/parser
+dthelp_htag1$(EXEEXT): $(HELPPARSERSRC)/parser
         $(RM) dthelp_htag1
         $(CP) $(HELPPARSERSRC)/parser dthelp_htag1
 
@@ -67,8 +65,3 @@ arcappl archptag :
 unarcappl unarchptag :
         $(UNARCCMD) hptag.arc
 
-tags ::
-        etags -t *.c *.h *.if
-
-etags ::
-        etags -t *.c *.h *.if
diff --git a/cde/programs/dtmail/MotifApp/Makefile.am b/cde/programs/dtmail/MotifApp/Makefile.am
index 1b9d7fd03..047f71675 100644
--- a/cde/programs/dtmail/MotifApp/Makefile.am
+++ b/cde/programs/dtmail/MotifApp/Makefile.am
@@ -4,35 +4,21 @@ noinst_LIBRARIES = libMotifApp.a
 
 libMotifApp_a_CXXFLAGS = -I../include/MotifApp -I../include -I../include/utils \
 			 $(TIRPCINC)
-if SUN
 
- if USE_SPRO_V3
- libMotifApp_a_CXXFLAGS += -noex -xO0 -USPRO_V2
-  if DEBUGTREE
-  libMotifApp_a_CXXFLAGS += -xsb
-  endif
- endif
+# FIXME - some of these aren't set and sould be by configure.ac
+#if SOLARIS
 
-libMotifApp_a_CXXFLAGS += -DMMAP_NORESERVE -DSPRO_V2
+#if USE_SPRO_V3
+#libMotifApp_a_CXXFLAGS += -noex -xO0 -USPRO_V2
+#endif
 
- if I386
- libMotifApp_a_CXXFLAGS += -DBIG_ENDIAN
- endif
+#if DEBUGTREE
+#libMotifApp_a_CXXFLAGS += -xsb
+#endif
+#
+#libMotifApp_a_CXXFLAGS += -DMMAP_NORESERVE -DSPRO_V2
 
-endif
-
-if HPUX
-libMotifApp_a_CXXFLAGS += -DUSE_SOCKSTREAM -DBIG_ENDIAN -DDO_ANONYMOUS_MAP \
-                        -DNEED_MMAP_WRAPPER -DSENDMAIL_LOCKS +p \
-                        -DMAILGROUP_REQUIRED -DMAIL_SPOOL_PATH=\"/var/mail/%s\"
-endif
-
-if AIX
-libMotifApp_a_CXXFLAGS += -DI_HAVE_NO_BOOL -DI_HAVE_SELECT_H -DBIG_ENDIAN \
-                        -DSTRCASECMP_NOT_DEFINED -DDO_ANONYMOUS_MAP \
-                        -DSENDMAIL_LOCKS -DMAILGROUP_REQUIRED \
-                        -DMAIL_SPOOL_PATH=\"/var/spool/mail/%s\"
-endif
+#endif
 
 libMotifApp_a_SOURCES = Application.C           AskFirstCmd.C \
 			BasicComponent.C        BusyPixmap.C \
@@ -51,8 +37,8 @@ libMotifApp_a_SOURCES = Application.C           AskFirstCmd.C \
 			UndoCmd.C               WarnNoUndoCmd.C \
 			WorkingDialogManager.C
 
-if SUN
-clean::
+if SOLARIS
+clean-local:
 	$(RM) -r .sb
 	$(RM) .make.state*
 endif
diff --git a/cde/programs/dtmail/dtmail/Makefile.am b/cde/programs/dtmail/dtmail/Makefile.am
index 4cb9c4307..da2e13719 100644
--- a/cde/programs/dtmail/dtmail/Makefile.am
+++ b/cde/programs/dtmail/dtmail/Makefile.am
@@ -9,31 +9,31 @@ dtmail_CXXFLAGS = -I../include -I../include/MotifApp -I../include/utils \
 
 dtmail_LDADD = ../libDtMail/libDtMail.a ../MotifApp/libMotifApp.a
 
-if SUN
-dtmail_LDADD += -lw
-if SUNPRODIR
-SUNPRO_DIR = SUNPRODIR
-else
-SUNPRO_DIR = /opt/SUNWspro
-endif
-C++LIBPATH = -L$(SUNPRO_DIR)/lib
-
-if USE_SPRO_V3
-SPRO_V3_OPTIONS =      -noex -USPRO_V2
-if DEBUGTREE
-SPRO_V3_OPTIONS +=      -xsb
-endif
-else
-EXTRA_CCOPTIONS +=      -DSPRO_V2
-endif
-
-EXTRA_C++OPTIONS = -xF +w $(SPRO_V3_OPTIONS)
-EXTRA_CCOPTIONS = -xF -xstrconst -Xa -v
-if USE_EDITRES
-EXTRA_LIBRARIES = $(XMULIB) ExtraLibraries
-endif
-endif
-
+# FIXME solaris....
+#if SOLARIS
+#dtmail_LDFLAGS = -lw
+#if SUNPRODIR
+#SUNPRO_DIR = SUNPRODIR
+#else
+#SUNPRO_DIR = /opt/SUNWspro
+#endif
+#C++LIBPATH = -L$(SUNPRO_DIR)/lib
+#
+#if USE_SPRO_V3
+#SPRO_V3_OPTIONS =      -noex -USPRO_V2
+#if DEBUGTREE
+#3SPRO_V3_OPTIONS +=      -xsb
+#endif
+#else
+#EXTRA_CCOPTIONS +=      -DSPRO_V2
+#endif
+#
+#EXTRA_C++OPTIONS = -xF +w $(SPRO_V3_OPTIONS)
+#EXTRA_CCOPTIONS = -xF -xstrconst -Xa -v
+#if USE_EDITRES
+#EXTRA_LIBRARIES = $(XMULIB) ExtraLibraries
+#endif
+#endif SOLARIS
 
 
 dtmail_SOURCES = AliasListUiItem.C               AlternatesListUiItem.C \
diff --git a/cde/programs/dtmail/dtmailpr/Makefile.am b/cde/programs/dtmail/dtmailpr/Makefile.am
index 6b5305ef0..46b20a2d5 100644
--- a/cde/programs/dtmail/dtmailpr/Makefile.am
+++ b/cde/programs/dtmail/dtmailpr/Makefile.am
@@ -6,46 +6,34 @@ dtmailpr_CXXFLAGS = -I../include -I../../dtcompat -I../../../. \
 		    -I$(srcdir)/lib $(TIRPCINC)
 
 dtmailpr_LDADD = ../libDtMail/libDtMail.a $(LIBPRINT) $(LIBHELP) $(LIBWIDGET) \
-		 $(LIBSVC) $(LIBTT) -lXm $(XTOOLLIB) ${X_LIBS} -lm
+		 $(LIBSVC) $(LIBTT) -lXm $(XTOOLLIB) ${X_LIBS}
 
 if FREEBSD
 dtmailpr_LDADD += -liconv
 endif
 
-if AIX
-dtmailpr_CXXFLAGS += -DI_HAVE_NO_BOOL -DI_HAVE_SELECT_H \
-		     -DBIG_ENDIAN -DSTRCASECMP_NOT_DEFINED -DDO_ANONYMOUS_MAP \
-		     -DSENDMAIL_LOCKS -DMAILGROUP_REQUIRED \
-		     -DMAIL_SPOOL_PATH=\"/var/spool/mail/%s\"
-
-dtmailpr_LDADD += -ldl -liconv -lgen
-endif
-
-if HPUX
-dtmailpr_CXXFLAGS += -DBIG_ENDIAN -DDO_ANONYMOUS_MAP -DNEED_MMAP_WRAPPER \
-		     -DSENDMAIL_LOCKS -DMAILGROUP_REQUIRED \
-		     -DMAIL_SPOOL_PATH=\"/var/mail/%s\"
-endif
-
-if SUN
- if SUNPRODIR
- SUNPRO_DIR = /opt/SUNWspro
- else
- SUNPRO_DIR = SUNPRODIR
-endif
- if I386
- dtmailpr_CXXFLAGS += -DBIG_ENDIAN
- endif
- if USE_SPRO_V3
- dtmailpr_CXXFLAGS += -noex -USPRO_V2
-  if DEBUGTREE
-  dtmailpr_CXXFLAGS += -xsb
-  endif
- endif
-dtmailpr_CXXFLAGS += -L$(SUNPRO_DIR)/lib -xstrconst -Xc -v -DMMAP_NORESERVE \
-                    -DSPRO_V2 +p +w
-dtmailpr_LDADD += -Bstatic -lC -Bdynamic -lc -Bstatic -ldl -lgen -lm -lw \
-		  -lintl -lnsl
-endif
+# FIXME - solaris
+#if SOLARIS
+# if SUNPRODIR
+# SUNPRO_DIR = /opt/SUNWspro
+# else
+# SUNPRO_DIR = SUNPRODIR
+#endif
+#if I386
+# JET -- i386 is NOT big endian...
+#dtmailpr_CXXFLAGS += -DBIG_ENDIAN
+#endif
+#if USE_SPRO_V3
+#dtmailpr_CXXFLAGS += -noex -USPRO_V2
+#if DEBUGTREE
+#dtmailpr_CXXFLAGS += -xsb
+#endif
+#endif
+#
+#dtmailpr_CXXFLAGS += -L$(SUNPRO_DIR)/lib -xstrconst -Xc -v -DMMAP_NORESERVE \
+#                    -DSPRO_V2 +p +w
+#dtmailpr_LDADD += -Bstatic -lC -Bdynamic -lc -Bstatic -ldl -lgen -lm -lw \
+#		  -lintl -lnsl
+#endif
 
 dtmailpr_SOURCES = main.C message.C mailbox.C utils.C
diff --git a/cde/programs/dtmail/libDtMail/Common/Makefile.am b/cde/programs/dtmail/libDtMail/Common/Makefile.am
index bd830c2a1..a78a3a29c 100644
--- a/cde/programs/dtmail/libDtMail/Common/Makefile.am
+++ b/cde/programs/dtmail/libDtMail/Common/Makefile.am
@@ -5,30 +5,12 @@ noinst_LIBRARIES = libCommon.a
 libCommon_a_CXXFLAGS = -I../../include -I../../include/utils -I$(srcdir)/lib \
 		       $(TIRPCINC) -DDL_NOT_DYNAMIC
 
-if COMMENT
-These are here in case we want to build as a shared library
-DYNLIB_SRCS = DlDynamicLib.C
-DYNLIB_DEFINES = -DDL_DYNAMIC_LIBS
-endif
-
-if SUN
+if SOLARIS
 libCommon_a_CXXFLAGS += -DMMAP_NORESERVE -DSPRO_V2
- if I386
- libCommon_a_CXXFLAGS += -DBIG_ENDIAN
- endif
-endif
-
-if HPUX
-libCommon_a_CXXFLAGS += -DUSE_SOCKSTREAM -DBIG_ENDIAN -DDO_ANONYMOUS_MAP \
-			-DNEED_MMAP_WRAPPER -DSENDMAIL_LOCKS \
-			-DMAILGROUP_REQUIRED -DMAIL_SPOOL_PATH=\"/var/mail/%s\"
-endif
-
-if AIX
-libCommon_a_CXXFLAGS += -DI_HAVE_NO_BOOL -DI_HAVE_SELECT_H -DBIG_ENDIAN \
-			-DSTRCASECMP_NOT_DEFINED -DDO_ANONYMOUS_MAP \
-			-DSENDMAIL_LOCKS -DMAILGROUP_REQUIRED \
-			-DMAIL_SPOOL_PATH=\"/var/spool/mail/%s\"
+# FIXME - i386 is NOT big endian...
+#if I386
+#libCommon_a_CXXFLAGS += -DBIG_ENDIAN
+#endif
 endif
 
 libCommon_a_SOURCES = APOPServer.C \
diff --git a/cde/programs/dtmail/libDtMail/RFC/Makefile.am b/cde/programs/dtmail/libDtMail/RFC/Makefile.am
index 3780353b4..6322caa5d 100644
--- a/cde/programs/dtmail/libDtMail/RFC/Makefile.am
+++ b/cde/programs/dtmail/libDtMail/RFC/Makefile.am
@@ -5,27 +5,11 @@ noinst_LIBRARIES = libRFC.a
 libRFC_a_CXXFLAGS = -I../Common -I../../include -I../../include/utils \
 		    -I$(srcdir)/lib $(TIRPCINC) -DTTLOCK_OFF
 
-if HPUX
-libRFC_a_CXXFLAGS += -DUSE_SOCKSTREAM -DBIG_ENDIAN -DDO_ANONYMOUS_MAP \
-                        -DNEED_MMAP_WRAPPER -DSENDMAIL_LOCKS \
-                        -DMAILGROUP_REQUIRED -DMAIL_SPOOL_PATH=\"/var/mail/%s\"
-endif
-
-if AIX
-libRFC_a_CXXFLAGS += -DI_HAVE_NO_BOOL -DI_HAVE_SELECT_H -DBIG_ENDIAN \
-                        -DSTRCASECMP_NOT_DEFINED -DDO_ANONYMOUS_MAP \
-                        -DSENDMAIL_LOCKS -DMAILGROUP_REQUIRED \
-                        -DMAIL_SPOOL_PATH=\"/var/spool/mail/%s\"
-endif
-
-if SUN
+if SOLARIS
 libRFC_a_CXXFLAGS += -DMMAP_NORESERVE -DSPRO_V2
- if I386
- libRFC_a_CXXFLAGS += -DBIG_ENDIAN
- endif
 endif
 
-libRFC_a_SOURCES += AliasExpand.C           MIMEBodyPart.C \
+libRFC_a_SOURCES = AliasExpand.C           MIMEBodyPart.C \
 		    MIMEPartial.C           RFCBodyPart.C \
 		    RFCEnvelope.C           RFCFormat.C \
 		    RFCMIME.C               RFCMailBox.C \
diff --git a/cde/programs/dtpad/Makefile.am b/cde/programs/dtpad/Makefile.am
index 24cb8b40a..1530e4b6b 100644
--- a/cde/programs/dtpad/Makefile.am
+++ b/cde/programs/dtpad/Makefile.am
@@ -7,9 +7,9 @@ dtpad_CFLAGS = -DDT_LITE -DWORDWRAP -UNLS16 $(TIRPCINC)
 dtpad_LDADD = $(LIBPRINT) $(LIBHELP) $(LIBWIDGET) $(LIBSVC) $(LIBTT) -lXm \
 	      $(XTOOLLIB) ${X_LIBS}
 
-if SUN
+if SOLARIS
 dtpad_CFLAGS += -xF
-dtpad_LDADD += -lintl -lresolv
+dtpad_LDFLAGS = -lintl -lresolv
 endif
 
 dtpad_SOURCES = dtpad.c         editCB.c        fileCB.c \