From 3ce0527e5267e8b54c9b8b88853e666819db18f7 Mon Sep 17 00:00:00 2001 From: Jon Trulson Date: Tue, 29 Oct 2019 19:14:17 -0600 Subject: [PATCH] DtSvc: vastly simplify building this library We take advantage of subdir-object and just build the subdir source files directly as normal dependencies of libDtSvc in the top level Makefile.am. This means the intevening subdirectory Makefiles are no longer needed, and no need to replicate flags and the like between the subdirectory Makefile.am files. Also, no need to build fake .a libs we can't really use. configure: remove AC_OUTPUT_FILES related the the lib/DtSvc/* subdirectories. They are no longer needed. --- cde/configure.ac | 5 - cde/lib/DtSvc/DtCodelibs/Makefile.am | 22 ----- cde/lib/DtSvc/DtEncap/Makefile.am | 25 ----- cde/lib/DtSvc/DtUtil1/Makefile.am | 28 ------ cde/lib/DtSvc/DtUtil2/Makefile.am | 32 ------ cde/lib/DtSvc/DtXpm/Makefile.am | 7 -- cde/lib/DtSvc/Makefile.am | 141 +++++++++++++++++++++++++-- 7 files changed, 135 insertions(+), 125 deletions(-) delete mode 100644 cde/lib/DtSvc/DtCodelibs/Makefile.am delete mode 100644 cde/lib/DtSvc/DtEncap/Makefile.am delete mode 100644 cde/lib/DtSvc/DtUtil1/Makefile.am delete mode 100644 cde/lib/DtSvc/DtUtil2/Makefile.am delete mode 100644 cde/lib/DtSvc/DtXpm/Makefile.am diff --git a/cde/configure.ac b/cde/configure.ac index f22c02db3..a7f522125 100644 --- a/cde/configure.ac +++ b/cde/configure.ac @@ -304,11 +304,6 @@ lib/tt/bin/ttdbserverd/Makefile lib/tt/bin/ttsession/Makefile lib/DtSvc/Makefile -lib/DtSvc/DtUtil1/Makefile -lib/DtSvc/DtUtil2/Makefile -lib/DtSvc/DtEncap/Makefile -lib/DtSvc/DtCodelibs/Makefile -lib/DtSvc/DtXpm/Makefile lib/DtSearch/Makefile lib/DtSearch/raima/Makefile diff --git a/cde/lib/DtSvc/DtCodelibs/Makefile.am b/cde/lib/DtSvc/DtCodelibs/Makefile.am deleted file mode 100644 index c7246c40a..000000000 --- a/cde/lib/DtSvc/DtCodelibs/Makefile.am +++ /dev/null @@ -1,22 +0,0 @@ -MAINTAINERCLEANFILES = Makefile.in - -noinst_LTLIBRARIES = libDtCodelibs.la - -libDtCodelibs_la_CXXFLAGS = -I../include -DMULTIBYTE - -if AIX -libDtCodelibs_la_CXXFLAGS += -qlanglvl=compat -endif - -if SOLARIS -libDtCodelibs_la_CXXFLAGS += -DNO_REGCOMP -endif - -if HPUX -libDtCodelibs_la_CXXFLAGS += -DMESSAGE_CAT -endif - -libDtCodelibs_la_SOURCES = buf.C filegen.C mbschr.C \ - pathcollapse.C shellscan.C strend.C \ - strhash.C stringio.C strtokx.C \ - strwcmp.C privbuf.C strcase.C diff --git a/cde/lib/DtSvc/DtEncap/Makefile.am b/cde/lib/DtSvc/DtEncap/Makefile.am deleted file mode 100644 index 39946f5ae..000000000 --- a/cde/lib/DtSvc/DtEncap/Makefile.am +++ /dev/null @@ -1,25 +0,0 @@ -MAINTAINERCLEANFILES = Makefile.in - -noinst_LTLIBRARIES = libDtEncap.la - -libDtEncap_la_CFLAGS = -DMULTIBYTE -I../include -I../DtUtil2 $(TIRPCINC) \ - @DT_INCDIR@ \ - -DCDE_CONFIGURATION_TOP=\"$(CDE_CONFIGURATION_TOP)\" \ - -DCDE_INSTALLATION_TOP=\"${prefix}\" \ - -DCDE_LOGFILES_TOP=\"$(CDE_LOGFILES_TOP)/tmp\" - -if SOLARIS -libDtEncap_la_CFLAGS += -DNO_REGCOMP -endif - -if HPUX -libDtEncap_la_CFLAGS += -DMESSAGE_CAT -endif - -libDtEncap_la_SOURCES = MemoryMgr.c SbEvent.c Symbolic.c bmsglob.c \ - connect.c local.c nls.c noio.c \ - pathwexp.c pipe.c pty.c remote.c \ - sbstdinc.c scoop.c spc-env.c spc-error.c \ - spc-exec.c spc-net.c spc-obj.c spc-proto.c \ - spc-sm.c spc-termio.c spc-util.c spc-xt.c \ - spc.c stringbuf.c usersig.c diff --git a/cde/lib/DtSvc/DtUtil1/Makefile.am b/cde/lib/DtSvc/DtUtil1/Makefile.am deleted file mode 100644 index d90aa1563..000000000 --- a/cde/lib/DtSvc/DtUtil1/Makefile.am +++ /dev/null @@ -1,28 +0,0 @@ -MAINTAINERCLEANFILES = Makefile.in - -noinst_LTLIBRARIES = libDtUtil1.la - -libDtUtil1_la_CFLAGS = -I../include $(TIRPCINC) -DMULTIBYTE \ - @DT_INCDIR@ \ - -DCDE_INSTALLATION_TOP=\"${prefix}\" \ - -DCDE_CONFIGURATION_TOP=\"$(CDE_CONFIGURATION_TOP)\" - -if SOLARIS -libDtUtil1_la_CFLAGS += -DNO_REGCOMP -endif - -if HPUX -libDtUtil1_la_CFLAGS += -DMESSAGE_CAT -endif - -libDtUtil1_la_SOURCES = Action.c ActionTt.c ActionDb.c ActionFind.c \ - ActionUtil.c DbReader.c DbUtil.c CmdSpc.c \ - CmdMain.c CmdProcess.c CmdUtilityP.c Dnd.c \ - DndDrag.c DndDrop.c DndIcon.c DndBuff.c DndFile.c \ - DndText.c Dt.c Dts.c DtsDb.c DtsSort.c DbLoad.c \ - DtsInit.c DtHash.c intarray.c inttab.c strtab.c \ - DtsMM.c MMDb.c GetVWmHint.c GetMwmW.c Qualify.c \ - Saver.c SetVWmHint.c SmComm.c SmUtil.c WmAddDelWs.c \ - WmBackWin.c WmChBackD.c WmGWsInfo.c WmGWsList.c \ - WmMarquee.c WmRestart.c WmRmWsFcn.c WmSetTitle.c \ - WmWsCallB.c WmSetWs.c WmWsHints.c WmWsOccupy.c diff --git a/cde/lib/DtSvc/DtUtil2/Makefile.am b/cde/lib/DtSvc/DtUtil2/Makefile.am deleted file mode 100644 index b94a3ce81..000000000 --- a/cde/lib/DtSvc/DtUtil2/Makefile.am +++ /dev/null @@ -1,32 +0,0 @@ -MAINTAINERCLEANFILES = Makefile.in - -noinst_LTLIBRARIES = libDtUtil2.la - -libDtUtil2_la_CFLAGS = -I../include $(TIRPCINC) -DMULTIBYTE -DNLS16 \ - @DT_INCDIR@ \ - -DCDE_INSTALLATION_TOP=\"${prefix}\" \ - -DCDE_CONFIGURATION_TOP=\"$(CDE_CONFIGURATION_TOP)\" \ - -DMULTIBYTE -DUSE_XINERAMA $(TIRPCINC) - - -libDtUtil2_la_SOURCES = ChkpntClient.c ChkpntListen.c DtEnvMap.c \ - DtNlUtils.c EnvControl.c FileUtil.c \ - GetDispRes.c GetMessage.c HourGlass.c \ - Info.c SharedProcs.c SmCreateDirs.c \ - UErrNoBMS.c Utility.c ActIndicator.c \ - CmdUtility.c DtGetMessage.c DtUtil.c \ - GetEmbed.c Hash.c PrintXErr.c \ - XmWrap.c addToRes.c lock.c \ - SvcTT.c MsgCat.c MsgLog.c \ - LocaleXlate.c XlationSvc.c - -if SOLARIS -libDtUtil2_la_SOURCES += SunDtHelp.c -libDtUtil2_la_CFLAGS += -I../../DtHelp -DNO_REGCOMP -endif - -if HPUX -libDtUtil2_la_CFLAGS += -DMESSAGE_CAT -endif - - diff --git a/cde/lib/DtSvc/DtXpm/Makefile.am b/cde/lib/DtSvc/DtXpm/Makefile.am deleted file mode 100644 index aeeb3c7b3..000000000 --- a/cde/lib/DtSvc/DtXpm/Makefile.am +++ /dev/null @@ -1,7 +0,0 @@ -MAINTAINERCLEANFILES = Makefile.in - -noinst_LTLIBRARIES = libDtXpm.la - -libDtXpm_CFLAGS = -I../include - -libDtXpm_la_SOURCES = xpm.c diff --git a/cde/lib/DtSvc/Makefile.am b/cde/lib/DtSvc/Makefile.am index 312a47625..6f289be3c 100644 --- a/cde/lib/DtSvc/Makefile.am +++ b/cde/lib/DtSvc/Makefile.am @@ -1,11 +1,140 @@ MAINTAINERCLEANFILES = Makefile.in -SUBDIRS = DtUtil1 DtUtil2 DtEncap DtCodelibs DtXpm - lib_LTLIBRARIES = libDtSvc.la -libDtSvc_la_SOURCES = +libDtSvc_la_LDFLAGS = -version-info 2:1:0 -libDtSvc_la_LIBADD = DtUtil1/*.lo DtUtil2/*.lo DtEncap/*.lo \ - DtCodelibs/*.lo DtXpm/*.lo -libDtSvc_la_LDFLAGS = -fPIC -version-info 2:1:0 +# USe CPPFLAGS so it will apply to both C and C++ components +libDtSvc_la_CPPFLAGS = -I./include -DMULTIBYTE -DNLS16 -I../include \ + $(TIRPCINC) @DT_INCDIR@ -DCDE_INSTALLATION_TOP=\"${prefix}\" \ + -DCDE_CONFIGURATION_TOP=\"$(CDE_CONFIGURATION_TOP)\" + +if SOLARIS +libDtSvc_la_CPPFLAGS += -DNO_REGCOMP +endif + +libDtSvc_la_SOURCES = DtCodelibs/buf.C \ + DtCodelibs/buf.h \ + DtCodelibs/filegen.C \ + DtCodelibs/mbschr.C \ + DtCodelibs/pathcollapse.C \ + DtCodelibs/privbuf.C \ + DtCodelibs/shellscan.C \ + DtCodelibs/strcase.C \ + DtCodelibs/strend.C \ + DtCodelibs/strhash.C \ + DtCodelibs/stringio.C \ + DtCodelibs/stringio.h \ + DtCodelibs/strtokx.C \ + DtCodelibs/strwcmp.C \ + DtEncap/bmsglob.c \ + DtEncap/connect.c \ + DtEncap/local.c \ + DtEncap/MemoryMgr.c \ + DtEncap/nls.c \ + DtEncap/noio.c \ + DtEncap/pathwexp.c \ + DtEncap/pipe.c \ + DtEncap/pty.c \ + DtEncap/remote.c \ + DtEncap/SbEvent.c \ + DtEncap/sbstdinc.c \ + DtEncap/scoop.c \ + DtEncap/spc.c \ + DtEncap/spc-env.c \ + DtEncap/spc-error.c \ + DtEncap/spc-exec.c \ + DtEncap/spc-net.c \ + DtEncap/spc-obj.c \ + DtEncap/spc-proto.c \ + DtEncap/spc-sm.c \ + DtEncap/spc-termio.c \ + DtEncap/spc-util.c \ + DtEncap/spc-xt.c \ + DtEncap/stringbuf.c \ + DtEncap/Symbolic.c \ + DtEncap/usersig.c \ + DtUtil1/Action.c \ + DtUtil1/ActionDb.c \ + DtUtil1/ActionFind.c \ + DtUtil1/ActionTt.c \ + DtUtil1/ActionUtil.c \ + DtUtil1/CmdMain.c \ + DtUtil1/CmdProcess.c \ + DtUtil1/CmdSpc.c \ + DtUtil1/CmdUtilityP.c \ + DtUtil1/DbLoad.c \ + DtUtil1/DbReader.c \ + DtUtil1/DbUtil.c \ + DtUtil1/DndBuff.c \ + DtUtil1/Dnd.c \ + DtUtil1/DndDrag.c \ + DtUtil1/DndDrop.c \ + DtUtil1/DndFile.c \ + DtUtil1/DndIcon.c \ + DtUtil1/DndText.c \ + DtUtil1/Dt.c \ + DtUtil1/DtHash.c \ + DtUtil1/Dts.c \ + DtUtil1/DtsDb.c \ + DtUtil1/DtsInit.c \ + DtUtil1/DtsMM.c \ + DtUtil1/DtsSort.c \ + DtUtil1/GetMwmW.c \ + DtUtil1/GetVWmHint.c \ + DtUtil1/intarray.c \ + DtUtil1/inttab.c \ + DtUtil1/MMDb.c \ + DtUtil1/myassertP.h \ + DtUtil1/Qualify.c \ + DtUtil1/Saver.c \ + DtUtil1/SetVWmHint.c \ + DtUtil1/SmComm.c \ + DtUtil1/SmUtil.c \ + DtUtil1/strtab.c \ + DtUtil1/WmAddDelWs.c \ + DtUtil1/WmBackWin.c \ + DtUtil1/WmChBackD.c \ + DtUtil1/WmGWsInfo.c \ + DtUtil1/WmGWsList.c \ + DtUtil1/WmMarquee.c \ + DtUtil1/WmRequest.c \ + DtUtil1/WmRestart.c \ + DtUtil1/WmRmWsFcn.c \ + DtUtil1/WmSetTitle.c \ + DtUtil1/WmSetWs.c \ + DtUtil1/WmWsCallB.c \ + DtUtil1/WmWsHints.c \ + DtUtil1/WmWsOccupy.c \ + DtUtil2/ActIndicator.c \ + DtUtil2/addToRes.c \ + DtUtil2/bitmaps.h \ + DtUtil2/ChkpntClient.c \ + DtUtil2/ChkpntListen.c \ + DtUtil2/CmdUtility.c \ + DtUtil2/DtEnvMap.c \ + DtUtil2/DtGetMessage.c \ + DtUtil2/DtNlUtils.c \ + DtUtil2/DtUtil.c \ + DtUtil2/EnvControl.c \ + DtUtil2/FileUtil.c \ + DtUtil2/GetDispRes.c \ + DtUtil2/GetEmbed.c \ + DtUtil2/GetMessage.c \ + DtUtil2/Hash.c \ + DtUtil2/HourGlass.c \ + DtUtil2/Info.c \ + DtUtil2/LocaleXlate.c \ + DtUtil2/lock.c \ + DtUtil2/MsgCat.c \ + DtUtil2/MsgLog.c \ + DtUtil2/PrintXErr.c \ + DtUtil2/SharedProcs.c \ + DtUtil2/SmCreateDirs.c \ + DtUtil2/SunDtHelp.c \ + DtUtil2/SvcTT.c \ + DtUtil2/UErrNoBMS.c \ + DtUtil2/Utility.c \ + DtUtil2/XlationSvc.c \ + DtUtil2/XmWrap.c \ + DtXpm/xpm.c