dtcalc: make it build

diff --git a/cde/configure.ac b/cde/configure.ac
index b80fe18c031d68e27140c415bcc6c80eec6ac02a..f8084b591c71c1eaf06a1c3410bf2061ba09980b 100644 (file)
--- a/cde/configure.ac
+++ b/cde/configure.ac
@@ -402,6 +402,8 @@ programs/dticon/Makefile
 
 programs/dtterm/Makefile
 
+programs/dtcalc/Makefile
+
 ])
 
 AC_OUTPUT

diff --git a/cde/programs/dtcalc/Makefile.am b/cde/programs/dtcalc/Makefile.am
index 19f837d351f91a0e4aab9bd934cd68f7a7543004..7dfd6f507ba18e63160d5b53d39227f4602cc959 100644 (file)
--- a/cde/programs/dtcalc/Makefile.am
+++ b/cde/programs/dtcalc/Makefile.am
@@ -1,19 +1,17 @@
-bin_PROGRAMS = dtcalc
+MAINTAINERCLEANFILES = Makefile.in
 
-dtcalc_CPPFLAGS = -DCDE_INSTALLATION_TOP=${prefix}
+bin_PROGRAMS = dtcalc
 
-dtcalc_LDADD = ${X_LIBS} -lm $(TTLIB) $(LIBSVC) $(LIBHELP)
+dtcalc_CPPFLAGS = -DCDE_INSTALLATION_TOP=\"$(CDE_INSTALLATION_TOP)\"
 
-if AIX
-dtcalc_LDADD += -lmsaa -liconv
-endif
+dtcalc_LDADD = $(DTCLIENTLIBS) $(XTOOLLIB)
 
 if SOLARIS
 dtcalc_LDADD += -lintl -ldl
 endif
 
 
-dtcalc_SOURCES = calctool.c      ds_common.c     ds_popup.c \
-                ds_widget.c     ds_xlib.c       functions.c \
-                help.c          motif.c         mp.c \
-                text.c
+dtcalc_SOURCES = calctool.c ds_common.c ds_popup.c ds_widget.c         \
+                ds_xlib.c functions.c help.c motif.c mp.c text.c       \
+                calctool.h ds_popup.h ds_xlib.h patchlevel.h           \
+                ds_common.h ds_widget.h motif.h