This was a lot of fun (read: pain) to get working. bil_parser.y wanted -Nm set
for HPUX and AIX, but autotools complained that yacc options can't be
variables, and I seriously doubt that either AIX or HPUX build even on Imake,
so I left them out.
Thank you for your time,
-Chase
From 9a7027da9db35115f88aaddd4f530e18daaa8746 Mon Sep 17 00:00:00 2001
From: Chase <nicetry...@protonmail.ch>
Date: Sat, 5 Sep 2020 15:27:30 -0500
Subject: [PATCH] dtappbuilder: make it build under autotools
---
cde/.gitignore | 1 -
cde/configure.ac | 10 +-
cde/programs/Makefile.am | 4 +-
cde/programs/dtappbuilder/src/Makefile.am | 21 -
cde/programs/dtappbuilder/src/ab/Makefile.am | 545 +++++++++++++++++-
cde/programs/dtappbuilder/src/ab/ab_bil.c | 1 +
cde/programs/dtappbuilder/src/ab/ab_dnd.c | 1 +
cde/programs/dtappbuilder/src/ab/ab_utils.c | 2 +-
.../dtappbuilder/src/ab/abobj_align.c | 1 +
cde/programs/dtappbuilder/src/ab/abobj_edit.c | 1 +
.../dtappbuilder/src/ab/abobj_events.c | 1 +
.../dtappbuilder/src/ab/abobj_layers.c | 1 +
.../dtappbuilder/src/ab/abobj_layout.c | 1 +
cde/programs/dtappbuilder/src/ab/abobj_list.c | 1 +
cde/programs/dtappbuilder/src/ab/abobj_menu.c | 3 +-
cde/programs/dtappbuilder/src/ab/abobj_move.c | 1 +
.../dtappbuilder/src/ab/abobj_resize.c | 1 +
.../dtappbuilder/src/ab/abobj_select.c | 1 +
cde/programs/dtappbuilder/src/ab/abobj_set.c | 1 +
cde/programs/dtappbuilder/src/ab/abobj_util.c | 1 +
cde/programs/dtappbuilder/src/ab/brws.c | 1 +
cde/programs/dtappbuilder/src/ab/brws_find.c | 1 +
cde/programs/dtappbuilder/src/ab/brws_mthds.c | 1 +
cde/programs/dtappbuilder/src/ab/cgen_utils.c | 1 +
.../dtappbuilder/src/ab/conn_interpret.c | 1 +
cde/programs/dtappbuilder/src/ab/pal.c | 1 +
cde/programs/dtappbuilder/src/ab/pal_button.c | 1 +
cde/programs/dtappbuilder/src/ab/pal_choice.c | 1 +
.../dtappbuilder/src/ab/pal_combobox.c | 1 +
cde/programs/dtappbuilder/src/ab/pal_cpanel.c | 1 +
cde/programs/dtappbuilder/src/ab/pal_create.c | 1 +
.../dtappbuilder/src/ab/pal_custdlg.c | 1 +
cde/programs/dtappbuilder/src/ab/pal_drawp.c | 1 +
.../dtappbuilder/src/ab/pal_fchooser.c | 1 +
cde/programs/dtappbuilder/src/ab/pal_group.c | 1 +
cde/programs/dtappbuilder/src/ab/pal_label.c | 1 +
cde/programs/dtappbuilder/src/ab/pal_list.c | 1 +
.../dtappbuilder/src/ab/pal_mainwin.c | 1 +
cde/programs/dtappbuilder/src/ab/pal_menu.c | 1 +
.../dtappbuilder/src/ab/pal_menubar.c | 1 +
.../dtappbuilder/src/ab/pal_panedwin.c | 1 +
cde/programs/dtappbuilder/src/ab/pal_scale.c | 1 +
cde/programs/dtappbuilder/src/ab/pal_sep.c | 1 +
.../dtappbuilder/src/ab/pal_spinbox.c | 1 +
cde/programs/dtappbuilder/src/ab/pal_termp.c | 1 +
cde/programs/dtappbuilder/src/ab/pal_textf.c | 1 +
cde/programs/dtappbuilder/src/ab/pal_textp.c | 1 +
cde/programs/dtappbuilder/src/ab/proj.c | 1 +
.../dtappbuilder/src/ab/projP_utils.c | 1 +
cde/programs/dtappbuilder/src/ab/proj_utils.c | 1 +
cde/programs/dtappbuilder/src/ab/prop.c | 1 +
cde/programs/dtappbuilder/src/ab/prop_items.c | 1 +
cde/programs/dtappbuilder/src/ab/tmodeP.c | 1 +
cde/programs/dtappbuilder/src/ab/ui_list.c | 1 +
cde/programs/dtappbuilder/src/ab/ui_msg.c | 1 +
cde/programs/dtappbuilder/src/ab/ui_util.c | 1 +
.../dtappbuilder/src/abmf/Makefile.am | 72 +++
cde/programs/dtappbuilder/src/abmf/abmf.c | 4 +-
cde/programs/dtappbuilder/src/abmf/abmfP.h | 2 +-
.../dtappbuilder/src/abmf/dtb_utils.c | 2 +-
.../dtappbuilder/src/abmf/generate_code.c | 4 +-
.../{libAButil => include/ab}/util_types.h | 0
.../{libAButil => include/ab_private}/AB.h | 0
.../ab_private}/MwmUtil.h | 0
.../ab_private}/UilDef.h | 0
.../{libAButil => include/ab_private}/XmAll.h | 0
.../src/{ab => include/ab_private}/ab.h | 0
.../src/{ab => include/ab_private}/ab_bil.h | 0
.../src/{ab => include/ab_private}/ab_dnd.h | 0
.../{ab => include/ab_private}/ab_resources.h | 0
.../src/{ab => include/ab_private}/ab_utils.h | 0
.../{libAButil => include/ab_private}/abio.h | 0
.../src/{abmf => include/ab_private}/abmf.h | 0
.../src/{ab => include/ab_private}/abobj.h | 0
.../src/{ab => include/ab_private}/abobjP.h | 0
.../{ab => include/ab_private}/abobj_edit.h | 0
.../{ab => include/ab_private}/abobj_list.h | 0
.../{ab => include/ab_private}/abobj_set.h | 0
.../ab_private}/abuil_load.h | 0
.../ab_private}/abuil_print.h | 0
.../src/{ab => include/ab_private}/appfw.h | 0
.../src/{ab => include/ab_private}/attch_ed.h | 0
.../src/{libABil => include/ab_private}/bil.h | 2 +-
.../src/{ab => include/ab_private}/brws.h | 0
.../src/{ab => include/ab_private}/brwsP.h | 0
.../src/{ab => include/ab_private}/cgen.h | 0
.../ab_private}/color_chooser.h | 0
.../src/{ab => include/ab_private}/conn.h | 0
.../src/{ab => include/ab_private}/connP.h | 0
.../{abmf => include/ab_private}/dtb_utils.h | 0
.../src/{libABil => include/ab_private}/gil.h | 0
.../src/{ab => include/ab_private}/help.h | 0
.../{libAButil => include/ab_private}/istr.h | 0
.../src/{ab => include/ab_private}/message.h | 0
.../{libABobj => include/ab_private}/obj.h | 0
.../ab_private}/obj_list.h | 0
.../ab_private}/obj_notify.h | 0
.../ab_private}/objxm.h | 0
.../src/{ab => include/ab_private}/pal.h | 0
.../src/{ab => include/ab_private}/proj.h | 0
.../src/{ab => include/ab_private}/projP.h | 0
.../src/{ab => include/ab_private}/prop.h | 0
.../src/{ab => include/ab_private}/propP.h | 0
.../ab_private}/strlist.h | 0
.../src/{ab => include/ab_private}/tmode.h | 0
.../src/{ab => include/ab_private}/tmodeP.h | 0
.../{libABobj => include/ab_private}/trav.h | 0
.../src/{ab => include/ab_private}/ui_util.h | 0
.../{libAButil => include/ab_private}/util.h | 0
.../ab_private}/util_ds.h | 0
.../ab_private}/util_err.h | 0
.../src/{ab => include/ab_private}/vwr.h | 0
.../src/{ab => include/ab_private}/x_util.h | 0
.../dtappbuilder/src/libABil/Makefile.am | 39 ++
.../dtappbuilder/src/libABil/abuil_print.c | 2 +-
cde/programs/dtappbuilder/src/libABil/bilP.h | 6 +-
.../dtappbuilder/src/libABil/bil_lexer.c | 8 +-
.../dtappbuilder/src/libABil/bil_loadatt.c | 4 +-
.../dtappbuilder/src/libABil/bil_loadfile.c | 10 +-
.../dtappbuilder/src/libABil/bil_parse.y | 2 +-
.../dtappbuilder/src/libABil/gil_loadact.c | 2 +-
.../dtappbuilder/src/libABil/gil_loadatt.c | 2 +-
.../dtappbuilder/src/libABobj/Makefile.am | 54 ++
.../dtappbuilder/src/libABobjXm/Makefile.am | 19 +
.../dtappbuilder/src/libAButil/Makefile.am | 38 ++
.../dtappbuilder/src/libAButil/util_test.c | 2 +-
126 files changed, 845 insertions(+), 64 deletions(-)
create mode 100644 cde/programs/dtappbuilder/src/abmf/Makefile.am
rename cde/programs/dtappbuilder/src/{libAButil => include/ab}/util_types.h (100%)
rename cde/programs/dtappbuilder/src/{libAButil => include/ab_private}/AB.h (100%)
rename cde/programs/dtappbuilder/src/{libAButil => include/ab_private}/MwmUtil.h (100%)
rename cde/programs/dtappbuilder/src/{libAButil => include/ab_private}/UilDef.h (100%)
rename cde/programs/dtappbuilder/src/{libAButil => include/ab_private}/XmAll.h (100%)
rename cde/programs/dtappbuilder/src/{ab => include/ab_private}/ab.h (100%)
rename cde/programs/dtappbuilder/src/{ab => include/ab_private}/ab_bil.h (100%)
rename cde/programs/dtappbuilder/src/{ab => include/ab_private}/ab_dnd.h (100%)
rename cde/programs/dtappbuilder/src/{ab => include/ab_private}/ab_resources.h (100%)
rename cde/programs/dtappbuilder/src/{ab => include/ab_private}/ab_utils.h (100%)
rename cde/programs/dtappbuilder/src/{libAButil => include/ab_private}/abio.h (100%)
rename cde/programs/dtappbuilder/src/{abmf => include/ab_private}/abmf.h (100%)
rename cde/programs/dtappbuilder/src/{ab => include/ab_private}/abobj.h (100%)
rename cde/programs/dtappbuilder/src/{ab => include/ab_private}/abobjP.h (100%)
rename cde/programs/dtappbuilder/src/{ab => include/ab_private}/abobj_edit.h (100%)
rename cde/programs/dtappbuilder/src/{ab => include/ab_private}/abobj_list.h (100%)
rename cde/programs/dtappbuilder/src/{ab => include/ab_private}/abobj_set.h (100%)
rename cde/programs/dtappbuilder/src/{libABil => include/ab_private}/abuil_load.h (100%)
rename cde/programs/dtappbuilder/src/{libABil => include/ab_private}/abuil_print.h (100%)
rename cde/programs/dtappbuilder/src/{ab => include/ab_private}/appfw.h (100%)
rename cde/programs/dtappbuilder/src/{ab => include/ab_private}/attch_ed.h (100%)
rename cde/programs/dtappbuilder/src/{libABil => include/ab_private}/bil.h (98%)
rename cde/programs/dtappbuilder/src/{ab => include/ab_private}/brws.h (100%)
rename cde/programs/dtappbuilder/src/{ab => include/ab_private}/brwsP.h (100%)
rename cde/programs/dtappbuilder/src/{ab => include/ab_private}/cgen.h (100%)
rename cde/programs/dtappbuilder/src/{ab => include/ab_private}/color_chooser.h (100%)
rename cde/programs/dtappbuilder/src/{ab => include/ab_private}/conn.h (100%)
rename cde/programs/dtappbuilder/src/{ab => include/ab_private}/connP.h (100%)
rename cde/programs/dtappbuilder/src/{abmf => include/ab_private}/dtb_utils.h (100%)
rename cde/programs/dtappbuilder/src/{libABil => include/ab_private}/gil.h (100%)
rename cde/programs/dtappbuilder/src/{ab => include/ab_private}/help.h (100%)
rename cde/programs/dtappbuilder/src/{libAButil => include/ab_private}/istr.h (100%)
rename cde/programs/dtappbuilder/src/{ab => include/ab_private}/message.h (100%)
rename cde/programs/dtappbuilder/src/{libABobj => include/ab_private}/obj.h (100%)
rename cde/programs/dtappbuilder/src/{libABobj => include/ab_private}/obj_list.h (100%)
rename cde/programs/dtappbuilder/src/{libABobj => include/ab_private}/obj_notify.h (100%)
rename cde/programs/dtappbuilder/src/{libABobjXm => include/ab_private}/objxm.h (100%)
rename cde/programs/dtappbuilder/src/{ab => include/ab_private}/pal.h (100%)
rename cde/programs/dtappbuilder/src/{ab => include/ab_private}/proj.h (100%)
rename cde/programs/dtappbuilder/src/{ab => include/ab_private}/projP.h (100%)
rename cde/programs/dtappbuilder/src/{ab => include/ab_private}/prop.h (100%)
rename cde/programs/dtappbuilder/src/{ab => include/ab_private}/propP.h (100%)
rename cde/programs/dtappbuilder/src/{libAButil => include/ab_private}/strlist.h (100%)
rename cde/programs/dtappbuilder/src/{ab => include/ab_private}/tmode.h (100%)
rename cde/programs/dtappbuilder/src/{ab => include/ab_private}/tmodeP.h (100%)
rename cde/programs/dtappbuilder/src/{libABobj => include/ab_private}/trav.h (100%)
rename cde/programs/dtappbuilder/src/{ab => include/ab_private}/ui_util.h (100%)
rename cde/programs/dtappbuilder/src/{libAButil => include/ab_private}/util.h (100%)
rename cde/programs/dtappbuilder/src/{libAButil => include/ab_private}/util_ds.h (100%)
rename cde/programs/dtappbuilder/src/{libAButil => include/ab_private}/util_err.h (100%)
rename cde/programs/dtappbuilder/src/{ab => include/ab_private}/vwr.h (100%)
rename cde/programs/dtappbuilder/src/{ab => include/ab_private}/x_util.h (100%)
create mode 100644 cde/programs/dtappbuilder/src/libABil/Makefile.am
create mode 100644 cde/programs/dtappbuilder/src/libABobj/Makefile.am
create mode 100644 cde/programs/dtappbuilder/src/libABobjXm/Makefile.am
create mode 100644 cde/programs/dtappbuilder/src/libAButil/Makefile.am
diff --git a/cde/.gitignore b/cde/.gitignore
index 0dfb97c9..e73446ec 100644
--- a/cde/.gitignore
+++ b/cde/.gitignore
@@ -360,7 +360,6 @@ programs/dtappbuilder/src/ab/textp_ui.h
programs/dtappbuilder/src/abmf/ab_func_strings
programs/dtappbuilder/src/abmf/dtcodegen
programs/dtappbuilder/src/abmf/dtcodegen.cat
-programs/dtappbuilder/src/include/
programs/dtappbuilder/src/libABil/bil_parse.c
programs/dtappbuilder/src/libABil/bil_parse.h
diff --git a/cde/configure.ac b/cde/configure.ac
index 370b5bab..7dd6b6e1 100644
--- a/cde/configure.ac
+++ b/cde/configure.ac
@@ -395,7 +395,6 @@ AC_CHECK_LIB(SM, SmcOpenConnection, [XTOOLLIB="-lSM ${XTOOLLIB}"], ,
[${EXTRA_INCS} ${EXTRA_LIBS}])
AC_CHECK_LIB(Xm, XmTextSetString, [XTOOLLIB="-lXm ${XTOOLLIB}"], ,
[${EXTRA_INCS} ${EXTRA_LIBS}])
-
XTOOLLIB="${EXTRA_INCS} ${EXTRA_LIBS} ${X_EXTRA_LIBS} ${XTOOLLIB}"
AC_SUBST([XTOOLLIB])
@@ -574,6 +573,15 @@ programs/dtsearchpath/libCliSrv/Makefile
programs/dtsearchpath/dtsp/Makefile
programs/dtsearchpath/dtappg/Makefile
+programs/dtappbuilder/Makefile
+programs/dtappbuilder/src/Makefile
+programs/dtappbuilder/src/libAButil/Makefile
+programs/dtappbuilder/src/libABobj/Makefile
+programs/dtappbuilder/src/libABobjXm/Makefile
+programs/dtappbuilder/src/libABil/Makefile
+programs/dtappbuilder/src/abmf/Makefile
+programs/dtappbuilder/src/ab/Makefile
+
programs/dtappintegrate/Makefile
programs/dtprintegrate/Makefile
diff --git a/cde/programs/Makefile.am b/cde/programs/Makefile.am
index c996dac4..ab86a7c4 100644
--- a/cde/programs/Makefile.am
+++ b/cde/programs/Makefile.am
@@ -2,9 +2,9 @@ MAINTAINERCLEANFILES = Makefile.in
SUBDIRS = backdrops icons dsdm dtmail dtpad dtfile dtwm dtlogin \
dtsession dthello dtstyle dtexec dtdbcache dticon dtterm dtcalc \
- dtaction dtspcd dtscreen dtcm dtsearchpath palettes \
+ dtaction dtspcd dtscreen dtcm dtsearchpath dtappbuilder palettes \
dtappintegrate dtprintegrate dtconfig dtcreate dtprintinfo fontaliases \
dtdspmsg dtimsstart dtpdm dtsr dtpdmd types \
tttypes util dtopen localized dthelp nsgmls
-# NOTYET = dtksh dtappbuilder dtdocbook dtinfo ttsnoop
+# NOTYET = dtksh dtdocbook dtinfo ttsnoop
diff --git a/cde/programs/dtappbuilder/src/Makefile.am b/cde/programs/dtappbuilder/src/Makefile.am
index d3759c2b..c84f01b6 100644
--- a/cde/programs/dtappbuilder/src/Makefile.am
+++ b/cde/programs/dtappbuilder/src/Makefile.am
@@ -5,24 +5,3 @@ if SOLARIS
endif
SUBDIRS = libAButil libABobj libABobjXm libABil abmf ab
-
-dtbuilder::
- @case '${MFLAGS}' in *[ik]*) set +e;; esac; \
- for i in libAButil libABobj libABobjXm libABil ab ;\
- do \
- (cd $$i ; echo "making" dtbuilder "in $(CURRENT_DIR)/$$i..."; \
- $(MAKE) $(MFLAGS) 'CDEBUGFLAGS=$(CDEBUGFLAGS)' 'FIRST_LIBPATH=$(FIRST_LIBPATH)' 'FIRST_INCLUDES=$(FIRST_INCLUDES)' dtbuilder); \
- done
-
-dtcodegen::
- @case '${MFLAGS}' in *[ik]*) set +e;; esac; \
- for i in libAButil libABobj libABobjXm libABil abmf ;\
- do \
- (cd $$i ; echo "making" dtcodegen "in $(CURRENT_DIR)/$$i..."; \
- $(MAKE) $(MFLAGS) 'CDEBUGFLAGS=$(CDEBUGFLAGS)' 'FIRST_LIBPATH=$(FIRST_LIBPATH)' 'FIRST_INCLUDES=$(FIRST_INCLUDES)' dtcodegen); \
- done
-
-bin_PROGRAMS = dtcodegen dtbuilder
-
-clean::
- $(RM) -rf include
diff --git a/cde/programs/dtappbuilder/src/ab/Makefile.am b/cde/programs/dtappbuilder/src/ab/Makefile.am
index 63b8c6b0..ef119fbe 100644
--- a/cde/programs/dtappbuilder/src/ab/Makefile.am
+++ b/cde/programs/dtappbuilder/src/ab/Makefile.am
@@ -1,28 +1,551 @@
MAINTAINERCLEANFILES = Makefile.in
-# Since dtcodegen depends on libXm, libDtWidget, and other libs,
-# it will not be built properly during make includes.
-# So, when 'all' is made in this directory, redo make includes/depend.
-# An imake hack no doubt, but it is necessary for now.
+appdefaultsdir = ${prefix}/app-defaults/C
+ABINCLUDES = -I../include -I../include/ab_private -I../libABil
-all:: generated_includes abdepend
+bin_PROGRAMS = dtbuilder
-include "../ab.tmpl"
-include "../ab.rules"
+appdefaults_DATA = Dtbuilder
-bin_PROGRAMS = dtbuilder
+DTCODEGENCAT = NLSPATH=$(top_builddir)/programs/dtappbuilder/src/abmf/dtcodegen.cat
+
+DTCODEGEN = $(DTCODEGENCAT) ../abmf/dtcodegen
if BSD
UTILLIB = -lutil
endif
+AB_MAKEFILES = \
+ Makefile.aix \
+ Makefile.hpux \
+ Makefile.sunos \
+ Makefile.linux \
+ Makefile.freebsd \
+ Makefile.netbsd \
+ Makefile.openbsd
+
+CLEANFILES = AB_MAKEFILES *.res *_ui.c *_ui.h .dtcodegen.log *.delta dtbuilder.c dtbuilder.msg
+
+SOURCES.msg = \
+ dtbuilder.msg \
+ ../libAButil/libAButil.msg \
+ ../libABobjXm/libABobjXm.msg \
+ ../libABil/libABil.msg
+
dtbuilder_LDADD = ../libABil/libABil.a ../libABobjXm/libABobjXm.a \
../libABobj/libABobj.a ../libAButil/libAButil.a \
$(LIBWIDGET) $(LIBTERM) $(LIBHELP) $(LIBSVC) \
- $(LIBTT) -lUil $(MRESOURCELIB) -lXm $(XTOOLLIB) ${X_LIB} \
+ $(LIBTT) $(LIBXIN) -lUil $(MRESOURCELIB) -lXm $(XTOOLLIB) ${X_LIB} \
$(UTILLIB) -lm
-dtbuilder_CFLAGS = -DPIXMAP_WORKAROUND -I$(ABINCLUDES)
+dtbuilder_CFLAGS = -DPIXMAP_WORKAROUND $(ABINCLUDES)
+
+dtbuilder_SOURCES = dtb_utils.c \
+ appfw_ui.c \
+ about_box_ui.c \
+ brws_ui.c \
+ color_chooser_ui.c \
+ conn_ui.c \
+ dnd_ed_ui.c \
+ help_ed_ui.c \
+ attch_ed_ui.c \
+ proj_ui.c \
+ revolv_ui.c \
+ button_ui.c \
+ choice_ui.c \
+ combobox_ui.c \
+ cpanel_ui.c \
+ custdlg_ui.c \
+ drawp_ui.c \
+ group_ui.c \
+ label_ui.c \
+ list_ui.c \
+ mainwin_ui.c \
+ menu_ui.c \
+ menubar_ui.c \
+ scale_ui.c \
+ sep_ui.c \
+ spinbox_ui.c \
+ termp_ui.c \
+ textf_ui.c \
+ textp_ui.c \
+ cgen_win_ui.c \
+ cgen_props_ui.c \
+ cgen_env_ui.c \
+ fchooser_ui.c \
+ message_ed_ui.c \
+ panedwin_ed_ui.c \
+ palette_ui.c \
+ appfw_stubs.c \
+ brws_stubs.c \
+ color_chooser_stubs.c \
+ conn_stubs.c \
+ dnd_ed_stubs.c \
+ help_ed_stubs.c \
+ attch_ed_stubs.c \
+ proj_stubs.c \
+ revolv_stubs.c \
+ button_stubs.c \
+ choice_stubs.c \
+ combobox_stubs.c \
+ cpanel_stubs.c \
+ custdlg_stubs.c \
+ drawp_stubs.c \
+ group_stubs.c \
+ label_stubs.c \
+ list_stubs.c \
+ mainwin_stubs.c \
+ menu_stubs.c \
+ menubar_stubs.c \
+ scale_stubs.c \
+ sep_stubs.c \
+ spinbox_stubs.c \
+ termp_stubs.c \
+ textf_stubs.c \
+ textp_stubs.c \
+ cgen_win_stubs.c \
+ cgen_props_stubs.c \
+ cgen_env_stubs.c \
+ fchooser_stubs.c \
+ message_ed_stubs.c \
+ palette_stubs.c \
+ about_box_stubs.c \
+ dtbuilder.c \
+ ab_utils.c \
+ ab_bil.c \
+ ab_dnd.c \
+ ab_globals.c \
+ abobj_align.c \
+ abobj_edit.c \
+ abobj_list.c \
+ abobj_events.c \
+ abobj_layers.c \
+ abobj_layout.c \
+ abobj_menu.c \
+ abobj_move.c \
+ abobj_resize.c \
+ abobj_select.c \
+ abobj_set.c \
+ abobj_util.c \
+ brws.c \
+ brws_find.c \
+ brws_mthds.c \
+ brws_utils.c \
+ cgen_utils.c \
+ conn_drag.c \
+ conn_interpret.c \
+ conn_obj.c \
+ pal.c \
+ pal_create.c \
+ pal_button.c \
+ pal_choice.c \
+ pal_combobox.c \
+ pal_cpanel.c \
+ pal_custdlg.c \
+ pal_drawp.c \
+ pal_fchooser.c \
+ pal_group.c \
+ pal_label.c \
+ pal_list.c \
+ pal_mainwin.c \
+ pal_menu.c \
+ pal_menubar.c \
+ pal_panedwin.c \
+ pal_scale.c \
+ pal_sep.c \
+ pal_spinbox.c \
+ pal_termp.c \
+ pal_textf.c \
+ pal_textp.c \
+ proj.c \
+ proj_utils.c \
+ projP_utils.c \
+ prop.c \
+ prop_items.c \
+ tmode.c \
+ tmodeP.c \
+ ui_msg.c \
+ ui_list.c \
+ ui_util.c \
+ vwr.c \
+ x_util.c
+
+
+
+dtbuilder.msg: dtbuilder.msg.src
+ $(CP) $? $@ && chmod ug+w $@
+dtbuilder.c: dtbuilder.c.src
+ $(CP) $? $@ && chmod ug+w $@
+
+Dtbuilder: Dtbuilder.src
+ $(RM) $@
+ $(GENCPP) -P -DXCOMM=# $(LOCAL_CPP_DEFINES) $< > $@
+
+if SOLARIS
+
+dtbuilder.h + dtb_utils.c + dtb_utils.h: dtbuilder.bip dtbuilder.c dtbuilder.msg
+ $(DTCODEGEN) -changed -merge -p dtbuilder.bip -main
+dtbuilder.o: dtbuilder.c dtbuilder.bip $(TARGETS.h) $(TARGETS.h.merged)
+
+PROJFILE = dtbuilder
+
+about_box_ui.c + about_box_ui.h + about_box_stubs.c: $(PROJFILE).bip about_box.bil
+ $(DTCODEGEN) -changed -merge -p $(PROJFILE).bip about_box.bil
+about_box_ui.o: about_box_ui.c about_box_ui.h about_box.bil
+about_box_stubs.o: about_box_stubs.c about_box_ui.c about_box_ui.h about_box.bil
+
+appfw_ui.c + appfw_ui.h + appfw_stubs.c: $(PROJFILE).bip appfw.bil
+ $(DTCODEGEN) -changed -merge -p $(PROJFILE).bip appfw.bil
+appfw_ui.o: appfw_ui.c appfw_ui.h appfw.bil
+appfw_stubs.o: appfw_stubs.c appfw_ui.c appfw_ui.h appfw.bil
+
+attch_ed_ui.c + attch_ed_ui.h + attch_ed_stubs.c: $(PROJFILE).bip attch_ed.bil
+ $(DTCODEGEN) -changed -merge -p $(PROJFILE).bip attch_ed.bil
+attch_ed_ui.o: attch_ed_ui.c attch_ed_ui.h attch_ed.bil
+attch_ed_stubs.o: attch_ed_stubs.c attch_ed_ui.c attch_ed_ui.h attch_ed.bil
+
+brws_ui.c + brws_ui.h + brws_stubs.c: $(PROJFILE).bip brws.bil
+ $(DTCODEGEN) -changed -merge -p $(PROJFILE).bip brws.bil
+brws_ui.o: brws_ui.c brws_ui.h brws.bil
+brws_stubs.o: brws_stubs.c brws_ui.c brws_ui.h brws.bil
+
+button_ui.c + button_ui.h + button_stubs.c: $(PROJFILE).bip button.bil
+ $(DTCODEGEN) -changed -merge -p $(PROJFILE).bip button.bil
+button_ui.o: button_ui.c button_ui.h button.bil
+button_stubs.o: button_stubs.c button_ui.c button_ui.h button.bil
+
+cgen_env_ui.c + cgen_env_ui.h + cgen_env_stubs.c: $(PROJFILE).bip cgen_env.bil
+ $(DTCODEGEN) -changed -merge -p $(PROJFILE).bip cgen_env.bil
+cgen_env_ui.o: cgen_env_ui.c cgen_env_ui.h cgen_env.bil
+cgen_env_stubs.o: cgen_env_stubs.c cgen_env_ui.c cgen_env_ui.h cgen_env.bil
+
+cgen_props_ui.c + cgen_props_ui.h + cgen_props_stubs.c: $(PROJFILE).bip cgen_props.bil
+ $(DTCODEGEN) -changed -merge -p $(PROJFILE).bip cgen_props.bil
+cgen_props_ui.o: cgen_props_ui.c cgen_props_ui.h cgen_props.bil
+cgen_props_stubs.o: cgen_props_stubs.c cgen_props_ui.c cgen_props_ui.h cgen_props.bil
+
+cgen_win_ui.c + cgen_win_ui.h + cgen_win_stubs.c: $(PROJFILE).bip cgen_win.bil
+ $(DTCODEGEN) -changed -merge -p $(PROJFILE).bip cgen_win.bil
+cgen_win_ui.o: cgen_win_ui.c cgen_win_ui.h cgen_win.bil
+cgen_win_stubs.o: cgen_win_stubs.c cgen_win_ui.c cgen_win_ui.h cgen_win.bil
+
+choice_ui.c + choice_ui.h + choice_stubs.c: $(PROJFILE).bip choice.bil
+ $(DTCODEGEN) -changed -merge -p $(PROJFILE).bip choice.bil
+choice_ui.o: choice_ui.c choice_ui.h choice.bil
+choice_stubs.o: choice_stubs.c choice_ui.c choice_ui.h choice.bil
+
+color_chooser_ui.c + color_chooser_ui.h + color_chooser_stubs.c: $(PROJFILE).bip color_chooser.bil
+ $(DTCODEGEN) -changed -merge -p $(PROJFILE).bip color_chooser.bil
+color_chooser_ui.o: color_chooser_ui.c color_chooser_ui.h color_chooser.bil
+color_chooser_stubs.o: color_chooser_stubs.c color_chooser_ui.c color_chooser_ui.h color_chooser.bil
+
+combobox_ui.c + combobox_ui.h + combobox_stubs.c: $(PROJFILE).bip combobox.bil
+ $(DTCODEGEN) -changed -merge -p $(PROJFILE).bip combobox.bil
+combobox_ui.o: combobox_ui.c combobox_ui.h combobox.bil
+combobox_stubs.o: combobox_stubs.c combobox_ui.c combobox_ui.h combobox.bil
+
+conn_ui.c + conn_ui.h + conn_stubs.c: $(PROJFILE).bip conn.bil
+ $(DTCODEGEN) -changed -merge -p $(PROJFILE).bip conn.bil
+conn_ui.o: conn_ui.c conn_ui.h conn.bil
+conn_stubs.o: conn_stubs.c conn_ui.c conn_ui.h conn.bil
+
+cpanel_ui.c + cpanel_ui.h + cpanel_stubs.c: $(PROJFILE).bip cpanel.bil
+ $(DTCODEGEN) -changed -merge -p $(PROJFILE).bip cpanel.bil
+cpanel_ui.o: cpanel_ui.c cpanel_ui.h cpanel.bil
+cpanel_stubs.o: cpanel_stubs.c cpanel_ui.c cpanel_ui.h cpanel.bil
+
+custdlg_ui.c + custdlg_ui.h + custdlg_stubs.c: $(PROJFILE).bip custdlg.bil
+ $(DTCODEGEN) -changed -merge -p $(PROJFILE).bip custdlg.bil
+custdlg_ui.o: custdlg_ui.c custdlg_ui.h custdlg.bil
+custdlg_stubs.o: custdlg_stubs.c custdlg_ui.c custdlg_ui.h custdlg.bil
+
+dnd_ed_ui.c + dnd_ed_ui.h + dnd_ed_stubs.c: $(PROJFILE).bip dnd_ed.bil
+ $(DTCODEGEN) -changed -merge -p $(PROJFILE).bip dnd_ed.bil
+dnd_ed_ui.o: dnd_ed_ui.c dnd_ed_ui.h dnd_ed.bil
+dnd_ed_stubs.o: dnd_ed_stubs.c dnd_ed_ui.c dnd_ed_ui.h dnd_ed.bil
+
+drawp_ui.c + drawp_ui.h + drawp_stubs.c: $(PROJFILE).bip drawp.bil
+ $(DTCODEGEN) -changed -merge -p $(PROJFILE).bip drawp.bil
+drawp_ui.o: drawp_ui.c drawp_ui.h drawp.bil
+drawp_stubs.o: drawp_stubs.c drawp_ui.c drawp_ui.h drawp.bil
+
+fchooser_ui.c + fchooser_ui.h + fchooser_stubs.c: $(PROJFILE).bip fchooser.bil
+ $(DTCODEGEN) -changed -merge -p $(PROJFILE).bip fchooser.bil
+fchooser_ui.o: fchooser_ui.c fchooser_ui.h fchooser.bil
+fchooser_stubs.o: fchooser_stubs.c fchooser_ui.c fchooser_ui.h fchooser.bil
+
+group_ui.c + group_ui.h + group_stubs.c: $(PROJFILE).bip group.bil
+ $(DTCODEGEN) -changed -merge -p $(PROJFILE).bip group.bil
+group_ui.o: group_ui.c group_ui.h group.bil
+group_stubs.o: group_stubs.c group_ui.c group_ui.h group.bil
+
+help_ed_ui.c + help_ed_ui.h + help_ed_stubs.c: $(PROJFILE).bip help_ed.bil
+ $(DTCODEGEN) -changed -merge -p $(PROJFILE).bip help_ed.bil
+help_ed_ui.o: help_ed_ui.c help_ed_ui.h help_ed.bil
+help_ed_stubs.o: help_ed_stubs.c help_ed_ui.c help_ed_ui.h help_ed.bil
+
+label_ui.c + label_ui.h + label_stubs.c: $(PROJFILE).bip label.bil
+ $(DTCODEGEN) -changed -merge -p $(PROJFILE).bip label.bil
+label_ui.o: label_ui.c label_ui.h label.bil
+label_stubs.o: label_stubs.c label_ui.c label_ui.h label.bil
+
+list_ui.c + list_ui.h + list_stubs.c: $(PROJFILE).bip list.bil
+ $(DTCODEGEN) -changed -merge -p $(PROJFILE).bip list.bil
+list_ui.o: list_ui.c list_ui.h list.bil
+list_stubs.o: list_stubs.c list_ui.c list_ui.h list.bil
+
+mainwin_ui.c + mainwin_ui.h + mainwin_stubs.c: $(PROJFILE).bip mainwin.bil
+ $(DTCODEGEN) -changed -merge -p $(PROJFILE).bip mainwin.bil
+mainwin_ui.o: mainwin_ui.c mainwin_ui.h mainwin.bil
+mainwin_stubs.o: mainwin_stubs.c mainwin_ui.c mainwin_ui.h mainwin.bil
+
+menu_ui.c + menu_ui.h + menu_stubs.c: $(PROJFILE).bip menu.bil
+ $(DTCODEGEN) -changed -merge -p $(PROJFILE).bip menu.bil
+menu_ui.o: menu_ui.c menu_ui.h menu.bil
+menu_stubs.o: menu_stubs.c menu_ui.c menu_ui.h menu.bil
+
+menubar_ui.c + menubar_ui.h + menubar_stubs.c: $(PROJFILE).bip menubar.bil
+ $(DTCODEGEN) -changed -merge -p $(PROJFILE).bip menubar.bil
+menubar_ui.o: menubar_ui.c menubar_ui.h menubar.bil
+menubar_stubs.o: menubar_stubs.c menubar_ui.c menubar_ui.h menubar.bil
+
+message_ed_ui.c + message_ed_ui.h + message_ed_stubs.c: $(PROJFILE).bip message_ed.bil
+ $(DTCODEGEN) -changed -merge -p $(PROJFILE).bip message_ed.bil
+message_ed_ui.o: message_ed_ui.c message_ed_ui.h message_ed.bil
+message_ed_stubs.o: message_ed_stubs.c message_ed_ui.c message_ed_ui.h message_ed.bil
+
+palette_ui.c + palette_ui.h + palette_stubs.c: $(PROJFILE).bip palette.bil
+ $(DTCODEGEN) -changed -merge -p $(PROJFILE).bip palette.bil
+palette_ui.o: palette_ui.c palette_ui.h palette.bil
+palette_stubs.o: palette_stubs.c palette_ui.c palette_ui.h palette.bil
+
+panedwin_ed_ui.c + panedwin_ed_ui.h + panedwin_ed_stubs.c: $(PROJFILE).bip panedwin_ed.bil
+ $(DTCODEGEN) -changed -merge -p $(PROJFILE).bip panedwin_ed.bil
+panedwin_ed_ui.o: panedwin_ed_ui.c panedwin_ed_ui.h panedwin_ed.bil
+panedwin_ed_stubs.o: panedwin_ed_stubs.c panedwin_ed_ui.c panedwin_ed_ui.h panedwin_ed.bil
+
+proj_ui.c + proj_ui.h + proj_stubs.c: $(PROJFILE).bip proj.bil
+ $(DTCODEGEN) -changed -merge -p $(PROJFILE).bip proj.bil
+proj_ui.o: proj_ui.c proj_ui.h proj.bil
+proj_stubs.o: proj_stubs.c proj_ui.c proj_ui.h proj.bil
+
+revolv_ui.c + revolv_ui.h + revolv_stubs.c: $(PROJFILE).bip revolv.bil
+ $(DTCODEGEN) -changed -merge -p $(PROJFILE).bip revolv.bil
+revolv_ui.o: revolv_ui.c revolv_ui.h revolv.bil
+revolv_stubs.o: revolv_stubs.c revolv_ui.c revolv_ui.h revolv.bil
+
+scale_ui.c + scale_ui.h + scale_stubs.c: $(PROJFILE).bip scale.bil
+ $(DTCODEGEN) -changed -merge -p $(PROJFILE).bip scale.bil
+scale_ui.o: scale_ui.c scale_ui.h scale.bil
+scale_stubs.o: scale_stubs.c scale_ui.c scale_ui.h scale.bil
-dtbuilder_SOURCES =
+sep_ui.c + sep_ui.h + sep_stubs.c: $(PROJFILE).bip sep.bil
+ $(DTCODEGEN) -changed -merge -p $(PROJFILE).bip sep.bil
+sep_ui.o: sep_ui.c sep_ui.h sep.bil
+sep_stubs.o: sep_stubs.c sep_ui.c sep_ui.h sep.bil
+
+spinbox_ui.c + spinbox_ui.h + spinbox_stubs.c: $(PROJFILE).bip spinbox.bil
+ $(DTCODEGEN) -changed -merge -p $(PROJFILE).bip spinbox.bil
+spinbox_ui.o: spinbox_ui.c spinbox_ui.h spinbox.bil
+spinbox_stubs.o: spinbox_stubs.c spinbox_ui.c spinbox_ui.h spinbox.bil
+
+termp_ui.c + termp_ui.h + termp_stubs.c: $(PROJFILE).bip termp.bil
+ $(DTCODEGEN) -changed -merge -p $(PROJFILE).bip termp.bil
+termp_ui.o: termp_ui.c termp_ui.h termp.bil
+termp_stubs.o: termp_stubs.c termp_ui.c termp_ui.h termp.bil
+
+textf_ui.c + textf_ui.h + textf_stubs.c: $(PROJFILE).bip textf.bil
+ $(DTCODEGEN) -changed -merge -p $(PROJFILE).bip textf.bil
+textf_ui.o: textf_ui.c textf_ui.h textf.bil
+textf_stubs.o: textf_stubs.c textf_ui.c textf_ui.h textf.bil
+
+textp_ui.c + textp_ui.h + textp_stubs.c: $(PROJFILE).bip textp.bil
+ $(DTCODEGEN) -changed -merge -p $(PROJFILE).bip textp.bil
+textp_ui.o: textp_ui.c textp_ui.h textp.bil
+textp_stubs.o: textp_stubs.c textp_ui.c textp_ui.h textp.bil
+
+else
+
+dtbuilder.h dtb_utils.c dtb_utils.h: dtbuilder.bip dtbuilder.c dtbuilder.msg
+ $(DTCODEGEN) -changed -merge -p dtbuilder.bip -main
+dtbuilder.o: dtbuilder.c dtbuilder.bip $(TARGETS.h) $(TARGETS.h.merged)
+
+PROJFILE = dtbuilder
+
+about_box_ui.c about_box_ui.h about_box_stubs.c: $(PROJFILE).bip about_box.bil
+ $(DTCODEGEN) -changed -merge -p $(PROJFILE).bip about_box.bil
+about_box_ui.o: about_box_ui.c about_box_ui.h about_box.bil
+about_box_stubs.o: about_box_stubs.c about_box_ui.c about_box_ui.h about_box.bil
+
+appfw_ui.c appfw_ui.h appfw_stubs.c: $(PROJFILE).bip appfw.bil
+ $(DTCODEGEN) -changed -merge -p $(PROJFILE).bip appfw.bil
+appfw_ui.o: appfw_ui.c appfw_ui.h appfw.bil
+appfw_stubs.o: appfw_stubs.c appfw_ui.c appfw_ui.h appfw.bil
+
+attch_ed_ui.c attch_ed_ui.h attch_ed_stubs.c: $(PROJFILE).bip attch_ed.bil
+ $(DTCODEGEN) -changed -merge -p $(PROJFILE).bip attch_ed.bil
+attch_ed_ui.o: attch_ed_ui.c attch_ed_ui.h attch_ed.bil
+attch_ed_stubs.o: attch_ed_stubs.c attch_ed_ui.c attch_ed_ui.h attch_ed.bil
+
+brws_ui.c brws_ui.h brws_stubs.c: $(PROJFILE).bip brws.bil
+ $(DTCODEGEN) -changed -merge -p $(PROJFILE).bip brws.bil
+brws_ui.o: brws_ui.c brws_ui.h brws.bil
+brws_stubs.o: brws_stubs.c brws_ui.c brws_ui.h brws.bil
+
+button_ui.c button_ui.h button_stubs.c: $(PROJFILE).bip button.bil
+ $(DTCODEGEN) -changed -merge -p $(PROJFILE).bip button.bil
+button_ui.o: button_ui.c button_ui.h button.bil
+button_stubs.o: button_stubs.c button_ui.c button_ui.h button.bil
+
+cgen_env_ui.c cgen_env_ui.h cgen_env_stubs.c: $(PROJFILE).bip cgen_env.bil
+ $(DTCODEGEN) -changed -merge -p $(PROJFILE).bip cgen_env.bil
+cgen_env_ui.o: cgen_env_ui.c cgen_env_ui.h cgen_env.bil
+cgen_env_stubs.o: cgen_env_stubs.c cgen_env_ui.c cgen_env_ui.h cgen_env.bil
+
+cgen_props_ui.c cgen_props_ui.h cgen_props_stubs.c: $(PROJFILE).bip cgen_props.bil
+ $(DTCODEGEN) -changed -merge -p $(PROJFILE).bip cgen_props.bil
+cgen_props_ui.o: cgen_props_ui.c cgen_props_ui.h cgen_props.bil
+cgen_props_stubs.o: cgen_props_stubs.c cgen_props_ui.c cgen_props_ui.h cgen_props.bil
+
+cgen_win_ui.c cgen_win_ui.h cgen_win_stubs.c: $(PROJFILE).bip cgen_win.bil
+ $(DTCODEGEN) -changed -merge -p $(PROJFILE).bip cgen_win.bil
+cgen_win_ui.o: cgen_win_ui.c cgen_win_ui.h cgen_win.bil
+cgen_win_stubs.o: cgen_win_stubs.c cgen_win_ui.c cgen_win_ui.h cgen_win.bil
+
+choice_ui.c choice_ui.h choice_stubs.c: $(PROJFILE).bip choice.bil
+ $(DTCODEGEN) -changed -merge -p $(PROJFILE).bip choice.bil
+choice_ui.o: choice_ui.c choice_ui.h choice.bil
+choice_stubs.o: choice_stubs.c choice_ui.c choice_ui.h choice.bil
+
+color_chooser_ui.c color_chooser_ui.h color_chooser_stubs.c: $(PROJFILE).bip color_chooser.bil
+ $(DTCODEGEN) -changed -merge -p $(PROJFILE).bip color_chooser.bil
+color_chooser_ui.o: color_chooser_ui.c color_chooser_ui.h color_chooser.bil
+color_chooser_stubs.o: color_chooser_stubs.c color_chooser_ui.c color_chooser_ui.h color_chooser.bil
+
+combobox_ui.c combobox_ui.h combobox_stubs.c: $(PROJFILE).bip combobox.bil
+ $(DTCODEGEN) -changed -merge -p $(PROJFILE).bip combobox.bil
+combobox_ui.o: combobox_ui.c combobox_ui.h combobox.bil
+combobox_stubs.o: combobox_stubs.c combobox_ui.c combobox_ui.h combobox.bil
+
+conn_ui.c conn_ui.h conn_stubs.c: $(PROJFILE).bip conn.bil
+ $(DTCODEGEN) -changed -merge -p $(PROJFILE).bip conn.bil
+conn_ui.o: conn_ui.c conn_ui.h conn.bil
+conn_stubs.o: conn_stubs.c conn_ui.c conn_ui.h conn.bil
+
+cpanel_ui.c cpanel_ui.h cpanel_stubs.c: $(PROJFILE).bip cpanel.bil
+ $(DTCODEGEN) -changed -merge -p $(PROJFILE).bip cpanel.bil
+cpanel_ui.o: cpanel_ui.c cpanel_ui.h cpanel.bil
+cpanel_stubs.o: cpanel_stubs.c cpanel_ui.c cpanel_ui.h cpanel.bil
+
+custdlg_ui.c custdlg_ui.h custdlg_stubs.c: $(PROJFILE).bip custdlg.bil
+ $(DTCODEGEN) -changed -merge -p $(PROJFILE).bip custdlg.bil
+custdlg_ui.o: custdlg_ui.c custdlg_ui.h custdlg.bil
+custdlg_stubs.o: custdlg_stubs.c custdlg_ui.c custdlg_ui.h custdlg.bil
+
+dnd_ed_ui.c dnd_ed_ui.h dnd_ed_stubs.c: $(PROJFILE).bip dnd_ed.bil
+ $(DTCODEGEN) -changed -merge -p $(PROJFILE).bip dnd_ed.bil
+dnd_ed_ui.o: dnd_ed_ui.c dnd_ed_ui.h dnd_ed.bil
+dnd_ed_stubs.o: dnd_ed_stubs.c dnd_ed_ui.c dnd_ed_ui.h dnd_ed.bil
+
+drawp_ui.c drawp_ui.h drawp_stubs.c: $(PROJFILE).bip drawp.bil
+ $(DTCODEGEN) -changed -merge -p $(PROJFILE).bip drawp.bil
+drawp_ui.o: drawp_ui.c drawp_ui.h drawp.bil
+drawp_stubs.o: drawp_stubs.c drawp_ui.c drawp_ui.h drawp.bil
+
+fchooser_ui.c fchooser_ui.h fchooser_stubs.c: $(PROJFILE).bip fchooser.bil
+ $(DTCODEGEN) -changed -merge -p $(PROJFILE).bip fchooser.bil
+fchooser_ui.o: fchooser_ui.c fchooser_ui.h fchooser.bil
+fchooser_stubs.o: fchooser_stubs.c fchooser_ui.c fchooser_ui.h fchooser.bil
+
+group_ui.c group_ui.h group_stubs.c: $(PROJFILE).bip group.bil
+ $(DTCODEGEN) -changed -merge -p $(PROJFILE).bip group.bil
+group_ui.o: group_ui.c group_ui.h group.bil
+group_stubs.o: group_stubs.c group_ui.c group_ui.h group.bil
+
+help_ed_ui.c help_ed_ui.h help_ed_stubs.c: $(PROJFILE).bip help_ed.bil
+ $(DTCODEGEN) -changed -merge -p $(PROJFILE).bip help_ed.bil
+help_ed_ui.o: help_ed_ui.c help_ed_ui.h help_ed.bil
+help_ed_stubs.o: help_ed_stubs.c help_ed_ui.c help_ed_ui.h help_ed.bil
+
+label_ui.c label_ui.h label_stubs.c: $(PROJFILE).bip label.bil
+ $(DTCODEGEN) -changed -merge -p $(PROJFILE).bip label.bil
+label_ui.o: label_ui.c label_ui.h label.bil
+label_stubs.o: label_stubs.c label_ui.c label_ui.h label.bil
+
+list_ui.c list_ui.h list_stubs.c: $(PROJFILE).bip list.bil
+ $(DTCODEGEN) -changed -merge -p $(PROJFILE).bip list.bil
+list_ui.o: list_ui.c list_ui.h list.bil
+list_stubs.o: list_stubs.c list_ui.c list_ui.h list.bil
+
+mainwin_ui.c mainwin_ui.h mainwin_stubs.c: $(PROJFILE).bip mainwin.bil
+ $(DTCODEGEN) -changed -merge -p $(PROJFILE).bip mainwin.bil
+mainwin_ui.o: mainwin_ui.c mainwin_ui.h mainwin.bil
+mainwin_stubs.o: mainwin_stubs.c mainwin_ui.c mainwin_ui.h mainwin.bil
+
+menu_ui.c menu_ui.h menu_stubs.c: $(PROJFILE).bip menu.bil
+ $(DTCODEGEN) -changed -merge -p $(PROJFILE).bip menu.bil
+menu_ui.o: menu_ui.c menu_ui.h menu.bil
+menu_stubs.o: menu_stubs.c menu_ui.c menu_ui.h menu.bil
+
+menubar_ui.c menubar_ui.h menubar_stubs.c: $(PROJFILE).bip menubar.bil
+ $(DTCODEGEN) -changed -merge -p $(PROJFILE).bip menubar.bil
+menubar_ui.o: menubar_ui.c menubar_ui.h menubar.bil
+menubar_stubs.o: menubar_stubs.c menubar_ui.c menubar_ui.h menubar.bil
+
+message_ed_ui.c message_ed_ui.h message_ed_stubs.c: $(PROJFILE).bip message_ed.bil
+ $(DTCODEGEN) -changed -merge -p $(PROJFILE).bip message_ed.bil
+message_ed_ui.o: message_ed_ui.c message_ed_ui.h message_ed.bil
+message_ed_stubs.o: message_ed_stubs.c message_ed_ui.c message_ed_ui.h message_ed.bil
+
+palette_ui.c palette_ui.h palette_stubs.c: $(PROJFILE).bip palette.bil
+ $(DTCODEGEN) -changed -merge -p $(PROJFILE).bip palette.bil
+palette_ui.o: palette_ui.c palette_ui.h palette.bil
+palette_stubs.o: palette_stubs.c palette_ui.c palette_ui.h palette.bil
+
+panedwin_ed_ui.c panedwin_ed_ui.h panedwin_ed_stubs.c: $(PROJFILE).bip panedwin_ed.bil
+ $(DTCODEGEN) -changed -merge -p $(PROJFILE).bip panedwin_ed.bil
+panedwin_ed_ui.o: panedwin_ed_ui.c panedwin_ed_ui.h panedwin_ed.bil
+panedwin_ed_stubs.o: panedwin_ed_stubs.c panedwin_ed_ui.c panedwin_ed_ui.h panedwin_ed.bil
+
+proj_ui.c proj_ui.h proj_stubs.c: $(PROJFILE).bip proj.bil
+ $(DTCODEGEN) -changed -merge -p $(PROJFILE).bip proj.bil
+proj_ui.o: proj_ui.c proj_ui.h proj.bil
+proj_stubs.o: proj_stubs.c proj_ui.c proj_ui.h proj.bil
+
+revolv_ui.c revolv_ui.h revolv_stubs.c: $(PROJFILE).bip revolv.bil
+ $(DTCODEGEN) -changed -merge -p $(PROJFILE).bip revolv.bil
+revolv_ui.o: revolv_ui.c revolv_ui.h revolv.bil
+revolv_stubs.o: revolv_stubs.c revolv_ui.c revolv_ui.h revolv.bil
+
+scale_ui.c scale_ui.h scale_stubs.c: $(PROJFILE).bip scale.bil
+ $(DTCODEGEN) -changed -merge -p $(PROJFILE).bip scale.bil
+scale_ui.o: scale_ui.c scale_ui.h scale.bil
+scale_stubs.o: scale_stubs.c scale_ui.c scale_ui.h scale.bil
+
+sep_ui.c sep_ui.h sep_stubs.c: $(PROJFILE).bip sep.bil
+ $(DTCODEGEN) -changed -merge -p $(PROJFILE).bip sep.bil
+sep_ui.o: sep_ui.c sep_ui.h sep.bil
+sep_stubs.o: sep_stubs.c sep_ui.c sep_ui.h sep.bil
+
+spinbox_ui.c spinbox_ui.h spinbox_stubs.c: $(PROJFILE).bip spinbox.bil
+ $(DTCODEGEN) -changed -merge -p $(PROJFILE).bip spinbox.bil
+spinbox_ui.o: spinbox_ui.c spinbox_ui.h spinbox.bil
+spinbox_stubs.o: spinbox_stubs.c spinbox_ui.c spinbox_ui.h spinbox.bil
+
+termp_ui.c termp_ui.h termp_stubs.c: $(PROJFILE).bip termp.bil
+ $(DTCODEGEN) -changed -merge -p $(PROJFILE).bip termp.bil
+termp_ui.o: termp_ui.c termp_ui.h termp.bil
+termp_stubs.o: termp_stubs.c termp_ui.c termp_ui.h termp.bil
+
+textf_ui.c textf_ui.h textf_stubs.c: $(PROJFILE).bip textf.bil
+ $(DTCODEGEN) -changed -merge -p $(PROJFILE).bip textf.bil
+textf_ui.o: textf_ui.c textf_ui.h textf.bil
+textf_stubs.o: textf_stubs.c textf_ui.c textf_ui.h textf.bil
+
+textp_ui.c textp_ui.h textp_stubs.c: $(PROJFILE).bip textp.bil
+ $(DTCODEGEN) -changed -merge -p $(PROJFILE).bip textp.bil
+textp_ui.o: textp_ui.c textp_ui.h textp.bil
+textp_stubs.o: textp_stubs.c textp_ui.c textp_ui.h textp.bil
+
+endif
diff --git a/cde/programs/dtappbuilder/src/ab/ab_bil.c b/cde/programs/dtappbuilder/src/ab/ab_bil.c
index 1df81051..c787346b 100644
--- a/cde/programs/dtappbuilder/src/ab/ab_bil.c
+++ b/cde/programs/dtappbuilder/src/ab/ab_bil.c
@@ -48,6 +48,7 @@
#include <time.h>
#include <sys/param.h> /* MAXPATHLEN */
#include <errno.h>
+#include "dtb_utils.h"
#include <ab_private/obj.h>
#include <ab_private/trav.h>
#include <ab_private/bil.h>
diff --git a/cde/programs/dtappbuilder/src/ab/ab_dnd.c b/cde/programs/dtappbuilder/src/ab/ab_dnd.c
index 4bf3f58c..ce4f68e8 100644
--- a/cde/programs/dtappbuilder/src/ab/ab_dnd.c
+++ b/cde/programs/dtappbuilder/src/ab/ab_dnd.c
@@ -47,6 +47,7 @@
#include <Dt/Dt.h>
#include <Dt/Dts.h>
#include <Dt/Dnd.h>
+#include "dtb_utils.h"
#include <ab_private/ab.h>
#include <ab_private/ab_dnd.h>
#include <ab_private/ab_bil.h>
diff --git a/cde/programs/dtappbuilder/src/ab/ab_utils.c b/cde/programs/dtappbuilder/src/ab/ab_utils.c
index 520056de..37b22021 100644
--- a/cde/programs/dtappbuilder/src/ab/ab_utils.c
+++ b/cde/programs/dtappbuilder/src/ab/ab_utils.c
@@ -50,6 +50,7 @@
#include <Xm/Xm.h>
#include <Xm/MessageB.h>
#include <X11/cursorfont.h>
+#include "dtb_utils.h"
#include <ab_private/ab.h>
#include <ab_private/abobj.h>
#include <ab_private/abobj_set.h>
@@ -62,7 +63,6 @@
#include <ab_private/cgen.h>
#include <ab_private/ui_util.h>
#include "palette_ui.h"
-#include "dtb_utils.h"
typedef struct INIT_WIN_POS {
diff --git a/cde/programs/dtappbuilder/src/ab/abobj_align.c b/cde/programs/dtappbuilder/src/ab/abobj_align.c
index 1532a0cc..2b938575 100644
--- a/cde/programs/dtappbuilder/src/ab/abobj_align.c
+++ b/cde/programs/dtappbuilder/src/ab/abobj_align.c
@@ -58,6 +58,7 @@
#include <Xm/RowColumn.h>
#include <Xm/TextF.h>
#include <Xm/Text.h>
+#include "dtb_utils.h"
#include <ab_private/trav.h>
#include <ab_private/proj.h>
#include <Dt/xpm.h> /* will this be in include/Dt? */
diff --git a/cde/programs/dtappbuilder/src/ab/abobj_edit.c b/cde/programs/dtappbuilder/src/ab/abobj_edit.c
index bd9c4c54..68545d58 100644
--- a/cde/programs/dtappbuilder/src/ab/abobj_edit.c
+++ b/cde/programs/dtappbuilder/src/ab/abobj_edit.c
@@ -51,6 +51,7 @@
#include <stdio.h>
#include <sys/param.h>
#include <Xm/Xm.h>
+#include "dtb_utils.h"
#include <ab_private/trav.h>
#include <ab_private/ui_util.h>
#include <ab_private/brws.h>
diff --git a/cde/programs/dtappbuilder/src/ab/abobj_events.c b/cde/programs/dtappbuilder/src/ab/abobj_events.c
index 39699c11..5c595e09 100644
--- a/cde/programs/dtappbuilder/src/ab/abobj_events.c
+++ b/cde/programs/dtappbuilder/src/ab/abobj_events.c
@@ -61,6 +61,7 @@
#include <Dt/ComboBox.h>
#include <Dt/MenuButton.h>
#include <Dt/SpinBox.h>
+#include "dtb_utils.h"
#include <ab_private/trav.h>
#include <ab_private/objxm.h>
#include <ab_private/ab.h>
diff --git a/cde/programs/dtappbuilder/src/ab/abobj_layers.c b/cde/programs/dtappbuilder/src/ab/abobj_layers.c
index c3519da6..9e90f2ca 100644
--- a/cde/programs/dtappbuilder/src/ab/abobj_layers.c
+++ b/cde/programs/dtappbuilder/src/ab/abobj_layers.c
@@ -51,6 +51,7 @@
#include <X11/Intrinsic.h>
#include <Xm/Xm.h>
#include <Xm/Form.h>
+#include "dtb_utils.h"
#include <ab_private/trav.h>
#include <ab_private/obj_notify.h>
#include <ab_private/objxm.h>
diff --git a/cde/programs/dtappbuilder/src/ab/abobj_layout.c b/cde/programs/dtappbuilder/src/ab/abobj_layout.c
index 1557a359..30c3a021 100644
--- a/cde/programs/dtappbuilder/src/ab/abobj_layout.c
+++ b/cde/programs/dtappbuilder/src/ab/abobj_layout.c
@@ -52,6 +52,7 @@
#include <X11/Intrinsic.h>
#include <X11/StringDefs.h>
#include <Xm/Xm.h>
+#include "dtb_utils.h"
#include <ab_private/objxm.h>
#include <ab_private/trav.h>
#include "abobjP.h"
diff --git a/cde/programs/dtappbuilder/src/ab/abobj_list.c b/cde/programs/dtappbuilder/src/ab/abobj_list.c
index 0dfab9d0..dec1c11d 100644
--- a/cde/programs/dtappbuilder/src/ab/abobj_list.c
+++ b/cde/programs/dtappbuilder/src/ab/abobj_list.c
@@ -46,6 +46,7 @@
#include <stdio.h>
#include <Xm/List.h>
+#include "dtb_utils.h"
#include <ab_private/abobj_list.h>
#include <ab_private/ui_util.h>
#include <ab_private/trav.h>
diff --git a/cde/programs/dtappbuilder/src/ab/abobj_menu.c b/cde/programs/dtappbuilder/src/ab/abobj_menu.c
index e34ad8f1..8865aaab 100644
--- a/cde/programs/dtappbuilder/src/ab/abobj_menu.c
+++ b/cde/programs/dtappbuilder/src/ab/abobj_menu.c
@@ -53,7 +53,8 @@
#include <Xm/CascadeB.h>
#include <Xm/MenuShell.h>
#include <Xm/RowColumn.h> /* XmMenuPosition() */
-#include <Xm/Separator.h>
+#include <Xm/Separator.h>
+#include "dtb_utils.h"
#include <ab_private/objxm.h>
#include <ab_private/ui_util.h>
#include <ab_private/brws.h>
diff --git a/cde/programs/dtappbuilder/src/ab/abobj_move.c b/cde/programs/dtappbuilder/src/ab/abobj_move.c
index 5c3439b6..37965875 100644
--- a/cde/programs/dtappbuilder/src/ab/abobj_move.c
+++ b/cde/programs/dtappbuilder/src/ab/abobj_move.c
@@ -51,6 +51,7 @@
#include <stdio.h>
#include <X11/Intrinsic.h>
#include <X11/StringDefs.h>
+#include "dtb_utils.h"
#include <ab_private/x_util.h>
#include <ab_private/objxm.h>
#include <ab_private/abobj_edit.h>
diff --git a/cde/programs/dtappbuilder/src/ab/abobj_resize.c b/cde/programs/dtappbuilder/src/ab/abobj_resize.c
index 680441f5..3cda041f 100644
--- a/cde/programs/dtappbuilder/src/ab/abobj_resize.c
+++ b/cde/programs/dtappbuilder/src/ab/abobj_resize.c
@@ -52,6 +52,7 @@
#include <stdio.h>
#include <X11/cursorfont.h>
#include <Xm/ScrolledW.h>
+#include "dtb_utils.h"
#include <ab_private/objxm.h>
#include <ab_private/prop.h>
#include <ab_private/x_util.h>
diff --git a/cde/programs/dtappbuilder/src/ab/abobj_select.c b/cde/programs/dtappbuilder/src/ab/abobj_select.c
index 80b9ae58..4c748083 100644
--- a/cde/programs/dtappbuilder/src/ab/abobj_select.c
+++ b/cde/programs/dtappbuilder/src/ab/abobj_select.c
@@ -55,6 +55,7 @@
#include <X11/StringDefs.h>
#include <Xm/Xm.h>
#include <Xm/ScrolledW.h>
+#include "dtb_utils.h"
#include <ab_private/trav.h>
#include <ab_private/ui_util.h>
#include <ab_private/x_util.h>
diff --git a/cde/programs/dtappbuilder/src/ab/abobj_set.c b/cde/programs/dtappbuilder/src/ab/abobj_set.c
index 868bb1a4..56360abd 100644
--- a/cde/programs/dtappbuilder/src/ab/abobj_set.c
+++ b/cde/programs/dtappbuilder/src/ab/abobj_set.c
@@ -56,6 +56,7 @@
#include <Xm/List.h>
#include <Dt/SpinBox.h>
#include <Dt/ComboBox.h>
+#include "dtb_utils.h"
#include <ab_private/obj.h>
#include <ab_private/trav.h>
#include <ab_private/objxm.h>
diff --git a/cde/programs/dtappbuilder/src/ab/abobj_util.c b/cde/programs/dtappbuilder/src/ab/abobj_util.c
index 865852b3..c12071ff 100644
--- a/cde/programs/dtappbuilder/src/ab/abobj_util.c
+++ b/cde/programs/dtappbuilder/src/ab/abobj_util.c
@@ -56,6 +56,7 @@
#include <Xm/Xm.h>
#include <Xm/Form.h>
#include <Xm/ScrolledW.h>
+#include "dtb_utils.h"
#include <ab_private/trav.h>
#include <ab_private/objxm.h>
#include <ab_private/ab.h>
diff --git a/cde/programs/dtappbuilder/src/ab/brws.c b/cde/programs/dtappbuilder/src/ab/brws.c
index 85a5ee89..f71a872f 100644
--- a/cde/programs/dtappbuilder/src/ab/brws.c
+++ b/cde/programs/dtappbuilder/src/ab/brws.c
@@ -60,6 +60,7 @@
#include <Xm/SelectioB.h>
#include <Xm/ScrolledW.h>
#include <Xm/PushB.h>
+#include "dtb_utils.h"
#include <ab_private/obj.h>
#include <ab_private/obj_notify.h>
#include <ab_private/trav.h>
diff --git a/cde/programs/dtappbuilder/src/ab/brws_find.c b/cde/programs/dtappbuilder/src/ab/brws_find.c
index 18043c66..b5ddb119 100644
--- a/cde/programs/dtappbuilder/src/ab/brws_find.c
+++ b/cde/programs/dtappbuilder/src/ab/brws_find.c
@@ -49,6 +49,7 @@
#include <Xm/Xm.h>
#include <Xm/ScrollBar.h>
#include <Xm/SelectioB.h>
+#include "dtb_utils.h"
#include <ab_private/obj.h>
#include <ab/util_types.h>
#include <ab_private/abobj.h>
diff --git a/cde/programs/dtappbuilder/src/ab/brws_mthds.c b/cde/programs/dtappbuilder/src/ab/brws_mthds.c
index 471be74d..45cf4307 100644
--- a/cde/programs/dtappbuilder/src/ab/brws_mthds.c
+++ b/cde/programs/dtappbuilder/src/ab/brws_mthds.c
@@ -50,6 +50,7 @@
#include <X11/Xlib.h>
#include <Xm/Xm.h>
#include <Xm/DialogS.h>
+#include "dtb_utils.h"
#include <ab_private/obj.h>
#include <ab_private/trav.h>
#include <ab_private/istr.h>
diff --git a/cde/programs/dtappbuilder/src/ab/cgen_utils.c b/cde/programs/dtappbuilder/src/ab/cgen_utils.c
index f7cd2fe5..ceeea203 100644
--- a/cde/programs/dtappbuilder/src/ab/cgen_utils.c
+++ b/cde/programs/dtappbuilder/src/ab/cgen_utils.c
@@ -70,6 +70,7 @@
#include <Dt/TermPrim.h>
#include <Dt/Term.h>
+#include "dtb_utils.h"
#include <ab_private/ab.h>
#include <ab_private/abobj_set.h>
#include <ab_private/proj.h>
diff --git a/cde/programs/dtappbuilder/src/ab/conn_interpret.c b/cde/programs/dtappbuilder/src/ab/conn_interpret.c
index 02871bee..415ff773 100644
--- a/cde/programs/dtappbuilder/src/ab/conn_interpret.c
+++ b/cde/programs/dtappbuilder/src/ab/conn_interpret.c
@@ -42,6 +42,7 @@
#include <stdio.h>
#include <Dt/SpinBox.h>
+#include "dtb_utils.h"
#include <ab_private/XmAll.h>
#include <ab_private/obj.h>
#include <ab_private/trav.h>
diff --git a/cde/programs/dtappbuilder/src/ab/pal.c b/cde/programs/dtappbuilder/src/ab/pal.c
index 296e0092..68eb6700 100644
--- a/cde/programs/dtappbuilder/src/ab/pal.c
+++ b/cde/programs/dtappbuilder/src/ab/pal.c
@@ -42,6 +42,7 @@
*/
#include <stdio.h>
#include <string.h>
+#include "dtb_utils.h"
#include <Xm/Xm.h>
#include <Xm/PushB.h>
#include <Xm/RowColumn.h>
diff --git a/cde/programs/dtappbuilder/src/ab/pal_button.c b/cde/programs/dtappbuilder/src/ab/pal_button.c
index c34104b5..70d70447 100644
--- a/cde/programs/dtappbuilder/src/ab/pal_button.c
+++ b/cde/programs/dtappbuilder/src/ab/pal_button.c
@@ -46,6 +46,7 @@
*/
#include <stdio.h>
#include <Xm/Xm.h>
+#include "dtb_utils.h"
#include <ab_private/ab.h>
#include <ab_private/pal.h>
#include <ab_private/prop.h>
diff --git a/cde/programs/dtappbuilder/src/ab/pal_choice.c b/cde/programs/dtappbuilder/src/ab/pal_choice.c
index bd5af6dd..eb8a7731 100644
--- a/cde/programs/dtappbuilder/src/ab/pal_choice.c
+++ b/cde/programs/dtappbuilder/src/ab/pal_choice.c
@@ -45,6 +45,7 @@
*/
#include <stdio.h>
#include <Xm/Xm.h>
+#include "dtb_utils.h"
#include <ab_private/trav.h>
#include <ab_private/pal.h>
#include <ab_private/ab.h>
diff --git a/cde/programs/dtappbuilder/src/ab/pal_combobox.c b/cde/programs/dtappbuilder/src/ab/pal_combobox.c
index f637de9a..838ede49 100644
--- a/cde/programs/dtappbuilder/src/ab/pal_combobox.c
+++ b/cde/programs/dtappbuilder/src/ab/pal_combobox.c
@@ -47,6 +47,7 @@
#include <stdint.h>
#include <stdio.h>
#include <Xm/Xm.h>
+#include "dtb_utils.h"
#include <ab_private/obj_notify.h>
#include <ab_private/ab.h>
#include <ab_private/pal.h>
diff --git a/cde/programs/dtappbuilder/src/ab/pal_cpanel.c b/cde/programs/dtappbuilder/src/ab/pal_cpanel.c
index 011b39b6..19dca2e3 100644
--- a/cde/programs/dtappbuilder/src/ab/pal_cpanel.c
+++ b/cde/programs/dtappbuilder/src/ab/pal_cpanel.c
@@ -46,6 +46,7 @@
*/
#include <stdio.h>
#include <Xm/Xm.h>
+#include "dtb_utils.h"
#include <ab_private/pal.h>
#include <ab_private/ab.h>
#include <ab_private/prop.h>
diff --git a/cde/programs/dtappbuilder/src/ab/pal_create.c b/cde/programs/dtappbuilder/src/ab/pal_create.c
index 68c00d3b..a7099686 100644
--- a/cde/programs/dtappbuilder/src/ab/pal_create.c
+++ b/cde/programs/dtappbuilder/src/ab/pal_create.c
@@ -61,6 +61,7 @@
#include <Xm/Scale.h>
#include <Dt/SpinBox.h>
#include <Dt/ComboBox.h>
+#include "dtb_utils.h"
#include <ab_private/trav.h>
#include <ab_private/objxm.h>
#include <ab_private/brws.h>
diff --git a/cde/programs/dtappbuilder/src/ab/pal_custdlg.c b/cde/programs/dtappbuilder/src/ab/pal_custdlg.c
index 4293fee3..ae1913ae 100644
--- a/cde/programs/dtappbuilder/src/ab/pal_custdlg.c
+++ b/cde/programs/dtappbuilder/src/ab/pal_custdlg.c
@@ -47,6 +47,7 @@
#include <stdint.h>
#include <stdio.h>
#include <Xm/Xm.h>
+#include "dtb_utils.h"
#include <ab_private/util.h>
#include <ab_private/ab.h>
#include <ab_private/pal.h>
diff --git a/cde/programs/dtappbuilder/src/ab/pal_drawp.c b/cde/programs/dtappbuilder/src/ab/pal_drawp.c
index 3159e5ac..5cc00f24 100644
--- a/cde/programs/dtappbuilder/src/ab/pal_drawp.c
+++ b/cde/programs/dtappbuilder/src/ab/pal_drawp.c
@@ -46,6 +46,7 @@
*/
#include <stdio.h>
#include <Xm/Xm.h>
+#include "dtb_utils.h"
#include <ab_private/util.h>
#include <ab_private/ab.h>
#include <ab_private/pal.h>
diff --git a/cde/programs/dtappbuilder/src/ab/pal_fchooser.c b/cde/programs/dtappbuilder/src/ab/pal_fchooser.c
index 7aa8b519..0bccdf06 100644
--- a/cde/programs/dtappbuilder/src/ab/pal_fchooser.c
+++ b/cde/programs/dtappbuilder/src/ab/pal_fchooser.c
@@ -46,6 +46,7 @@
*/
#include <stdio.h>
#include <Xm/Xm.h>
+#include "dtb_utils.h"
#include <ab_private/util.h>
#include <ab_private/ab.h>
#include <ab_private/pal.h>
diff --git a/cde/programs/dtappbuilder/src/ab/pal_group.c b/cde/programs/dtappbuilder/src/ab/pal_group.c
index 8e6e61a9..76f04dfc 100644
--- a/cde/programs/dtappbuilder/src/ab/pal_group.c
+++ b/cde/programs/dtappbuilder/src/ab/pal_group.c
@@ -50,6 +50,7 @@
#include <stdio.h>
#include <X11/Xlib.h>
#include <Xm/Xm.h>
+#include "dtb_utils.h"
#include <ab_private/ab.h>
#include <ab_private/trav.h>
#include <ab_private/pal.h>
diff --git a/cde/programs/dtappbuilder/src/ab/pal_label.c b/cde/programs/dtappbuilder/src/ab/pal_label.c
index 0ba76436..698f942f 100644
--- a/cde/programs/dtappbuilder/src/ab/pal_label.c
+++ b/cde/programs/dtappbuilder/src/ab/pal_label.c
@@ -46,6 +46,7 @@
*/
#include <stdio.h>
#include <Xm/Xm.h>
+#include "dtb_utils.h"
#include <ab_private/ab.h>
#include <ab_private/abobj.h>
#include <ab_private/abobj_set.h>
diff --git a/cde/programs/dtappbuilder/src/ab/pal_list.c b/cde/programs/dtappbuilder/src/ab/pal_list.c
index 7e993ab1..5146c2a8 100644
--- a/cde/programs/dtappbuilder/src/ab/pal_list.c
+++ b/cde/programs/dtappbuilder/src/ab/pal_list.c
@@ -47,6 +47,7 @@
#include <stdint.h>
#include <stdio.h>
#include <Xm/Xm.h>
+#include "dtb_utils.h"
#include <ab_private/obj_notify.h>
#include <ab_private/objxm.h>
#include <ab_private/ab.h>
diff --git a/cde/programs/dtappbuilder/src/ab/pal_mainwin.c b/cde/programs/dtappbuilder/src/ab/pal_mainwin.c
index 2a4d1df6..40988f89 100644
--- a/cde/programs/dtappbuilder/src/ab/pal_mainwin.c
+++ b/cde/programs/dtappbuilder/src/ab/pal_mainwin.c
@@ -46,6 +46,7 @@
#include <stdint.h>
#include <stdio.h>
#include <Xm/Xm.h>
+#include "dtb_utils.h"
#include <ab_private/ab.h>
#include <ab_private/pal.h>
#include <ab_private/prop.h>
diff --git a/cde/programs/dtappbuilder/src/ab/pal_menu.c b/cde/programs/dtappbuilder/src/ab/pal_menu.c
index 2c62da00..c83b4453 100644
--- a/cde/programs/dtappbuilder/src/ab/pal_menu.c
+++ b/cde/programs/dtappbuilder/src/ab/pal_menu.c
@@ -47,6 +47,7 @@
#include <stdint.h>
#include <stdio.h>
#include <Xm/Xm.h>
+#include "dtb_utils.h"
#include <ab_private/obj_notify.h>
#include <ab_private/trav.h>
#include <ab_private/objxm.h>
diff --git a/cde/programs/dtappbuilder/src/ab/pal_menubar.c b/cde/programs/dtappbuilder/src/ab/pal_menubar.c
index 5049a29e..d40d52ff 100644
--- a/cde/programs/dtappbuilder/src/ab/pal_menubar.c
+++ b/cde/programs/dtappbuilder/src/ab/pal_menubar.c
@@ -46,6 +46,7 @@
*/
#include <stdio.h>
#include <Xm/Xm.h>
+#include "dtb_utils.h"
#include <ab_private/obj_notify.h>
#include <ab_private/objxm.h>
#include <ab_private/ab.h>
diff --git a/cde/programs/dtappbuilder/src/ab/pal_panedwin.c b/cde/programs/dtappbuilder/src/ab/pal_panedwin.c
index 1adcda1c..17d72820 100644
--- a/cde/programs/dtappbuilder/src/ab/pal_panedwin.c
+++ b/cde/programs/dtappbuilder/src/ab/pal_panedwin.c
@@ -50,6 +50,7 @@
#include <sys/param.h> /* MAXPATHLEN */
#include <Xm/Xm.h>
#include <Xm/List.h>
+#include "dtb_utils.h"
#include <ab/util_types.h>
#include <ab_private/ab.h>
#include <ab_private/obj.h>
diff --git a/cde/programs/dtappbuilder/src/ab/pal_scale.c b/cde/programs/dtappbuilder/src/ab/pal_scale.c
index a6fd5128..4d26426c 100644
--- a/cde/programs/dtappbuilder/src/ab/pal_scale.c
+++ b/cde/programs/dtappbuilder/src/ab/pal_scale.c
@@ -47,6 +47,7 @@
#include <stdint.h>
#include <stdio.h>
#include <Xm/Xm.h>
+#include "dtb_utils.h"
#include <ab_private/ab.h>
#include <ab_private/pal.h>
#include <ab_private/prop.h>
diff --git a/cde/programs/dtappbuilder/src/ab/pal_sep.c b/cde/programs/dtappbuilder/src/ab/pal_sep.c
index 92eb2f2f..b945acc8 100644
--- a/cde/programs/dtappbuilder/src/ab/pal_sep.c
+++ b/cde/programs/dtappbuilder/src/ab/pal_sep.c
@@ -46,6 +46,7 @@
*/
#include <stdio.h>
#include <Xm/Xm.h>
+#include "dtb_utils.h"
#include <ab_private/pal.h>
#include <ab_private/ab.h>
#include <ab_private/prop.h>
diff --git a/cde/programs/dtappbuilder/src/ab/pal_spinbox.c b/cde/programs/dtappbuilder/src/ab/pal_spinbox.c
index 4c2ad8a6..4dbaa036 100644
--- a/cde/programs/dtappbuilder/src/ab/pal_spinbox.c
+++ b/cde/programs/dtappbuilder/src/ab/pal_spinbox.c
@@ -46,6 +46,7 @@
*/
#include <stdio.h>
#include <Xm/Xm.h>
+#include "dtb_utils.h"
#include <ab_private/obj_notify.h>
#include <ab_private/pal.h>
#include <ab_private/ab.h>
diff --git a/cde/programs/dtappbuilder/src/ab/pal_termp.c b/cde/programs/dtappbuilder/src/ab/pal_termp.c
index ff86ff9a..5c7d474a 100644
--- a/cde/programs/dtappbuilder/src/ab/pal_termp.c
+++ b/cde/programs/dtappbuilder/src/ab/pal_termp.c
@@ -49,6 +49,7 @@
#include <Xm/Xm.h>
#include <Dt/TermPrim.h>
#include <Dt/Term.h>
+#include "dtb_utils.h"
#include <ab_private/util.h>
#include <ab_private/ab.h>
#include <ab_private/pal.h>
diff --git a/cde/programs/dtappbuilder/src/ab/pal_textf.c b/cde/programs/dtappbuilder/src/ab/pal_textf.c
index e8229b44..6eb4a801 100644
--- a/cde/programs/dtappbuilder/src/ab/pal_textf.c
+++ b/cde/programs/dtappbuilder/src/ab/pal_textf.c
@@ -47,6 +47,7 @@
#include <stdint.h>
#include <stdio.h>
#include <Xm/Xm.h>
+#include "dtb_utils.h"
#include <ab_private/pal.h>
#include <ab_private/ab.h>
#include <ab_private/prop.h>
diff --git a/cde/programs/dtappbuilder/src/ab/pal_textp.c b/cde/programs/dtappbuilder/src/ab/pal_textp.c
index dd22530d..9d512353 100644
--- a/cde/programs/dtappbuilder/src/ab/pal_textp.c
+++ b/cde/programs/dtappbuilder/src/ab/pal_textp.c
@@ -47,6 +47,7 @@
#include <stdint.h>
#include <stdio.h>
#include <Xm/Xm.h>
+#include "dtb_utils.h"
#include <ab_private/util.h>
#include <ab_private/ab.h>
#include <ab_private/pal.h>
diff --git a/cde/programs/dtappbuilder/src/ab/proj.c b/cde/programs/dtappbuilder/src/ab/proj.c
index cb319f59..6e10dd82 100644
--- a/cde/programs/dtappbuilder/src/ab/proj.c
+++ b/cde/programs/dtappbuilder/src/ab/proj.c
@@ -46,6 +46,7 @@
#include <Xm/Xm.h>
#include <Xm/BulletinB.h>
#include <Xm/SelectioB.h>
+#include "dtb_utils.h"
#include <ab_private/ab.h>
#include <ab_private/bil.h>
#include <ab_private/abobj.h>
diff --git a/cde/programs/dtappbuilder/src/ab/projP_utils.c b/cde/programs/dtappbuilder/src/ab/projP_utils.c
index 77dce554..45ae0a57 100644
--- a/cde/programs/dtappbuilder/src/ab/projP_utils.c
+++ b/cde/programs/dtappbuilder/src/ab/projP_utils.c
@@ -50,6 +50,7 @@
#include <Xm/Xm.h>
#include <Xm/FileSB.h>
#include <Xm/TextF.h>
+#include "dtb_utils.h"
#include <ab_private/ab.h>
#include <ab_private/proj.h>
#include <ab_private/projP.h>
diff --git a/cde/programs/dtappbuilder/src/ab/proj_utils.c b/cde/programs/dtappbuilder/src/ab/proj_utils.c
index ad74deed..4beec0ab 100644
--- a/cde/programs/dtappbuilder/src/ab/proj_utils.c
+++ b/cde/programs/dtappbuilder/src/ab/proj_utils.c
@@ -54,6 +54,7 @@
#include <Xm/FileSB.h>
#include <Xm/TextF.h>
#include <Xm/ToggleB.h>
+#include "dtb_utils.h"
#include <ab_private/ab.h>
#include <ab_private/obj.h>
#include <ab_private/brws.h>
diff --git a/cde/programs/dtappbuilder/src/ab/prop.c b/cde/programs/dtappbuilder/src/ab/prop.c
index b44752c1..41b0fd37 100644
--- a/cde/programs/dtappbuilder/src/ab/prop.c
+++ b/cde/programs/dtappbuilder/src/ab/prop.c
@@ -67,6 +67,7 @@
#include <Xm/Text.h>
#include <Xm/TextF.h>
#include <Xm/ToggleB.h>
+#include "dtb_utils.h"
#include <ab_private/trav.h>
#include <ab_private/obj_notify.h>
#include <ab_private/objxm.h>
diff --git a/cde/programs/dtappbuilder/src/ab/prop_items.c b/cde/programs/dtappbuilder/src/ab/prop_items.c
index aef076a0..fdec6ccd 100644
--- a/cde/programs/dtappbuilder/src/ab/prop_items.c
+++ b/cde/programs/dtappbuilder/src/ab/prop_items.c
@@ -68,6 +68,7 @@
#include <Xm/ToggleB.h>
#include <Dt/ComboBox.h>
#include <Dt/SpinBox.h>
+#include "dtb_utils.h"
#include <ab_private/trav.h>
#include <ab_private/obj_notify.h>
#include <ab_private/objxm.h>
diff --git a/cde/programs/dtappbuilder/src/ab/tmodeP.c b/cde/programs/dtappbuilder/src/ab/tmodeP.c
index a2cd8249..bc22c2e9 100644
--- a/cde/programs/dtappbuilder/src/ab/tmodeP.c
+++ b/cde/programs/dtappbuilder/src/ab/tmodeP.c
@@ -46,6 +46,7 @@
*/
#include "tmodeP.h"
+#include "dtb_utils.h"
#include <ab_private/trav.h>
#include <ab_private/util.h>
#include <ab_private/ui_util.h>
diff --git a/cde/programs/dtappbuilder/src/ab/ui_list.c b/cde/programs/dtappbuilder/src/ab/ui_list.c
index cf1393d5..6f64644e 100644
--- a/cde/programs/dtappbuilder/src/ab/ui_list.c
+++ b/cde/programs/dtappbuilder/src/ab/ui_list.c
@@ -47,6 +47,7 @@
#include <Xm/Xm.h>
#include <Xm/List.h>
#include <Dt/ComboBox.h>
+#include "dtb_utils.h"
#include <ab_private/objxm.h>
#include <ab_private/ui_util.h>
diff --git a/cde/programs/dtappbuilder/src/ab/ui_msg.c b/cde/programs/dtappbuilder/src/ab/ui_msg.c
index dc39cc79..558a2b20 100644
--- a/cde/programs/dtappbuilder/src/ab/ui_msg.c
+++ b/cde/programs/dtappbuilder/src/ab/ui_msg.c
@@ -55,6 +55,7 @@
#include <Xm/SelectioB.h>
#include <Xm/PushB.h>
#include <Xm/TextF.h>
+#include "dtb_utils.h"
#include <ab_private/ab.h>
#include <ab_private/objxm.h>
#include <ab_private/ui_util.h>
diff --git a/cde/programs/dtappbuilder/src/ab/ui_util.c b/cde/programs/dtappbuilder/src/ab/ui_util.c
index 40e69674..ddfb47c1 100644
--- a/cde/programs/dtappbuilder/src/ab/ui_util.c
+++ b/cde/programs/dtappbuilder/src/ab/ui_util.c
@@ -77,6 +77,7 @@
#include <Dt/SpinBox.h>
#include <Dt/TermPrim.h>
#include <Dt/Term.h>
+#include "dtb_utils.h"
#include <ab_private/XmAll.h>
#include <ab_private/x_util.h>
#include <ab_private/ui_util.h>
diff --git a/cde/programs/dtappbuilder/src/abmf/Makefile.am b/cde/programs/dtappbuilder/src/abmf/Makefile.am
new file mode 100644
index 00000000..673e8745
--- /dev/null
+++ b/cde/programs/dtappbuilder/src/abmf/Makefile.am
@@ -0,0 +1,72 @@
+MAINTAINERCLEANFILES = Makefile.in
+
+ABINCLUDES = ../include
+
+EXTRA_DEFINES = -D_POSIX_SOURCE=1
+
+if HPUX
+CCOPTIONS = -Ae
+endif
+
+if AIX
+CCOPTIONS = -qnoro
+endif
+
+if BSD
+UTILLIB = -lutil
+endif
+
+SOURCES.msg = \
+ dtcodegen.msg \
+ ../libAButil/libAButil.msg \
+ ../libABobjXm/libABobjXm.msg \
+ ../libABil/libABil.msg
+
+bin_PROGRAMS = dtcodegen
+
+#noinst_PROGRAMS = ab_func_strings test_parse test_merge
+
+noinst_DATA = dtcodegen.cat
+
+dtcodegen_CFLAGS = $(EXTRA_DEFINES) -I$(ABINCLUDES) -I../libABil
+
+dtcodegen_LDADD = -lXext ../libABil/libABil.a \
+ ../libABobjXm/libABobjXm.a \
+ ../libABobj/libABobj.a ../libAButil/libAButil.a \
+ $(LIBTERM) $(LIBSVC) $(LIBTT) $(LIBHELP) $(LIBXIN) \
+ $(LIBWIDGET) $(UTILLIB) $(XTOOLLIB) -lm
+
+
+dtcodegen_SOURCES = abmf.c args.c \
+ cdefs.c connect.c \
+ create_decls.c dtb_utils.c \
+ generate_code.c instances.c \
+ lib_func_strings.c make_file.c \
+ merge_c.c motifdefs.c \
+ msg_cvt.c msg_file.c \
+ obj_names.c parse_c.c \
+ proj_c_file.c proj_header_file.c \
+ resource_file.c stubs_c_file.c \
+ ui_c_file.c ui_header_file.c \
+ utils.c utils_c_file.c \
+ utils_header_file.c write_c.c \
+ write_code.c
+
+#ab_func_strings_LDADD = -lm ../libAButil/libAButil.a
+
+#ab_func_strings_SOURCES = ab_func_strings.c
+
+#test_parse_CFLAGS = -DMAIN -D_POSIX_SOURCE=1 -I$(ABINCLUDES)
+
+#test_parse_LDADD = ../libAButil/libAButil.a
+
+#test_parse_SOURCES = parse_c.c
+
+#test_merge_CFLAGS = -DMAIN -D_POSIX_SOURCE=1 -I$(ABINCLUDES)
+
+#test_merge_LDADD = ../libAButil/libAButil.a parse_c.o
+
+#test_merge_SOURCES = merge_c.c
+
+dtcodegen.cat:: $(SOURCES.msg)
+ $(GENCAT) dtcodegen.cat $(SOURCES.msg)
diff --git a/cde/programs/dtappbuilder/src/abmf/abmf.c b/cde/programs/dtappbuilder/src/abmf/abmf.c
index 011548f9..5e64524c 100644
--- a/cde/programs/dtappbuilder/src/abmf/abmf.c
+++ b/cde/programs/dtappbuilder/src/abmf/abmf.c
@@ -53,7 +53,7 @@
#include <ab_private/obj.h>
#include <ab_private/objxm.h>
#include <ab_private/bil.h>
-#include "dtb_utils.h"
+#include <ab_private/dtb_utils.h>
#include "write_codeP.h"
#include "motifdefsP.h"
#include "argsP.h"
@@ -61,7 +61,7 @@
#include "instancesP.h"
#include "ui_header_fileP.h"
#include "abmfP.h"
-#include "abmf.h"
+#include <ab_private/abmf.h>
/* glibc considers CLK_TCK obsolete */
#if defined(__linux__) && !defined(CLK_TCK)
diff --git a/cde/programs/dtappbuilder/src/abmf/abmfP.h b/cde/programs/dtappbuilder/src/abmf/abmfP.h
index a19496c3..a7a39962 100644
--- a/cde/programs/dtappbuilder/src/abmf/abmfP.h
+++ b/cde/programs/dtappbuilder/src/abmf/abmfP.h
@@ -56,7 +56,7 @@
#include <ab_private/obj.h>
#include <ab_private/trav.h>
#include <ab_private/strlist.h>
-#include "abmf.h"
+#include <ab_private/abmf.h>
/*
* Constants
diff --git a/cde/programs/dtappbuilder/src/abmf/dtb_utils.c b/cde/programs/dtappbuilder/src/abmf/dtb_utils.c
index 7737260f..bfdf92c3 100644
--- a/cde/programs/dtappbuilder/src/abmf/dtb_utils.c
+++ b/cde/programs/dtappbuilder/src/abmf/dtb_utils.c
@@ -52,7 +52,7 @@
#include <sys/param.h>
#include <sys/stat.h>
#include <ab_private/util.h>
-#include "dtb_utils.h"
+#include <ab_private/dtb_utils.h>
/*
* Map Xt/Xm symbols to symbols we have defined
diff --git a/cde/programs/dtappbuilder/src/abmf/generate_code.c b/cde/programs/dtappbuilder/src/abmf/generate_code.c
index 0d44d35e..72e49357 100644
--- a/cde/programs/dtappbuilder/src/abmf/generate_code.c
+++ b/cde/programs/dtappbuilder/src/abmf/generate_code.c
@@ -53,7 +53,7 @@
#include <assert.h>
#include <ab_private/util.h>
#include <ab_private/abio.h>
-#include "dtb_utils.h"
+#include <ab_private/dtb_utils.h>
#include "msg_file.h"
#include "obj_namesP.h"
#include "write_codeP.h"
@@ -69,7 +69,7 @@
#include "instancesP.h"
#include "utils_header_fileP.h"
#include "utils_c_fileP.h"
-#include "abmf.h"
+#include <ab_private/abmf.h>
#include "msg_cvt.h"
/*************************************************************************
diff --git a/cde/programs/dtappbuilder/src/libAButil/util_types.h b/cde/programs/dtappbuilder/src/include/ab/util_types.h
similarity index 100%
rename from cde/programs/dtappbuilder/src/libAButil/util_types.h
rename to cde/programs/dtappbuilder/src/include/ab/util_types.h
diff --git a/cde/programs/dtappbuilder/src/libAButil/AB.h b/cde/programs/dtappbuilder/src/include/ab_private/AB.h
similarity index 100%
rename from cde/programs/dtappbuilder/src/libAButil/AB.h
rename to cde/programs/dtappbuilder/src/include/ab_private/AB.h
diff --git a/cde/programs/dtappbuilder/src/libAButil/MwmUtil.h b/cde/programs/dtappbuilder/src/include/ab_private/MwmUtil.h
similarity index 100%
rename from cde/programs/dtappbuilder/src/libAButil/MwmUtil.h
rename to cde/programs/dtappbuilder/src/include/ab_private/MwmUtil.h
diff --git a/cde/programs/dtappbuilder/src/libAButil/UilDef.h b/cde/programs/dtappbuilder/src/include/ab_private/UilDef.h
similarity index 100%
rename from cde/programs/dtappbuilder/src/libAButil/UilDef.h
rename to cde/programs/dtappbuilder/src/include/ab_private/UilDef.h
diff --git a/cde/programs/dtappbuilder/src/libAButil/XmAll.h b/cde/programs/dtappbuilder/src/include/ab_private/XmAll.h
similarity index 100%
rename from cde/programs/dtappbuilder/src/libAButil/XmAll.h
rename to cde/programs/dtappbuilder/src/include/ab_private/XmAll.h
diff --git a/cde/programs/dtappbuilder/src/ab/ab.h b/cde/programs/dtappbuilder/src/include/ab_private/ab.h
similarity index 100%
rename from cde/programs/dtappbuilder/src/ab/ab.h
rename to cde/programs/dtappbuilder/src/include/ab_private/ab.h
diff --git a/cde/programs/dtappbuilder/src/ab/ab_bil.h b/cde/programs/dtappbuilder/src/include/ab_private/ab_bil.h
similarity index 100%
rename from cde/programs/dtappbuilder/src/ab/ab_bil.h
rename to cde/programs/dtappbuilder/src/include/ab_private/ab_bil.h
diff --git a/cde/programs/dtappbuilder/src/ab/ab_dnd.h b/cde/programs/dtappbuilder/src/include/ab_private/ab_dnd.h
similarity index 100%
rename from cde/programs/dtappbuilder/src/ab/ab_dnd.h
rename to cde/programs/dtappbuilder/src/include/ab_private/ab_dnd.h
diff --git a/cde/programs/dtappbuilder/src/ab/ab_resources.h b/cde/programs/dtappbuilder/src/include/ab_private/ab_resources.h
similarity index 100%
rename from cde/programs/dtappbuilder/src/ab/ab_resources.h
rename to cde/programs/dtappbuilder/src/include/ab_private/ab_resources.h
diff --git a/cde/programs/dtappbuilder/src/ab/ab_utils.h b/cde/programs/dtappbuilder/src/include/ab_private/ab_utils.h
similarity index 100%
rename from cde/programs/dtappbuilder/src/ab/ab_utils.h
rename to cde/programs/dtappbuilder/src/include/ab_private/ab_utils.h
diff --git a/cde/programs/dtappbuilder/src/libAButil/abio.h b/cde/programs/dtappbuilder/src/include/ab_private/abio.h
similarity index 100%
rename from cde/programs/dtappbuilder/src/libAButil/abio.h
rename to cde/programs/dtappbuilder/src/include/ab_private/abio.h
diff --git a/cde/programs/dtappbuilder/src/abmf/abmf.h b/cde/programs/dtappbuilder/src/include/ab_private/abmf.h
similarity index 100%
rename from cde/programs/dtappbuilder/src/abmf/abmf.h
rename to cde/programs/dtappbuilder/src/include/ab_private/abmf.h
diff --git a/cde/programs/dtappbuilder/src/ab/abobj.h b/cde/programs/dtappbuilder/src/include/ab_private/abobj.h
similarity index 100%
rename from cde/programs/dtappbuilder/src/ab/abobj.h
rename to cde/programs/dtappbuilder/src/include/ab_private/abobj.h
diff --git a/cde/programs/dtappbuilder/src/ab/abobjP.h b/cde/programs/dtappbuilder/src/include/ab_private/abobjP.h
similarity index 100%
rename from cde/programs/dtappbuilder/src/ab/abobjP.h
rename to cde/programs/dtappbuilder/src/include/ab_private/abobjP.h
diff --git a/cde/programs/dtappbuilder/src/ab/abobj_edit.h b/cde/programs/dtappbuilder/src/include/ab_private/abobj_edit.h
similarity index 100%
rename from cde/programs/dtappbuilder/src/ab/abobj_edit.h
rename to cde/programs/dtappbuilder/src/include/ab_private/abobj_edit.h
diff --git a/cde/programs/dtappbuilder/src/ab/abobj_list.h b/cde/programs/dtappbuilder/src/include/ab_private/abobj_list.h
similarity index 100%
rename from cde/programs/dtappbuilder/src/ab/abobj_list.h
rename to cde/programs/dtappbuilder/src/include/ab_private/abobj_list.h
diff --git a/cde/programs/dtappbuilder/src/ab/abobj_set.h b/cde/programs/dtappbuilder/src/include/ab_private/abobj_set.h
similarity index 100%
rename from cde/programs/dtappbuilder/src/ab/abobj_set.h
rename to cde/programs/dtappbuilder/src/include/ab_private/abobj_set.h
diff --git a/cde/programs/dtappbuilder/src/libABil/abuil_load.h b/cde/programs/dtappbuilder/src/include/ab_private/abuil_load.h
similarity index 100%
rename from cde/programs/dtappbuilder/src/libABil/abuil_load.h
rename to cde/programs/dtappbuilder/src/include/ab_private/abuil_load.h
diff --git a/cde/programs/dtappbuilder/src/libABil/abuil_print.h b/cde/programs/dtappbuilder/src/include/ab_private/abuil_print.h
similarity index 100%
rename from cde/programs/dtappbuilder/src/libABil/abuil_print.h
rename to cde/programs/dtappbuilder/src/include/ab_private/abuil_print.h
diff --git a/cde/programs/dtappbuilder/src/ab/appfw.h b/cde/programs/dtappbuilder/src/include/ab_private/appfw.h
similarity index 100%
rename from cde/programs/dtappbuilder/src/ab/appfw.h
rename to cde/programs/dtappbuilder/src/include/ab_private/appfw.h
diff --git a/cde/programs/dtappbuilder/src/ab/attch_ed.h b/cde/programs/dtappbuilder/src/include/ab_private/attch_ed.h
similarity index 100%
rename from cde/programs/dtappbuilder/src/ab/attch_ed.h
rename to cde/programs/dtappbuilder/src/include/ab_private/attch_ed.h
diff --git a/cde/programs/dtappbuilder/src/libABil/bil.h b/cde/programs/dtappbuilder/src/include/ab_private/bil.h
similarity index 98%
rename from cde/programs/dtappbuilder/src/libABil/bil.h
rename to cde/programs/dtappbuilder/src/include/ab_private/bil.h
index 840c1ad0..143c4953 100644
--- a/cde/programs/dtappbuilder/src/libABil/bil.h
+++ b/cde/programs/dtappbuilder/src/include/ab_private/bil.h
@@ -43,7 +43,7 @@
#define _ABIL_BIL_H_
#include <X11/Intrinsic.h>
-#include <ab_private/bil_parse.h>
+#include "bil_parse.h"
typedef enum
{
diff --git a/cde/programs/dtappbuilder/src/ab/brws.h b/cde/programs/dtappbuilder/src/include/ab_private/brws.h
similarity index 100%
rename from cde/programs/dtappbuilder/src/ab/brws.h
rename to cde/programs/dtappbuilder/src/include/ab_private/brws.h
diff --git a/cde/programs/dtappbuilder/src/ab/brwsP.h b/cde/programs/dtappbuilder/src/include/ab_private/brwsP.h
similarity index 100%
rename from cde/programs/dtappbuilder/src/ab/brwsP.h
rename to cde/programs/dtappbuilder/src/include/ab_private/brwsP.h
diff --git a/cde/programs/dtappbuilder/src/ab/cgen.h b/cde/programs/dtappbuilder/src/include/ab_private/cgen.h
similarity index 100%
rename from cde/programs/dtappbuilder/src/ab/cgen.h
rename to cde/programs/dtappbuilder/src/include/ab_private/cgen.h
diff --git a/cde/programs/dtappbuilder/src/ab/color_chooser.h b/cde/programs/dtappbuilder/src/include/ab_private/color_chooser.h
similarity index 100%
rename from cde/programs/dtappbuilder/src/ab/color_chooser.h
rename to cde/programs/dtappbuilder/src/include/ab_private/color_chooser.h
diff --git a/cde/programs/dtappbuilder/src/ab/conn.h b/cde/programs/dtappbuilder/src/include/ab_private/conn.h
similarity index 100%
rename from cde/programs/dtappbuilder/src/ab/conn.h
rename to cde/programs/dtappbuilder/src/include/ab_private/conn.h
diff --git a/cde/programs/dtappbuilder/src/ab/connP.h b/cde/programs/dtappbuilder/src/include/ab_private/connP.h
similarity index 100%
rename from cde/programs/dtappbuilder/src/ab/connP.h
rename to cde/programs/dtappbuilder/src/include/ab_private/connP.h
diff --git a/cde/programs/dtappbuilder/src/abmf/dtb_utils.h b/cde/programs/dtappbuilder/src/include/ab_private/dtb_utils.h
similarity index 100%
rename from cde/programs/dtappbuilder/src/abmf/dtb_utils.h
rename to cde/programs/dtappbuilder/src/include/ab_private/dtb_utils.h
diff --git a/cde/programs/dtappbuilder/src/libABil/gil.h b/cde/programs/dtappbuilder/src/include/ab_private/gil.h
similarity index 100%
rename from cde/programs/dtappbuilder/src/libABil/gil.h
rename to cde/programs/dtappbuilder/src/include/ab_private/gil.h
diff --git a/cde/programs/dtappbuilder/src/ab/help.h b/cde/programs/dtappbuilder/src/include/ab_private/help.h
similarity index 100%
rename from cde/programs/dtappbuilder/src/ab/help.h
rename to cde/programs/dtappbuilder/src/include/ab_private/help.h
diff --git a/cde/programs/dtappbuilder/src/libAButil/istr.h b/cde/programs/dtappbuilder/src/include/ab_private/istr.h
similarity index 100%
rename from cde/programs/dtappbuilder/src/libAButil/istr.h
rename to cde/programs/dtappbuilder/src/include/ab_private/istr.h
diff --git a/cde/programs/dtappbuilder/src/ab/message.h b/cde/programs/dtappbuilder/src/include/ab_private/message.h
similarity index 100%
rename from cde/programs/dtappbuilder/src/ab/message.h
rename to cde/programs/dtappbuilder/src/include/ab_private/message.h
diff --git a/cde/programs/dtappbuilder/src/libABobj/obj.h b/cde/programs/dtappbuilder/src/include/ab_private/obj.h
similarity index 100%
rename from cde/programs/dtappbuilder/src/libABobj/obj.h
rename to cde/programs/dtappbuilder/src/include/ab_private/obj.h
diff --git a/cde/programs/dtappbuilder/src/libABobj/obj_list.h b/cde/programs/dtappbuilder/src/include/ab_private/obj_list.h
similarity index 100%
rename from cde/programs/dtappbuilder/src/libABobj/obj_list.h
rename to cde/programs/dtappbuilder/src/include/ab_private/obj_list.h
diff --git a/cde/programs/dtappbuilder/src/libABobj/obj_notify.h b/cde/programs/dtappbuilder/src/include/ab_private/obj_notify.h
similarity index 100%
rename from cde/programs/dtappbuilder/src/libABobj/obj_notify.h
rename to cde/programs/dtappbuilder/src/include/ab_private/obj_notify.h
diff --git a/cde/programs/dtappbuilder/src/libABobjXm/objxm.h b/cde/programs/dtappbuilder/src/include/ab_private/objxm.h
similarity index 100%
rename from cde/programs/dtappbuilder/src/libABobjXm/objxm.h
rename to cde/programs/dtappbuilder/src/include/ab_private/objxm.h
diff --git a/cde/programs/dtappbuilder/src/ab/pal.h b/cde/programs/dtappbuilder/src/include/ab_private/pal.h
similarity index 100%
rename from cde/programs/dtappbuilder/src/ab/pal.h
rename to cde/programs/dtappbuilder/src/include/ab_private/pal.h
diff --git a/cde/programs/dtappbuilder/src/ab/proj.h b/cde/programs/dtappbuilder/src/include/ab_private/proj.h
similarity index 100%
rename from cde/programs/dtappbuilder/src/ab/proj.h
rename to cde/programs/dtappbuilder/src/include/ab_private/proj.h
diff --git a/cde/programs/dtappbuilder/src/ab/projP.h b/cde/programs/dtappbuilder/src/include/ab_private/projP.h
similarity index 100%
rename from cde/programs/dtappbuilder/src/ab/projP.h
rename to cde/programs/dtappbuilder/src/include/ab_private/projP.h
diff --git a/cde/programs/dtappbuilder/src/ab/prop.h b/cde/programs/dtappbuilder/src/include/ab_private/prop.h
similarity index 100%
rename from cde/programs/dtappbuilder/src/ab/prop.h
rename to cde/programs/dtappbuilder/src/include/ab_private/prop.h
diff --git a/cde/programs/dtappbuilder/src/ab/propP.h b/cde/programs/dtappbuilder/src/include/ab_private/propP.h
similarity index 100%
rename from cde/programs/dtappbuilder/src/ab/propP.h
rename to cde/programs/dtappbuilder/src/include/ab_private/propP.h
diff --git a/cde/programs/dtappbuilder/src/libAButil/strlist.h b/cde/programs/dtappbuilder/src/include/ab_private/strlist.h
similarity index 100%
rename from cde/programs/dtappbuilder/src/libAButil/strlist.h
rename to cde/programs/dtappbuilder/src/include/ab_private/strlist.h
diff --git a/cde/programs/dtappbuilder/src/ab/tmode.h b/cde/programs/dtappbuilder/src/include/ab_private/tmode.h
similarity index 100%
rename from cde/programs/dtappbuilder/src/ab/tmode.h
rename to cde/programs/dtappbuilder/src/include/ab_private/tmode.h
diff --git a/cde/programs/dtappbuilder/src/ab/tmodeP.h b/cde/programs/dtappbuilder/src/include/ab_private/tmodeP.h
similarity index 100%
rename from cde/programs/dtappbuilder/src/ab/tmodeP.h
rename to cde/programs/dtappbuilder/src/include/ab_private/tmodeP.h
diff --git a/cde/programs/dtappbuilder/src/libABobj/trav.h b/cde/programs/dtappbuilder/src/include/ab_private/trav.h
similarity index 100%
rename from cde/programs/dtappbuilder/src/libABobj/trav.h
rename to cde/programs/dtappbuilder/src/include/ab_private/trav.h
diff --git a/cde/programs/dtappbuilder/src/ab/ui_util.h b/cde/programs/dtappbuilder/src/include/ab_private/ui_util.h
similarity index 100%
rename from cde/programs/dtappbuilder/src/ab/ui_util.h
rename to cde/programs/dtappbuilder/src/include/ab_private/ui_util.h
diff --git a/cde/programs/dtappbuilder/src/libAButil/util.h b/cde/programs/dtappbuilder/src/include/ab_private/util.h
similarity index 100%
rename from cde/programs/dtappbuilder/src/libAButil/util.h
rename to cde/programs/dtappbuilder/src/include/ab_private/util.h
diff --git a/cde/programs/dtappbuilder/src/libAButil/util_ds.h b/cde/programs/dtappbuilder/src/include/ab_private/util_ds.h
similarity index 100%
rename from cde/programs/dtappbuilder/src/libAButil/util_ds.h
rename to cde/programs/dtappbuilder/src/include/ab_private/util_ds.h
diff --git a/cde/programs/dtappbuilder/src/libAButil/util_err.h b/cde/programs/dtappbuilder/src/include/ab_private/util_err.h
similarity index 100%
rename from cde/programs/dtappbuilder/src/libAButil/util_err.h
rename to cde/programs/dtappbuilder/src/include/ab_private/util_err.h
diff --git a/cde/programs/dtappbuilder/src/ab/vwr.h b/cde/programs/dtappbuilder/src/include/ab_private/vwr.h
similarity index 100%
rename from cde/programs/dtappbuilder/src/ab/vwr.h
rename to cde/programs/dtappbuilder/src/include/ab_private/vwr.h
diff --git a/cde/programs/dtappbuilder/src/ab/x_util.h b/cde/programs/dtappbuilder/src/include/ab_private/x_util.h
similarity index 100%
rename from cde/programs/dtappbuilder/src/ab/x_util.h
rename to cde/programs/dtappbuilder/src/include/ab_private/x_util.h
diff --git a/cde/programs/dtappbuilder/src/libABil/Makefile.am b/cde/programs/dtappbuilder/src/libABil/Makefile.am
new file mode 100644
index 00000000..7b14d2ab
--- /dev/null
+++ b/cde/programs/dtappbuilder/src/libABil/Makefile.am
@@ -0,0 +1,39 @@
+MAINTAINERCLEANFILES = Makefile.in
+
+ABINCLUDES = ../include
+
+EXTRA_DEFINES = -D_POSIX_SOURCE=1
+
+BUILT_SOURCES = bil_parse.h bil_parse.c
+CLEANFILES = bil_parse.h bil_parse.c
+AM_YFLAGS = -d
+
+if HPUX
+CCOPTIONS = -Ae
+endif
+
+noinst_LIBRARIES = libABil.a
+
+#noinst_PROGRAMS = bil_test
+
+libABil_a_CFLAGS = $(EXTRA_DEFINES) -I$(ABINCLUDES)
+
+libABil_a_LIBADD =
+
+libABil_a_SOURCES = bil_parse.y abuil_load.c abuil_print.c \
+ abuil_resource_attr_map.c abuil_trav.c \
+ abuil_widget_obj_map.c bil.c \
+ bil_lexer.c bil_loadact.c \
+ bil_loadatt.c bil_loadfile.c \
+ bil_loadobj.c bil_parse.y \
+ bil_store.c gil.c \
+ gil_loadact.c gil_loadatt.c \
+ gil_loadfile.c gil_loadobj.c \
+ load.c
+
+#bil_test_LDADD = ./libABil.a \
+# ../libABobjXm/libABobjXm.a \
+# ../libABobj/libABobj.a \
+# ../libAButil/libAButil.a
+
+#bil_test_SOURCES = bil_test.c
diff --git a/cde/programs/dtappbuilder/src/libABil/abuil_print.c b/cde/programs/dtappbuilder/src/libABil/abuil_print.c
index 2bb8040e..df54e9e6 100644
--- a/cde/programs/dtappbuilder/src/libABil/abuil_print.c
+++ b/cde/programs/dtappbuilder/src/libABil/abuil_print.c
@@ -58,7 +58,7 @@
#include <ab_private/abio.h>
#include <ab_private/objxm.h>
#include <ab_private/istr.h>
-#include "abuil_print.h"
+#include <ab_private/abuil_print.h>
#include "../libABobj/obj_utils.h"
#include <Xm/Xm.h>
diff --git a/cde/programs/dtappbuilder/src/libABil/bilP.h b/cde/programs/dtappbuilder/src/libABil/bilP.h
index fc09555e..c0c19692 100644
--- a/cde/programs/dtappbuilder/src/libABil/bilP.h
+++ b/cde/programs/dtappbuilder/src/libABil/bilP.h
@@ -47,7 +47,7 @@
#include <stdio.h>
#include <nl_types.h>
-#include <ab_private/bil_parse.h>
+#include "bil_parse.h"
#include <ab/util_types.h>
#include <ab_private/obj.h>
#include "loadP.h"
@@ -81,8 +81,8 @@ typedef struct
/*
* Symbols generated by lex/yacc
*/
-extern int AByyparse(void);
-extern FILE *AByyin;
+extern int yyparse(void);
+extern FILE *yyin;
/*
* module global vars
diff --git a/cde/programs/dtappbuilder/src/libABil/bil_lexer.c b/cde/programs/dtappbuilder/src/libABil/bil_lexer.c
index 95eb04ee..5ee3817a 100644
--- a/cde/programs/dtappbuilder/src/libABil/bil_lexer.c
+++ b/cde/programs/dtappbuilder/src/libABil/bil_lexer.c
@@ -58,7 +58,7 @@
/*
* Public symbols
*/
-FILE *AByyin = NULL;
+FILE *yyin = NULL;
#define MAX_TOKEN_LEN 1023
#define MAX_TOKEN_SIZE (MAX_TOKEN_LEN + 1) /* len+1 for NULL */
@@ -108,9 +108,9 @@ static int get_(FILE *file, int lastChar);
int
-AByylex(void)
+yylex(void)
{
- return get_token(AByyin);
+ return get_token(yyin);
}
@@ -370,7 +370,7 @@ get_string(FILE *file, int lastChar)
* Called by the lexical analyzer or parser whenever an error occurs.
*/
void
-AByyerror(const char *message)
+yyerror(const char *message)
{
char tokenMsg[1024] = "";
char errMsg[1024] = "";
diff --git a/cde/programs/dtappbuilder/src/libABil/bil_loadatt.c b/cde/programs/dtappbuilder/src/libABil/bil_loadatt.c
index bea8c284..52b13e1c 100644
--- a/cde/programs/dtappbuilder/src/libABil/bil_loadatt.c
+++ b/cde/programs/dtappbuilder/src/libABil/bil_loadatt.c
@@ -255,7 +255,7 @@ bilP_load_att_class(BIL_TOKEN valueToken)
* This skips the rest of the BIL file and prints out
* an error message.
*/
- fseek(AByyin, SEEK_END, 0);
+ fseek(yyin, SEEK_END, 0);
abil_print_load_err(ERR_NOT_PROJECT);
}
else
@@ -281,7 +281,7 @@ bilP_load_att_class(BIL_TOKEN valueToken)
* project into another project. This skips the
* rest of the BIL file and prints out an error.
*/
- fseek(AByyin, SEEK_END, 0);
+ fseek(yyin, SEEK_END, 0);
abil_print_load_err(ERR_NOT_MODULE);
}
break;
diff --git a/cde/programs/dtappbuilder/src/libABil/bil_loadfile.c b/cde/programs/dtappbuilder/src/libABil/bil_loadfile.c
index 12185d2e..be6db087 100644
--- a/cde/programs/dtappbuilder/src/libABil/bil_loadfile.c
+++ b/cde/programs/dtappbuilder/src/libABil/bil_loadfile.c
@@ -144,7 +144,7 @@ bil_load_file(
if (inFile == NULL)
{
/* Open the input file. */
- errmsg = abio_open_bil_input(bil_file, &lineNumber, &AByyin);
+ errmsg = abio_open_bil_input(bil_file, &lineNumber, &yyin);
if (errmsg != NULL)
{
LoadErr = TRUE;
@@ -162,7 +162,7 @@ bil_load_file(
goto epilogue;
}
else
- AByyin = inFile;
+ yyin = inFile;
}
++lineNumber;
@@ -171,7 +171,7 @@ bil_load_file(
*/
bilP_load_reset();
bilP_load_set_line_number(lineNumber);
- if ((success = AByyparse()) != 0)
+ if ((success = yyparse()) != 0)
{
abio_close_input(inFile);
LoadErr = TRUE;
@@ -204,7 +204,7 @@ bil_load_file(
#endif /* BOGUS */
/* Close the input file. */
- abio_close_input(AByyin);
+ abio_close_input(yyin);
if (bilP_load.project == NULL)
{
@@ -402,7 +402,7 @@ bilP_load_end_of_file(void)
int
bilP_load_end_of_data(void)
{
- fseek(AByyin, 0, SEEK_END); /* move to end of file */
+ fseek(yyin, 0, SEEK_END); /* move to end of file */
return 0;
}
diff --git a/cde/programs/dtappbuilder/src/libABil/bil_parse.y b/cde/programs/dtappbuilder/src/libABil/bil_parse.y
index d2c06d16..6856554e 100644
--- a/cde/programs/dtappbuilder/src/libABil/bil_parse.y
+++ b/cde/programs/dtappbuilder/src/libABil/bil_parse.y
@@ -19,7 +19,7 @@
*/
#include <stdio.h>
-#include <ab_private/bil_parse.h>
+#include "bil_parse.h"
#include <ab/util_types.h>
#include "bil_loadattP.h"
diff --git a/cde/programs/dtappbuilder/src/libABil/gil_loadact.c b/cde/programs/dtappbuilder/src/libABil/gil_loadact.c
index 57c0cce5..1bf2b3ee 100644
--- a/cde/programs/dtappbuilder/src/libABil/gil_loadact.c
+++ b/cde/programs/dtappbuilder/src/libABil/gil_loadact.c
@@ -55,7 +55,7 @@
#include <ab_private/util.h>
#include <ab_private/istr.h>
#include "../libABobj/obj_utils.h"
-#include "gil.h"
+#include <ab_private/gil.h>
#include "gilP.h"
#include "load.h"
#include "loadP.h"
diff --git a/cde/programs/dtappbuilder/src/libABil/gil_loadatt.c b/cde/programs/dtappbuilder/src/libABil/gil_loadatt.c
index e423d7f9..0750bb6c 100644
--- a/cde/programs/dtappbuilder/src/libABil/gil_loadatt.c
+++ b/cde/programs/dtappbuilder/src/libABil/gil_loadatt.c
@@ -58,7 +58,7 @@
#include <ab_private/trav.h>
#include <ab_private/istr.h>
#include "../libABobj/obj_utils.h"
-#include "gil.h"
+#include <ab_private/gil.h>
#include "gilP.h"
#include "gil_loadattP.h"
#include "load.h"
diff --git a/cde/programs/dtappbuilder/src/libABobj/Makefile.am b/cde/programs/dtappbuilder/src/libABobj/Makefile.am
new file mode 100644
index 00000000..6e725a8f
--- /dev/null
+++ b/cde/programs/dtappbuilder/src/libABobj/Makefile.am
@@ -0,0 +1,54 @@
+MAINTAINERCLEANFILES = Makefile.in
+
+ABINCLUDES = ../include
+
+EXTRA_DEFINES = -D_POSIX_SOURCE=1
+
+EXTRALIBS = -lm
+
+if HPUX
+CCOPTIONS = -Ae
+endif
+
+if AIX
+EXTRALIBS += -liconv
+endif
+
+if SOLARIS
+EXTRALIBS += -ldl -lgen
+endif
+
+noinst_LIBRARIES = libABobj.a
+
+#noinst_PROGRAMS = test test_notify
+
+libABobj_a_CFLAGS = $(EXTRA_DEFINES) -I$(ABINCLUDES)
+
+libABobj_a_SOURCES = obj.c \
+ obj_action.c \
+ obj_alloc.c \
+ obj_fields.c \
+ obj_geometry.c \
+ obj_init.c \
+ obj_isa.c \
+ obj_names_list.c \
+ obj_list.c \
+ obj_lists.c \
+ obj_notify.c \
+ obj_release.c \
+ obj_scoped.c \
+ obj_select.c \
+ obj_tree.c \
+ obj_utils.c \
+ trav.c \
+ travP.c \
+ trav_public.c \
+ trav_safe.c
+
+#test_LDADD = ../libAButil/libAButil.a libABobj.a $(EXTRALIBS)
+
+#test_SOURCES = test.c
+
+#test_notify_LDADD = ../libAButil/libAButil.a libABobj.a $(EXTRALIBS)
+
+#test_notify_SOURCES = test_notify.c
diff --git a/cde/programs/dtappbuilder/src/libABobjXm/Makefile.am b/cde/programs/dtappbuilder/src/libABobjXm/Makefile.am
new file mode 100644
index 00000000..2e15f3c2
--- /dev/null
+++ b/cde/programs/dtappbuilder/src/libABobjXm/Makefile.am
@@ -0,0 +1,19 @@
+MAINTAINERCLEANFILES = Makefile.in
+
+ABINCLUDES = ../include
+
+EXTRA_DEFINES = -D_POSIX_SOURCE=1
+
+if HPUX
+CCOPTIONS = -Ae
+endif
+
+noinst_LIBRARIES = libABobjXm.a
+
+libABobjXm_a_CFLAGS = $(EXTRA_DEFINES) -I$(ABINCLUDES)
+
+libABobjXm_a_LIBADD =
+
+libABobjXm_a_SOURCES = objxm_args.c objxm_config.c objxm_conn.c \
+ objxm_inst.c objxm_objects.c objxm_strs.c \
+ objxm_util.c
diff --git a/cde/programs/dtappbuilder/src/libAButil/Makefile.am b/cde/programs/dtappbuilder/src/libAButil/Makefile.am
new file mode 100644
index 00000000..4cd6d2cb
--- /dev/null
+++ b/cde/programs/dtappbuilder/src/libAButil/Makefile.am
@@ -0,0 +1,38 @@
+MAINTAINERCLEANFILES = Makefile.in
+
+ABINCLUDES = ../include
+
+EXTRA_DEFINES = -D_POSIX_SOURCE=1
+
+if HPUX
+CCOPTIONS = -Ae
+endif
+
+noinst_LIBRARIES = libAButil.a
+
+#noinst_PROGRAMS = util_test istr_test
+
+libAButil_a_CFLAGS = $(EXTRA_DEFINES) -I$(ABINCLUDES)
+
+libAButil_a_SOURCES = abio.c \
+ abio_path.c \
+ istr.c \
+ strlist.c \
+ util.c \
+ util_convert.c \
+ util_ds.c \
+ util_err.c \
+ util_file.c \
+ util_string.c
+
+#util_test_LDADD = libAButil.a -lm
+
+#util_test_CFLAGS = $(EXTRA_DEFINES) -I$(ABINCLUDES)
+
+#util_test_SOURCES = util_test.c
+
+#istr_test_LDADD = libAButil.a -lm
+
+#istr_test_CFLAGS = $(EXTRA_DEFINES) -I$(ABINCLUDES)
+
+#istr_test_SOURCES = istr_test.c
diff --git a/cde/programs/dtappbuilder/src/libAButil/util_test.c b/cde/programs/dtappbuilder/src/libAButil/util_test.c
index 66347cd9..7eba7b99 100644
--- a/cde/programs/dtappbuilder/src/libAButil/util_test.c
+++ b/cde/programs/dtappbuilder/src/libAButil/util_test.c
@@ -40,7 +40,7 @@
*
*/
-#include "util.h"
+#include <ab_private/util.h>
#include <sys/types.h>
#include <sys/stat.h> /* mkdir */
#include <sys/param.h>
--
2.17.1
_______________________________________________
cdesktopenv-devel mailing list
cdesktopenv-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/cdesktopenv-devel
