From 5bb7b74efd60a304041ac629ad949b67917c8e02 Mon Sep 17 00:00:00 2001 From: Jon Trulson Date: Thu, 21 Nov 2019 17:43:27 -0700 Subject: [PATCH] dtprintinfo: make it build Also, it was easier just to use a single Makefile.am rather than one for every subdir, so thats what we did here. --- cde/configure.ac | 2 + cde/programs/dtprintinfo/Makefile.am | 77 +++++++++++++------ cde/programs/dtprintinfo/UI/Makefile.am | 16 ---- cde/programs/dtprintinfo/libUI/Makefile.am | 3 - .../dtprintinfo/libUI/MotifUI/Makefile.am | 16 ---- cde/programs/dtprintinfo/objects/Makefile.am | 3 - .../dtprintinfo/objects/PrintObj/Makefile.am | 11 --- cde/programs/dtprintinfo/util/Makefile.am | 11 --- 8 files changed, 56 insertions(+), 83 deletions(-) delete mode 100644 cde/programs/dtprintinfo/UI/Makefile.am delete mode 100644 cde/programs/dtprintinfo/libUI/Makefile.am delete mode 100644 cde/programs/dtprintinfo/libUI/MotifUI/Makefile.am delete mode 100644 cde/programs/dtprintinfo/objects/Makefile.am delete mode 100644 cde/programs/dtprintinfo/objects/PrintObj/Makefile.am delete mode 100644 cde/programs/dtprintinfo/util/Makefile.am diff --git a/cde/configure.ac b/cde/configure.ac index 36030372..6c571fc8 100644 --- a/cde/configure.ac +++ b/cde/configure.ac @@ -432,6 +432,8 @@ programs/dtconfig/sun/Makefile programs/dtcreate/Makefile +programs/dtprintinfo/Makefile + ]) AC_OUTPUT diff --git a/cde/programs/dtprintinfo/Makefile.am b/cde/programs/dtprintinfo/Makefile.am index 06a9a8b2..c875ce72 100644 --- a/cde/programs/dtprintinfo/Makefile.am +++ b/cde/programs/dtprintinfo/Makefile.am @@ -1,40 +1,71 @@ -SUBDIRS = util libUI objects UI +MAINTAINERCLEANFILES = Makefile.in -all:: dtprintinfo_cat.h dtprintinfo_msg.h dtprintinfo.msg +bin_PROGRAMS = dtprintinfo -if SOLARIS -.NO_PARALLEL: -endif +AM_CPPFLAGS = -I./UI -I./libUI -I./util -I./libUI/MotifUI -I./objects \ + -I./objects/PrintObj -DKORNSHELL=\"$(KSH)\" -bin_PROGRAMS = dtprintinfo +dtprintinfo_LDADD = $(DTCLIENTLIBS) $(XTOOLLIB) -dtprintinfo_CXXFLAGS = -I./UI -I./libUI -I./util -I./libUI/MotifUI -I./objects \ - -I./objects/PrintObj +UTIL_SRC = util/Invoke.C util/Invoke.h util/Process.C util/Process.h -dtprintinfo_LDADD = ./UI/libDtPrintinfo.a ./util/libUtil.a \ - ./libUI/MotifUI/libMotifUI.a ./objects/PrintObj/libPrintObj.a \ - $(LIBHELP) $(LIBWIDGET) $(LIBSVC) $(LIBTT) $(XTOOLLIB) ${X_LIBS} +LIBUI_SRC = libUI/BaseUI.C libUI/BaseUI.h libUI/MotifUI/Application.C \ + libUI/MotifUI/LabelObj.C libUI/MotifUI/Application.h \ + libUI/MotifUI/LabelObj.h libUI/MotifUI/Button.C \ + libUI/MotifUI/MainWindow.C libUI/MotifUI/Button.h \ + libUI/MotifUI/MainWindow.h libUI/MotifUI/ComboBoxObj.C \ + libUI/MotifUI/MenuBar.C libUI/MotifUI/ComboBoxObj.h \ + libUI/MotifUI/MenuBar.h libUI/MotifUI/Container.C \ + libUI/MotifUI/Menu.C libUI/MotifUI/Container.h \ + libUI/MotifUI/Menu.h libUI/MotifUI/Dialog.C \ + libUI/MotifUI/MotifThread.C libUI/MotifUI/Dialog.h \ + libUI/MotifUI/MotifThread.h libUI/MotifUI/DtDND.C \ + libUI/MotifUI/MotifUI.C libUI/MotifUI/DtDND.h \ + libUI/MotifUI/MotifUI.h libUI/MotifUI/Group.C \ + libUI/MotifUI/Prompt.C libUI/MotifUI/Group.h \ + libUI/MotifUI/Prompt.h libUI/MotifUI/HelpSystem.C \ + libUI/MotifUI/ScaleObj.C libUI/MotifUI/HelpSystem.h \ + libUI/MotifUI/ScaleObj.h libUI/MotifUI/Icon.h \ + libUI/MotifUI/Sep.C libUI/MotifUI/IconObj.C \ + libUI/MotifUI/Sep.h libUI/MotifUI/IconObj.h \ + libUI/MotifUI/WorkArea.h libUI/MotifUI/IconP.h \ + libUI/MotifUI/WorkAreaP.h libUI/MotifUI/Debug.c \ + libUI/MotifUI/Icon.c libUI/MotifUI/WorkArea.c + +OBJ_SRC = objects/BaseObj.C objects/BaseObj.h \ + objects/PrintObj/ParseJobs.C objects/PrintObj/PrintSubSys.C \ + objects/PrintObj/ParseJobs.h objects/PrintObj/PrintSubSys.h \ + objects/PrintObj/PrintJob.C objects/PrintObj/Queue.C \ + objects/PrintObj/PrintJob.h objects/PrintObj/Queue.h + +UI_SRC = UI/DtActions.C UI/DtFindD.h UI/DtProps.C UI/DtSetModList.h \ + UI/DtActions.h UI/DtFindSet.C UI/DtProps.h UI/DtSetPref.C \ + UI/DtApp.C UI/DtFindSet.h UI/DtPrtJobIcon.C UI/DtSetPref.h \ + UI/DtApp.h UI/DtMainW.C UI/DtPrtJobIcon.h UI/DtWorkArea.C \ + UI/DtDetailsLabel.C UI/DtMainW.h UI/DtPrtProps.C \ + UI/DtWorkArea.h UI/DtDetailsLabel.h UI/DtPrinterIcon.C \ + UI/DtPrtProps.h UI/DtFindD.C UI/DtPrinterIcon.h \ + UI/DtSetModList.C -if SOLARIS -dtprintinfo_LDADD += -lm -ldl -endif -if AIX -dtprintinfo_CXXFLAGS += -DHAS_EXCEPTIONS +dtprintinfo_SOURCES = $(UTIL_SRC) $(LIBUI_SRC) $(OBJ_SRC) $(UI_SRC) \ + DtPrintinfo.C dtprintinfomsg.h + +if SOLARIS +dtprintinfo_LDADD += -ldl endif -#special processing for message files -SYM2NUM_CMD = $(KSH) sym2num +# special processing for message files +SYM2NUM_CMD = CPP=$(GENCPP) $(KSH) sym2num -dtprintinfo_SOURCES = libUI/BaseUI.C libUI/Test.C objects/BaseObj.C \ - DtPrintinfo.C +BUILT_SOURCES = dtprintinfo_cat.h dtprintinfo_msg.h dtprintinfo.msg +CLEANFILES = $(BUILT_SOURCES) dtprintinfo_msg.h dtprintinfo.msg: dtprintinfo.msg.src - rm -f dtprintinfo_msg.h dtprintinfo.msg + $(RM) dtprintinfo_msg.h dtprintinfo.msg $(SYM2NUM_CMD) dtprintinfo dtprintinfo.msg.src > dtprintinfo.msg dtprintinfo_cat.h: dtprintinfo.msg.src - rm -f dtprintinfo_cat.h + $(RM) dtprintinfo_cat.h $(AWK) -f msg.awk dtprintinfo.msg.src > dtprintinfo_cat.h -CLEANFILES = *.map dtprintinfo_cat.h dtprintinfo_msg.h dtprintinfo.msg diff --git a/cde/programs/dtprintinfo/UI/Makefile.am b/cde/programs/dtprintinfo/UI/Makefile.am deleted file mode 100644 index 5277f07d..00000000 --- a/cde/programs/dtprintinfo/UI/Makefile.am +++ /dev/null @@ -1,16 +0,0 @@ -MAINTAINERCLEANFILES = Makefile.in - -noinst_LIBRARIES = libDtPrintinfo.a - -libDtPrintinfo_a_CXXFLAGS = -I.. -I../libUI -I../libUI/MotifUI -I../objects \ - -I../util -I../objects -I../objects/PrintObj - -if AIX -libDtPrintinfo_a_CXXFLAGS += -DHAS_EXCEPTIONS -endif - -libDtPrintinfo_a_SOURCES = DtActions.C DtApp.C DtDetailsLabel.C \ - DtFindD.C DtFindSet.C DtMainW.C \ - DtPrinterIcon.C DtProps.C DtPrtJobIcon.C \ - DtPrtProps.C DtSetModList.C DtSetPref.C \ - DtWorkArea.C diff --git a/cde/programs/dtprintinfo/libUI/Makefile.am b/cde/programs/dtprintinfo/libUI/Makefile.am deleted file mode 100644 index 2e7847bb..00000000 --- a/cde/programs/dtprintinfo/libUI/Makefile.am +++ /dev/null @@ -1,3 +0,0 @@ -MAINTAINERCLEANFILES = Makefile.in - -SUBDIRS = MotifUI diff --git a/cde/programs/dtprintinfo/libUI/MotifUI/Makefile.am b/cde/programs/dtprintinfo/libUI/MotifUI/Makefile.am deleted file mode 100644 index 52ed9f0e..00000000 --- a/cde/programs/dtprintinfo/libUI/MotifUI/Makefile.am +++ /dev/null @@ -1,16 +0,0 @@ -MAINTAINERCLEANFILES = Makefile.in - -noinst_LIBRARIES = libMotifUI.a - -libMotifUI_a_CXXFLAGS = -I.. -DKORNSHELL=\"$(KSH)\" - -if AIX -libMotifUI_a_CXXFLAGS = -DHAS_EXCEPTIONS - -libMotifUI_a_SOURCES = Application.C Button.C ComboBoxObj.C \ - Container.C Debug.c Dialog.C \ - DtDND.C Group.C HelpSystem.C \ - Icon.c IconObj.C LabelObj.C \ - MainWindow.C Menu.C MenuBar.C \ - MotifThread.C MotifUI.C Prompt.C \ - ScaleObj.C Sep.C WorkArea.c diff --git a/cde/programs/dtprintinfo/objects/Makefile.am b/cde/programs/dtprintinfo/objects/Makefile.am deleted file mode 100644 index 9986ab51..00000000 --- a/cde/programs/dtprintinfo/objects/Makefile.am +++ /dev/null @@ -1,3 +0,0 @@ -MAINTAINERCLEANFILES = Makefile.am - -SUBDIRS = PrintObj diff --git a/cde/programs/dtprintinfo/objects/PrintObj/Makefile.am b/cde/programs/dtprintinfo/objects/PrintObj/Makefile.am deleted file mode 100644 index 48f92687..00000000 --- a/cde/programs/dtprintinfo/objects/PrintObj/Makefile.am +++ /dev/null @@ -1,11 +0,0 @@ -MAINTAINERCLEANFILES = Makefile.am - -noinst_LIBRARIES = libPrintObj.a - -libPrintObj_a_CXXFLAGS = -I.. -I../.. -I../../util - -if AIX -libPrintObj_a_CXXFLAGS = -DHAS_EXCEPTIONS -endif - -libPritnObj_a_SOURCES = ParseJobs.C PrintJob.C PrintSubSys.C Queue.C diff --git a/cde/programs/dtprintinfo/util/Makefile.am b/cde/programs/dtprintinfo/util/Makefile.am deleted file mode 100644 index 4d9b0d62..00000000 --- a/cde/programs/dtprintinfo/util/Makefile.am +++ /dev/null @@ -1,11 +0,0 @@ -MAINTAINERCLEANFILES = Makefile.in - -noinst_LIBRARIES = libUtil.a - -libUtil_a_CXXFLAGS = -I. -DKORNSHELL=\"$(KSH)\" - -if AIX -libUtil_a_CXXFLAGS = -DHAS_EXCEPTIONS -endif - -libUtil_a_SOURCES = Invoke.C Process.C -- 2.25.1