diff --git a/cde/programs/dtinfo/dtinfo/src/Agents/Makefile.am b/cde/programs/dtinfo/dtinfo/src/Agents/Makefile.am index 57361f311..ca8bcc3c8 100644 --- a/cde/programs/dtinfo/dtinfo/src/Agents/Makefile.am +++ b/cde/programs/dtinfo/dtinfo/src/Agents/Makefile.am @@ -3,7 +3,7 @@ MAINTAINERCLEANFILES = Makefile.in noinst_LIBRARIES = libAgents.a # get our env -include ../templates/dtinfo_env.mk +include $(top_srcdir)/programs/dtinfo/dtinfo_env.mk # class info include Classlist.mk diff --git a/cde/programs/dtinfo/dtinfo/src/Basic/Makefile.am b/cde/programs/dtinfo/dtinfo/src/Basic/Makefile.am index 5774b4592..26d9aa99d 100644 --- a/cde/programs/dtinfo/dtinfo/src/Basic/Makefile.am +++ b/cde/programs/dtinfo/dtinfo/src/Basic/Makefile.am @@ -3,7 +3,7 @@ MAINTAINERCLEANFILES = Makefile.in noinst_LIBRARIES = libBasic.a # get our env -include ../templates/dtinfo_env.mk +include $(top_srcdir)/programs/dtinfo/dtinfo_env.mk # class info include Classlist.mk diff --git a/cde/programs/dtinfo/dtinfo/src/Graphics/Makefile.am b/cde/programs/dtinfo/dtinfo/src/Graphics/Makefile.am index ea5125c97..560466b9f 100644 --- a/cde/programs/dtinfo/dtinfo/src/Graphics/Makefile.am +++ b/cde/programs/dtinfo/dtinfo/src/Graphics/Makefile.am @@ -3,7 +3,7 @@ MAINTAINERCLEANFILES = Makefile.in noinst_LIBRARIES = libGraphics.a # get our env -include ../templates/dtinfo_env.mk +include $(top_srcdir)/programs/dtinfo/dtinfo_env.mk # class info include Classlist.mk diff --git a/cde/programs/dtinfo/dtinfo/src/Makefile.am b/cde/programs/dtinfo/dtinfo/src/Makefile.am index e34421454..5481fa7a6 100644 --- a/cde/programs/dtinfo/dtinfo/src/Makefile.am +++ b/cde/programs/dtinfo/dtinfo/src/Makefile.am @@ -1,7 +1,7 @@ MAINTAINERCLEANFILES = Makefile.in # get our env variables -include templates/dtinfo_env.mk +include $(top_srcdir)/programs/dtinfo/dtinfo_env.mk # get the toplevel Classlist include Classlist.mk diff --git a/cde/programs/dtinfo/dtinfo/src/Managers/Makefile.am b/cde/programs/dtinfo/dtinfo/src/Managers/Makefile.am index 675c4a0d9..d4b6b80b3 100644 --- a/cde/programs/dtinfo/dtinfo/src/Managers/Makefile.am +++ b/cde/programs/dtinfo/dtinfo/src/Managers/Makefile.am @@ -3,7 +3,7 @@ MAINTAINERCLEANFILES = Makefile.in noinst_LIBRARIES = libManagers.a # get our env -include ../templates/dtinfo_env.mk +include $(top_srcdir)/programs/dtinfo/dtinfo_env.mk # class info include Classlist.mk diff --git a/cde/programs/dtinfo/dtinfo/src/Marks/Makefile.am b/cde/programs/dtinfo/dtinfo/src/Marks/Makefile.am index c2f69a9c8..f80425b9e 100644 --- a/cde/programs/dtinfo/dtinfo/src/Marks/Makefile.am +++ b/cde/programs/dtinfo/dtinfo/src/Marks/Makefile.am @@ -3,7 +3,7 @@ MAINTAINERCLEANFILES = Makefile.in noinst_LIBRARIES = libMarks.a # get our env -include ../templates/dtinfo_env.mk +include $(top_srcdir)/programs/dtinfo/dtinfo_env.mk # class info include Classlist.mk diff --git a/cde/programs/dtinfo/dtinfo/src/Messages/Makefile.am b/cde/programs/dtinfo/dtinfo/src/Messages/Makefile.am index d7a22fecb..136d5fc94 100644 --- a/cde/programs/dtinfo/dtinfo/src/Messages/Makefile.am +++ b/cde/programs/dtinfo/dtinfo/src/Messages/Makefile.am @@ -3,7 +3,7 @@ MAINTAINERCLEANFILES = Makefile.in noinst_DATA = Messages.msg # get our env -include ../templates/dtinfo_env.mk +include $(top_srcdir)/programs/dtinfo/dtinfo_env.mk # class info include Classlist.mk diff --git a/cde/programs/dtinfo/dtinfo/src/OliasSearch/Makefile.am b/cde/programs/dtinfo/dtinfo/src/OliasSearch/Makefile.am index aa018de0b..b85ffbaf8 100644 --- a/cde/programs/dtinfo/dtinfo/src/OliasSearch/Makefile.am +++ b/cde/programs/dtinfo/dtinfo/src/OliasSearch/Makefile.am @@ -3,7 +3,7 @@ MAINTAINERCLEANFILES = Makefile.in noinst_LIBRARIES = libOliasSearch.a # get our env -include ../templates/dtinfo_env.mk +include $(top_srcdir)/programs/dtinfo/dtinfo_env.mk # class info include Classlist.mk diff --git a/cde/programs/dtinfo/dtinfo/src/OnlineRender/Makefile.am b/cde/programs/dtinfo/dtinfo/src/OnlineRender/Makefile.am index a72c8ac68..5c586a388 100644 --- a/cde/programs/dtinfo/dtinfo/src/OnlineRender/Makefile.am +++ b/cde/programs/dtinfo/dtinfo/src/OnlineRender/Makefile.am @@ -3,7 +3,7 @@ MAINTAINERCLEANFILES = Makefile.in noinst_LIBRARIES = libOnlineRender.a # get our env -include ../templates/dtinfo_env.mk +include $(top_srcdir)/programs/dtinfo/dtinfo_env.mk # class info include Classlist.mk diff --git a/cde/programs/dtinfo/dtinfo/src/Other/Makefile.am b/cde/programs/dtinfo/dtinfo/src/Other/Makefile.am index 32027f440..53233960e 100644 --- a/cde/programs/dtinfo/dtinfo/src/Other/Makefile.am +++ b/cde/programs/dtinfo/dtinfo/src/Other/Makefile.am @@ -3,7 +3,7 @@ MAINTAINERCLEANFILES = Makefile.in noinst_LIBRARIES = libOther.a # get our env -include ../templates/dtinfo_env.mk +include $(top_srcdir)/programs/dtinfo/dtinfo_env.mk # class info include Classlist.mk diff --git a/cde/programs/dtinfo/dtinfo/src/Preferences/Makefile.am b/cde/programs/dtinfo/dtinfo/src/Preferences/Makefile.am index 00e20fff1..1e88e5aa3 100644 --- a/cde/programs/dtinfo/dtinfo/src/Preferences/Makefile.am +++ b/cde/programs/dtinfo/dtinfo/src/Preferences/Makefile.am @@ -3,7 +3,7 @@ MAINTAINERCLEANFILES = Makefile.in noinst_LIBRARIES = libPreferences.a # get our env -include ../templates/dtinfo_env.mk +include $(top_srcdir)/programs/dtinfo/dtinfo_env.mk # class info include Classlist.mk diff --git a/cde/programs/dtinfo/dtinfo/src/Query/Makefile.am b/cde/programs/dtinfo/dtinfo/src/Query/Makefile.am index 98ef3aa71..36612b908 100644 --- a/cde/programs/dtinfo/dtinfo/src/Query/Makefile.am +++ b/cde/programs/dtinfo/dtinfo/src/Query/Makefile.am @@ -3,7 +3,7 @@ MAINTAINERCLEANFILES = Makefile.in noinst_LIBRARIES = libQuery.a # get our env -include ../templates/dtinfo_env.mk +include $(top_srcdir)/programs/dtinfo/dtinfo_env.mk # class info include Classlist.mk diff --git a/cde/programs/dtinfo/dtinfo/src/Support/Makefile.am b/cde/programs/dtinfo/dtinfo/src/Support/Makefile.am index 8c49cb001..43dcfbad2 100644 --- a/cde/programs/dtinfo/dtinfo/src/Support/Makefile.am +++ b/cde/programs/dtinfo/dtinfo/src/Support/Makefile.am @@ -3,7 +3,7 @@ MAINTAINERCLEANFILES = Makefile.in noinst_LIBRARIES = libSupport.a # get our env -include ../templates/dtinfo_env.mk +include $(top_srcdir)/programs/dtinfo/dtinfo_env.mk # class info include Classlist.mk diff --git a/cde/programs/dtinfo/dtinfo/src/UAS/Base/Makefile.am b/cde/programs/dtinfo/dtinfo/src/UAS/Base/Makefile.am index c72eedd65..bb68e2f16 100644 --- a/cde/programs/dtinfo/dtinfo/src/UAS/Base/Makefile.am +++ b/cde/programs/dtinfo/dtinfo/src/UAS/Base/Makefile.am @@ -3,7 +3,7 @@ MAINTAINERCLEANFILES = Makefile.in noinst_LIBRARIES = libBase.a # get our env -include ../../templates/dtinfo_env.mk +include $(top_srcdir)/programs/dtinfo/dtinfo_env.mk # class info include Classlist.mk diff --git a/cde/programs/dtinfo/dtinfo/src/UAS/DtSR/Makefile.am b/cde/programs/dtinfo/dtinfo/src/UAS/DtSR/Makefile.am index ef995c5a3..a30087220 100644 --- a/cde/programs/dtinfo/dtinfo/src/UAS/DtSR/Makefile.am +++ b/cde/programs/dtinfo/dtinfo/src/UAS/DtSR/Makefile.am @@ -3,7 +3,7 @@ MAINTAINERCLEANFILES = Makefile.in noinst_LIBRARIES = libDtSR.a # get our env -include ../../templates/dtinfo_env.mk +include $(top_srcdir)/programs/dtinfo/dtinfo_env.mk # class info include Classlist.mk diff --git a/cde/programs/dtinfo/dtinfo/src/UAS/MMDB/Makefile.am b/cde/programs/dtinfo/dtinfo/src/UAS/MMDB/Makefile.am index eb59d7e98..289197a4f 100644 --- a/cde/programs/dtinfo/dtinfo/src/UAS/MMDB/Makefile.am +++ b/cde/programs/dtinfo/dtinfo/src/UAS/MMDB/Makefile.am @@ -3,7 +3,7 @@ MAINTAINERCLEANFILES = Makefile.in noinst_LIBRARIES = libMMDB.a # get our env -include ../../templates/dtinfo_env.mk +include $(top_srcdir)/programs/dtinfo/dtinfo_env.mk # class info include Classlist.mk diff --git a/cde/programs/dtinfo/dtinfo/src/UAS/Makefile.am b/cde/programs/dtinfo/dtinfo/src/UAS/Makefile.am index b372b4f49..1e418d195 100644 --- a/cde/programs/dtinfo/dtinfo/src/UAS/Makefile.am +++ b/cde/programs/dtinfo/dtinfo/src/UAS/Makefile.am @@ -5,7 +5,7 @@ SUBDIRS = Base MMDB DtSR noinst_LIBRARIES = libUAS.a # get our env -include ../templates/dtinfo_env.mk +include $(top_srcdir)/programs/dtinfo/dtinfo_env.mk # class info include Classlist.mk diff --git a/cde/programs/dtinfo/dtinfo/src/Widgets/Makefile.am b/cde/programs/dtinfo/dtinfo/src/Widgets/Makefile.am index dbe7c6765..9029a942a 100644 --- a/cde/programs/dtinfo/dtinfo/src/Widgets/Makefile.am +++ b/cde/programs/dtinfo/dtinfo/src/Widgets/Makefile.am @@ -3,7 +3,7 @@ MAINTAINERCLEANFILES = Makefile.in noinst_LIBRARIES = libWidgets.a # get our env -include ../templates/dtinfo_env.mk +include $(top_srcdir)/programs/dtinfo/dtinfo_env.mk libWidgets_a_CXXFLAGS = $(DTINFO_DEFINES) $(DTINFO_INCLUDES) diff --git a/cde/programs/dtinfo/dtinfo/src/cgm/Makefile.am b/cde/programs/dtinfo/dtinfo/src/cgm/Makefile.am index c0d192d39..008f66280 100644 --- a/cde/programs/dtinfo/dtinfo/src/cgm/Makefile.am +++ b/cde/programs/dtinfo/dtinfo/src/cgm/Makefile.am @@ -3,7 +3,7 @@ MAINTAINERCLEANFILES = Makefile.in noinst_LIBRARIES = libcgm.a # get our env -include ../templates/dtinfo_env.mk +include $(top_srcdir)/programs/dtinfo/dtinfo_env.mk # class info libcgm_a_CFLAGS = $(DTINFO_DEFINES) $(DTINFO_INCLUDES) \ diff --git a/cde/programs/dtinfo/dtinfo/src/templates/dtinfo_env.mk b/cde/programs/dtinfo/dtinfo_env.mk similarity index 51% rename from cde/programs/dtinfo/dtinfo/src/templates/dtinfo_env.mk rename to cde/programs/dtinfo/dtinfo_env.mk index 675fd9ccd..a58e6ecbf 100644 --- a/cde/programs/dtinfo/dtinfo/src/templates/dtinfo_env.mk +++ b/cde/programs/dtinfo/dtinfo_env.mk @@ -1,4 +1,5 @@ -# Some common env variables needed by the various modules +# Some common env variables needed by the various modules. This file +# is included by various Makefile.am files in the dtinfo hierarchy. # common defines DTINFO_DEFINES = -DDtinfoClient -DUseWideChars -DInternationalize \ @@ -17,25 +18,28 @@ if SOLARIS DTINFO_DEFINES += -DHAS_TERMINATE -DNATIVE_EXCEPTIONS endif -# where stuff is -OLIAS = $(top_srcdir)/programs/dtinfo -CONTROL=$(OLIAS)/control -LIBRARY = $(OLIAS)/library +# where stuff is... This may need to be fixed further if we want to be +# able to support shadow builds someday +OLIAS = $(top_builddir)/programs/dtinfo +OLIASSRC = $(top_srcdir)/programs/dtinfo WWL = $(OLIAS)/dtinfo/wwl +WWLSRC = $(OLIASSRC)/dtinfo/wwl MMDB = $(OLIAS)/DtMmdb +MMDBSRC = $(OLIASSRC)/DtMmdb EXCEPTIONS = $(MMDB)/dti_excs +EXCEPTIONSSRC = $(MMDBSRC)/dti_excs TOOLS = $(OLIAS)/tools UAS = $(OLIAS)/dtinfo/src/UAS +UASSRC = $(OLIASSRC)/dtinfo/src/UAS -WWL_INCLUDES = -I$(WWL)/include +WWL_INCLUDES = -I$(WWLSRC)/include WWL_LIBS=$(STATIC) -L$(WWL)/src -lWWL -EXCEPTIONS_INCLUDES = -I$(EXCEPTIONS) -MMDB_INCLUDES = -I$(MMDB) +EXCEPTIONS_INCLUDES = -I$(EXCEPTIONSSRC) +MMDB_INCLUDES = -I$(MMDBSRC) MMDB_LIBS=$(OLIAS)/mmdb/libMMDB.la -UAS_INCLUDES = -I$(UAS)/Base -COMMON_CLASS_INCLUDES = -I$(MMDB)/dti_cc -I$(MMDB) -COMMON_CLASS_LIBDIR = $(STATIC) -L$(MMDB)/dti_cc -STYLE_SHEET_INCLUDES = -I$(MMDB)/StyleSheet +UAS_INCLUDES = -I$(UASSRC)/Base +COMMON_CLASS_INCLUDES = -I$(MMDBSRC)/dti_cc -I$(MMDBSRC) +STYLE_SHEET_INCLUDES = -I$(MMDBSRC)/StyleSheet TREERES = $(TOOLS)/misc/treeres MSGSETS = $(TOOLS)/misc/msgsets diff --git a/cde/programs/dtinfo/mmdb/HardCopy/Makefile.am b/cde/programs/dtinfo/mmdb/HardCopy/Makefile.am index 911d6daa6..17ae72de1 100644 --- a/cde/programs/dtinfo/mmdb/HardCopy/Makefile.am +++ b/cde/programs/dtinfo/mmdb/HardCopy/Makefile.am @@ -1,6 +1,6 @@ MAINTAINERCLEANFILES = Makefile.in -include $(top_srcdir)/programs/dtinfo/dtinfo/src/templates/dtinfo_env.mk +include $(top_srcdir)/programs/dtinfo/dtinfo_env.mk BASE = ../../DtMmdb/HardCopy BUILT_SOURCES = FPset.C HardCopyFP.C autoNumber.C autoNumberFP.C diff --git a/cde/programs/dtinfo/mmdb/StyleSheet/Makefile.am b/cde/programs/dtinfo/mmdb/StyleSheet/Makefile.am index afc7c293c..c06324777 100644 --- a/cde/programs/dtinfo/mmdb/StyleSheet/Makefile.am +++ b/cde/programs/dtinfo/mmdb/StyleSheet/Makefile.am @@ -1,6 +1,6 @@ MAINTAINERCLEANFILES = Makefile.in -include $(top_srcdir)/programs/dtinfo/dtinfo/src/templates/dtinfo_env.mk +include $(top_srcdir)/programs/dtinfo/dtinfo_env.mk BASE = ../../DtMmdb/StyleSheet BUILT_SOURCES = Attribute.C AttributeList.C BitVector.C DocParser.C \ diff --git a/cde/programs/dtinfo/mmdb/api/Makefile.am b/cde/programs/dtinfo/mmdb/api/Makefile.am index df1038953..74378b1d7 100644 --- a/cde/programs/dtinfo/mmdb/api/Makefile.am +++ b/cde/programs/dtinfo/mmdb/api/Makefile.am @@ -1,6 +1,6 @@ MAINTAINERCLEANFILES = Makefile.in -include $(top_srcdir)/programs/dtinfo/dtinfo/src/templates/dtinfo_env.mk +include $(top_srcdir)/programs/dtinfo/dtinfo_env.mk BASE = ../../DtMmdb/api BUILT_SOURCES = base.C info_base.C info_lib.C smart_ptr.C \ diff --git a/cde/programs/dtinfo/mmdb/btree/Makefile.am b/cde/programs/dtinfo/mmdb/btree/Makefile.am index 790881c9a..388951e66 100644 --- a/cde/programs/dtinfo/mmdb/btree/Makefile.am +++ b/cde/programs/dtinfo/mmdb/btree/Makefile.am @@ -1,6 +1,6 @@ MAINTAINERCLEANFILES = Makefile.in -include $(top_srcdir)/programs/dtinfo/dtinfo/src/templates/dtinfo_env.mk +include $(top_srcdir)/programs/dtinfo/dtinfo_env.mk BASE = ../../DtMmdb/btree BUILT_SOURCES = mmdb_btree.C diff --git a/cde/programs/dtinfo/mmdb/btree_berkeley/Makefile.am b/cde/programs/dtinfo/mmdb/btree_berkeley/Makefile.am index 51ff9b5d5..9c58c883f 100644 --- a/cde/programs/dtinfo/mmdb/btree_berkeley/Makefile.am +++ b/cde/programs/dtinfo/mmdb/btree_berkeley/Makefile.am @@ -1,6 +1,6 @@ MAINTAINERCLEANFILES = Makefile.in -include $(top_srcdir)/programs/dtinfo/dtinfo/src/templates/dtinfo_env.mk +include $(top_srcdir)/programs/dtinfo/dtinfo_env.mk BASE = ../../DtMmdb/btree_berkeley BUILT_SOURCES = bt_close.c bt_conv.c bt_debug.c bt_delete.c bt_get.c \ diff --git a/cde/programs/dtinfo/mmdb/compression/Makefile.am b/cde/programs/dtinfo/mmdb/compression/Makefile.am index 5eaf51c52..94b2ebb19 100644 --- a/cde/programs/dtinfo/mmdb/compression/Makefile.am +++ b/cde/programs/dtinfo/mmdb/compression/Makefile.am @@ -1,6 +1,6 @@ MAINTAINERCLEANFILES = Makefile.in -include $(top_srcdir)/programs/dtinfo/dtinfo/src/templates/dtinfo_env.mk +include $(top_srcdir)/programs/dtinfo/dtinfo_env.mk BASE = ../../DtMmdb/compression BUILT_SOURCES = abs_agent.C zip.C huffman.C trie.C code.C lzss.C diff --git a/cde/programs/dtinfo/mmdb/diskhash/Makefile.am b/cde/programs/dtinfo/mmdb/diskhash/Makefile.am index a674ddcd8..7bf4ac36b 100644 --- a/cde/programs/dtinfo/mmdb/diskhash/Makefile.am +++ b/cde/programs/dtinfo/mmdb/diskhash/Makefile.am @@ -1,6 +1,6 @@ MAINTAINERCLEANFILES = Makefile.in -include $(top_srcdir)/programs/dtinfo/dtinfo/src/templates/dtinfo_env.mk +include $(top_srcdir)/programs/dtinfo/dtinfo_env.mk BASE = ../../DtMmdb/diskhash BUILT_SOURCES = disk_bucket.C bucket_array.C disk_hash.C diff --git a/cde/programs/dtinfo/mmdb/dstr/Makefile.am b/cde/programs/dtinfo/mmdb/dstr/Makefile.am index 096f569c7..bab8c0aed 100644 --- a/cde/programs/dtinfo/mmdb/dstr/Makefile.am +++ b/cde/programs/dtinfo/mmdb/dstr/Makefile.am @@ -1,6 +1,6 @@ MAINTAINERCLEANFILES = Makefile.in -include $(top_srcdir)/programs/dtinfo/dtinfo/src/templates/dtinfo_env.mk +include $(top_srcdir)/programs/dtinfo/dtinfo_env.mk BASE = ../../DtMmdb/dstr BUILT_SOURCES = set.C bset.C slist.C dlist_cell.C dlist.C heap.C \ diff --git a/cde/programs/dtinfo/mmdb/dti_cc/Makefile.am b/cde/programs/dtinfo/mmdb/dti_cc/Makefile.am index 1066c994d..e857b56d3 100644 --- a/cde/programs/dtinfo/mmdb/dti_cc/Makefile.am +++ b/cde/programs/dtinfo/mmdb/dti_cc/Makefile.am @@ -1,6 +1,6 @@ MAINTAINERCLEANFILES = Makefile.in -include $(top_srcdir)/programs/dtinfo/dtinfo/src/templates/dtinfo_env.mk +include $(top_srcdir)/programs/dtinfo/dtinfo_env.mk BASE = ../../DtMmdb/dti_cc BUILT_SOURCES = CC_Listbase.C cc_exceptions.C CC_String.C \ diff --git a/cde/programs/dtinfo/mmdb/dti_excs/Makefile.am b/cde/programs/dtinfo/mmdb/dti_excs/Makefile.am index 8bcceba76..f0146f2a1 100644 --- a/cde/programs/dtinfo/mmdb/dti_excs/Makefile.am +++ b/cde/programs/dtinfo/mmdb/dti_excs/Makefile.am @@ -1,6 +1,6 @@ MAINTAINERCLEANFILES = Makefile.in -include $(top_srcdir)/programs/dtinfo/dtinfo/src/templates/dtinfo_env.mk +include $(top_srcdir)/programs/dtinfo/dtinfo_env.mk BASE = ../../DtMmdb/dti_excs BUILT_SOURCES = Jump_Environment.C Exceptions.C Exception.C \ diff --git a/cde/programs/dtinfo/mmdb/dynhash/Makefile.am b/cde/programs/dtinfo/mmdb/dynhash/Makefile.am index 29aec7b32..4857d139c 100644 --- a/cde/programs/dtinfo/mmdb/dynhash/Makefile.am +++ b/cde/programs/dtinfo/mmdb/dynhash/Makefile.am @@ -1,6 +1,6 @@ MAINTAINERCLEANFILES = Makefile.in -include $(top_srcdir)/programs/dtinfo/dtinfo/src/templates/dtinfo_env.mk +include $(top_srcdir)/programs/dtinfo/dtinfo_env.mk BASE = ../../DtMmdb/dynhash BUILT_SOURCES = data_t.C imp_bucket.C imp_die.C diff --git a/cde/programs/dtinfo/mmdb/hmphf/Makefile.am b/cde/programs/dtinfo/mmdb/hmphf/Makefile.am index 167e894d5..39ce6ba5f 100644 --- a/cde/programs/dtinfo/mmdb/hmphf/Makefile.am +++ b/cde/programs/dtinfo/mmdb/hmphf/Makefile.am @@ -1,6 +1,6 @@ MAINTAINERCLEANFILES = Makefile.in -include $(top_srcdir)/programs/dtinfo/dtinfo/src/templates/dtinfo_env.mk +include $(top_srcdir)/programs/dtinfo/dtinfo_env.mk BASE = ../../DtMmdb/hmphf BUILT_SOURCES = buckets.C mphf_funcs.C mphf_hash_table.C params.C \ diff --git a/cde/programs/dtinfo/mmdb/index/Makefile.am b/cde/programs/dtinfo/mmdb/index/Makefile.am index 71eaf20d8..fcf498d9c 100644 --- a/cde/programs/dtinfo/mmdb/index/Makefile.am +++ b/cde/programs/dtinfo/mmdb/index/Makefile.am @@ -1,6 +1,6 @@ MAINTAINERCLEANFILES = Makefile.in -include $(top_srcdir)/programs/dtinfo/dtinfo/src/templates/dtinfo_env.mk +include $(top_srcdir)/programs/dtinfo/dtinfo_env.mk BASE = ../../DtMmdb/index BUILT_SOURCES = btree_index.C dyn_disk_index.C dyn_index.C \ diff --git a/cde/programs/dtinfo/mmdb/mgrs/Makefile.am b/cde/programs/dtinfo/mmdb/mgrs/Makefile.am index 167699b34..85921d1a0 100644 --- a/cde/programs/dtinfo/mmdb/mgrs/Makefile.am +++ b/cde/programs/dtinfo/mmdb/mgrs/Makefile.am @@ -1,6 +1,6 @@ MAINTAINERCLEANFILES = Makefile.in -include $(top_srcdir)/programs/dtinfo/dtinfo/src/templates/dtinfo_env.mk +include $(top_srcdir)/programs/dtinfo/dtinfo_env.mk BASE = ../../DtMmdb/mgrs BUILT_SOURCES = managers.C misc.C query_mgr.C template_mgr.C diff --git a/cde/programs/dtinfo/mmdb/misc/Makefile.am b/cde/programs/dtinfo/mmdb/misc/Makefile.am index 65507dfda..15de30858 100644 --- a/cde/programs/dtinfo/mmdb/misc/Makefile.am +++ b/cde/programs/dtinfo/mmdb/misc/Makefile.am @@ -1,6 +1,6 @@ MAINTAINERCLEANFILES= Makefile.in -include $(top_srcdir)/programs/dtinfo/dtinfo/src/templates/dtinfo_env.mk +include $(top_srcdir)/programs/dtinfo/dtinfo_env.mk BASE = ../../DtMmdb/misc BUILT_SOURCES = unique_id.c diff --git a/cde/programs/dtinfo/mmdb/object/Makefile.am b/cde/programs/dtinfo/mmdb/object/Makefile.am index 478d137df..cb0b8671f 100644 --- a/cde/programs/dtinfo/mmdb/object/Makefile.am +++ b/cde/programs/dtinfo/mmdb/object/Makefile.am @@ -1,6 +1,6 @@ MAINTAINERCLEANFILES = Makefile.in -include $(top_srcdir)/programs/dtinfo/dtinfo/src/templates/dtinfo_env.mk +include $(top_srcdir)/programs/dtinfo/dtinfo_env.mk BASE = ../../DtMmdb/object BUILT_SOURCES = composite.C compressed_pstring.C cset.C dl_list.C \ diff --git a/cde/programs/dtinfo/mmdb/oliasdb/Makefile.am b/cde/programs/dtinfo/mmdb/oliasdb/Makefile.am index aa38c7566..e3b394ec8 100644 --- a/cde/programs/dtinfo/mmdb/oliasdb/Makefile.am +++ b/cde/programs/dtinfo/mmdb/oliasdb/Makefile.am @@ -1,6 +1,6 @@ MAINTAINERCLEANFILES = Makefile.in -include $(top_srcdir)/programs/dtinfo/dtinfo/src/templates/dtinfo_env.mk +include $(top_srcdir)/programs/dtinfo/dtinfo_env.mk BASE = ../../DtMmdb/oliasdb BUILT_SOURCES = asciiIn_filters.C collectionIterator.C dlp_hd.C \ diff --git a/cde/programs/dtinfo/mmdb/schema/Makefile.am b/cde/programs/dtinfo/mmdb/schema/Makefile.am index 1ee649c19..468e73a01 100644 --- a/cde/programs/dtinfo/mmdb/schema/Makefile.am +++ b/cde/programs/dtinfo/mmdb/schema/Makefile.am @@ -1,6 +1,6 @@ MAINTAINERCLEANFILES = Makefile.in -include $(top_srcdir)/programs/dtinfo/dtinfo/src/templates/dtinfo_env.mk +include $(top_srcdir)/programs/dtinfo/dtinfo_env.mk BASE = ../../DtMmdb/schema BUILT_SOURCES = desc.C store_desc.C object_dict.C \ diff --git a/cde/programs/dtinfo/mmdb/storage/Makefile.am b/cde/programs/dtinfo/mmdb/storage/Makefile.am index 75698bf66..bed6a5885 100644 --- a/cde/programs/dtinfo/mmdb/storage/Makefile.am +++ b/cde/programs/dtinfo/mmdb/storage/Makefile.am @@ -1,6 +1,6 @@ MAINTAINERCLEANFILES = Makefile.in -include $(top_srcdir)/programs/dtinfo/dtinfo/src/templates/dtinfo_env.mk +include $(top_srcdir)/programs/dtinfo/dtinfo_env.mk BASE = ../../DtMmdb/storage BUILT_SOURCES = abs_storage.C chunks_index.C heap_comp_funcs.C lru.C \ diff --git a/cde/programs/dtinfo/mmdb/utility/Makefile.am b/cde/programs/dtinfo/mmdb/utility/Makefile.am index 88eeb6ac0..3252f55d0 100644 --- a/cde/programs/dtinfo/mmdb/utility/Makefile.am +++ b/cde/programs/dtinfo/mmdb/utility/Makefile.am @@ -1,6 +1,6 @@ MAINTAINERCLEANFILES = Makefile.in -include $(top_srcdir)/programs/dtinfo/dtinfo/src/templates/dtinfo_env.mk +include $(top_srcdir)/programs/dtinfo/dtinfo_env.mk BASE = ../../DtMmdb/utility BUILT_SOURCES = atoi_fast.C atoi_larson.C atoi_pearson.C \