Index: trunk/FACT++/Makefile.in
===================================================================
--- trunk/FACT++/Makefile.in	(revision 10362)
+++ trunk/FACT++/Makefile.in	(revision 10363)
@@ -105,26 +105,22 @@
 am__v_lt_0 = --silent
 libDim___la_LIBADD =
-am_libDim___la_OBJECTS = dim_v19r15/src/diccpp.lo \
-	dim_v19r15/src/dimcpp.lo dim_v19r15/src/tokenstring.lo \
-	dim_v19r15/src/discpp.lo
+am_libDim___la_OBJECTS = dim/src/diccpp.lo dim/src/dimcpp.lo \
+	dim/src/tokenstring.lo dim/src/discpp.lo
 libDim___la_OBJECTS = $(am_libDim___la_OBJECTS)
 libDim_la_LIBADD =
-am_libDim_la_OBJECTS = dim_v19r15/src/dic.lo dim_v19r15/src/dis.lo \
-	dim_v19r15/src/dna.lo dim_v19r15/src/sll.lo \
-	dim_v19r15/src/dll.lo dim_v19r15/src/hash.lo \
-	dim_v19r15/src/swap.lo dim_v19r15/src/copy_swap.lo \
-	dim_v19r15/src/open_dns.lo dim_v19r15/src/conn_handler.lo \
-	dim_v19r15/src/tcpip.lo dim_v19r15/src/dtq.lo \
-	dim_v19r15/src/dim_thr.lo dim_v19r15/src/utilities.lo
+am_libDim_la_OBJECTS = dim/src/dic.lo dim/src/dis.lo dim/src/dna.lo \
+	dim/src/sll.lo dim/src/dll.lo dim/src/hash.lo dim/src/swap.lo \
+	dim/src/copy_swap.lo dim/src/open_dns.lo \
+	dim/src/conn_handler.lo dim/src/tcpip.lo dim/src/dtq.lo \
+	dim/src/dim_thr.lo dim/src/utilities.lo
 libDim_la_OBJECTS = $(am_libDim_la_OBJECTS)
 libStateMachine_la_LIBADD =
-am_libStateMachine_la_OBJECTS = src/EventImp.lo src/Event.lo \
-	src/MessageImp.lo src/MessageDim.lo src/Converter.lo \
-	src/StateMachineImp.lo src/StateMachineDim.lo \
-	src/StateMachine.lo src/ServiceList.lo \
-	src/DimErrorRedirecter.lo src/WindowLog.lo src/Readline.lo \
+am_libStateMachine_la_OBJECTS = src/WindowLog.lo src/Readline.lo \
 	src/ReadlineColor.lo src/ReadlineWindow.lo src/Console.lo \
-	src/Shell.lo src/Description.lo src/DimDescriptionService.lo \
-	src/Connection.lo
+	src/Shell.lo src/EventImp.lo src/Event.lo src/Description.lo \
+	src/MessageImp.lo src/Converter.lo src/StateMachineImp.lo \
+	src/StateMachine.lo src/MessageDim.lo src/StateMachineDim.lo \
+	src/ServiceList.lo src/DimErrorRedirecter.lo \
+	src/DimDescriptionService.lo src/Connection.lo
 libStateMachine_la_OBJECTS = $(am_libStateMachine_la_OBJECTS)
 libTime_la_LIBADD =
@@ -148,9 +144,9 @@
 dclient5_DEPENDENCIES = libDim.la libDim++.la libTools.la libTime.la \
 	libStateMachine.la libConfiguration.la
-am_did_OBJECTS = dim_v19r15/src/did/did-did.$(OBJEXT) \
-	dim_v19r15/src/did/did-dui_util.$(OBJEXT)
+am_did_OBJECTS = dim/src/did/did-did.$(OBJEXT) \
+	dim/src/did/did-dui_util.$(OBJEXT)
 did_OBJECTS = $(am_did_OBJECTS)
 did_DEPENDENCIES = libDim.la
-am_dns_OBJECTS = dim_v19r15/src/dns.$(OBJEXT)
+am_dns_OBJECTS = dim/src/dns.$(OBJEXT)
 dns_OBJECTS = $(am_dns_OBJECTS)
 dns_DEPENDENCIES = libDim.la
@@ -450,5 +446,5 @@
 AM_CPPFLAGS = \
    -O3 -Wall -Winit-self -Wpointer-arith -Wcast-align -Wextra -Wformat=2 \
-   -Idim_v19r15/dim $(DIM_FLAGS) $(BOOST_FLAGS)
+   -Idim/dim $(DIM_FLAGS) $(BOOST_FLAGS)
 
 AM_CXXFLAGS = $(AM_CPPFLAGS) -Woverloaded-virtual -Wshadow -std=c++0x
@@ -465,23 +461,20 @@
 #-------------------------------------------------------------------------
 dist_noinst_SCRIPTS = autogen.sh
-EXTRA_DIST = Doxyfile dim_v19r15/DIM_Performance.pdf \
-	dim_v19r15/LICENSE.GPL dim_v19r15/README.txt \
-	dim_v19r15/README_v9.txt dim_v19r15/README_v10.txt \
-	dim_v19r15/README_v11.txt dim_v19r15/README_v12.txt \
-	dim_v19r15/README_v13.txt dim_v19r15/README_v14.txt \
-	dim_v19r15/README_v15.txt dim_v19r15/README_v16.txt \
-	dim_v19r15/README_v17.txt dim_v19r15/README_v18.txt \
-	dim_v19r15/README_v19.txt $(dist_man1_MANS:.man=.html) \
-	$(dist_man1_MANS:.man=.pdf)
+EXTRA_DIST = Doxyfile dim/DIM_Performance.pdf dim/LICENSE.GPL \
+	dim/README.txt dim/README_v9.txt dim/README_v10.txt \
+	dim/README_v11.txt dim/README_v12.txt dim/README_v13.txt \
+	dim/README_v14.txt dim/README_v17.txt dim/README_v16.txt \
+	dim/README_v17.txt dim/README_v18.txt dim/README_v19.txt \
+	$(dist_man1_MANS:.man=.html) $(dist_man1_MANS:.man=.pdf)
 CLEANFILES = $(dist_man1_MANS:.man=.pdf)  $(dist_man1_MANS:.man=.html)
 dns_LDADD = libDim.la
-dns_SOURCES = dim_v19r15/src/dns.c
+dns_SOURCES = dim/src/dns.c
 #dns_CPPFLAGS = $(AM_CPPFLAGS) $(DIM_FLAGS)
 did_LDADD = libDim.la 
-did_CPPFLAGS = $(AM_CPPFLAGS) -Idim_v19r15/src/did 
+did_CPPFLAGS = $(AM_CPPFLAGS) -Idim/src/did 
 did_SOURCES = \
-	dim_v19r15/src/did/did.c dim_v19r15/src/did/did.h \
-	dim_v19r15/src/did/dui_util.c dim_v19r15/src/did/dui_util.h \
-	dim_v19r15/src/did/dui_colors.h
+	dim/src/did/did.c dim/src/did/did.h \
+	dim/src/did/dui_util.c dim/src/did/dui_util.h \
+	dim/src/did/dui_colors.h
 
 
@@ -489,25 +482,25 @@
 libDim_ladir = 
 libDim_la_HEADERS = \
-	dim_v19r15/dim/dic.h \
-	dim_v19r15/dim/dim_common.h \
-	dim_v19r15/dim/dim.h \
-	dim_v19r15/dim/dim_tcpip.h \
-	dim_v19r15/dim/dis.h 
+	dim/dim/dic.h \
+	dim/dim/dim_common.h \
+	dim/dim/dim.h \
+	dim/dim/dim_tcpip.h \
+	dim/dim/dis.h 
 
 libDim_la_SOURCES = \
-	dim_v19r15/src/dic.c \
-	dim_v19r15/src/dis.c \
-	dim_v19r15/src/dna.c \
-	dim_v19r15/src/sll.c \
-	dim_v19r15/src/dll.c  \
-	dim_v19r15/src/hash.c \
-	dim_v19r15/src/swap.c \
-	dim_v19r15/src/copy_swap.c \
-	dim_v19r15/src/open_dns.c \
-	dim_v19r15/src/conn_handler.c \
-	dim_v19r15/src/tcpip.c \
-	dim_v19r15/src/dtq.c \
-	dim_v19r15/src/dim_thr.c \
-	dim_v19r15/src/utilities.c
+	dim/src/dic.c \
+	dim/src/dis.c \
+	dim/src/dna.c \
+	dim/src/sll.c \
+	dim/src/dll.c  \
+	dim/src/hash.c \
+	dim/src/swap.c \
+	dim/src/copy_swap.c \
+	dim/src/open_dns.c \
+	dim/src/conn_handler.c \
+	dim/src/tcpip.c \
+	dim/src/dtq.c \
+	dim/src/dim_thr.c \
+	dim/src/utilities.c
 
 
@@ -515,32 +508,22 @@
 libDim___ladir = 
 libDim___la_HEADERS = \
-	dim_v19r15/dim/dic.hxx \
-	dim_v19r15/dim/dis.hxx \
-	dim_v19r15/dim/dim_core.hxx \
-	dim_v19r15/dim/dim.hxx \
-	dim_v19r15/dim/dim_tcpip.h \
-	dim_v19r15/dim/dllist.hxx \
-	dim_v19r15/dim/sllist.hxx \
-	dim_v19r15/dim/tokenstring.hxx 
+	dim/dim/dic.hxx \
+	dim/dim/dis.hxx \
+	dim/dim/dim_core.hxx \
+	dim/dim/dim.hxx \
+	dim/dim/dim_tcpip.h \
+	dim/dim/dllist.hxx \
+	dim/dim/sllist.hxx \
+	dim/dim/tokenstring.hxx 
 
 libDim___la_SOURCES = \
-	dim_v19r15/src/diccpp.cxx \
-	dim_v19r15/src/dimcpp.cxx \
-	dim_v19r15/src/tokenstring.cxx \
-	dim_v19r15/src/discpp.cxx 
-
-
-# Divide into Tools/StateMachine/Shell/TcpIp
+	dim/src/diccpp.cxx \
+	dim/src/dimcpp.cxx \
+	dim/src/tokenstring.cxx \
+	dim/src/discpp.cxx 
+
+
+# Divide into Readline / StateMachine / StateMachineDim / Tools?
 libStateMachine_la_SOURCES = \
-	src/EventImp.h        src/EventImp.cc \
-	src/Event.h           src/Event.cc \
-	src/MessageImp.h      src/MessageImp.cc \
-	src/MessageDim.h      src/MessageDim.cc \
-	src/Converter.h       src/Converter.cc \
-	src/StateMachineImp.h src/StateMachineImp.cc \
-	src/StateMachineDim.h src/StateMachineDim.cc \
-	src/StateMachine.h    src/StateMachine.cc \
-	src/ServiceList.h     src/ServiceList.cc \
-	src/DimErrorRedirecter.cc \
 	src/WindowLog.h       src/WindowLog.cc \
 	src/Readline.h        src/Readline.cc \
@@ -549,10 +532,23 @@
 	src/Console.h         src/Console.cc \
 	src/Shell.h           src/Shell.cc \
+	\
+	src/EventImp.h        src/EventImp.cc \
+	src/Event.h           src/Event.cc \
 	src/Description.h     src/Description.cc \
+	src/MessageImp.h      src/MessageImp.cc \
+	src/Converter.h       src/Converter.cc \
+	src/StateMachineImp.h src/StateMachineImp.cc \
+	src/StateMachine.h    src/StateMachine.cc \
+	\
+	src/EventDim.h \
+	src/MessageDim.h      src/MessageDim.cc \
+	src/StateMachineDim.h src/StateMachineDim.cc \
+	src/ServiceList.h     src/ServiceList.cc \
+	src/DimErrorRedirecter.h  \
+	src/DimErrorRedirecter.cc \
 	src/DimDescriptionService.h \
 	src/DimDescriptionService.cc \
-	src/Connection.h      src/Connection.cc \
-	src/EventDim.h \
-	src/DimErrorRedirecter.h
+	\
+	src/Connection.h      src/Connection.cc
 
 libConfiguration_la_SOURCES = src/Configuration.h src/Configuration.cc
@@ -679,63 +675,50 @@
 libConfiguration.la: $(libConfiguration_la_OBJECTS) $(libConfiguration_la_DEPENDENCIES) 
 	$(AM_V_CXXLD)$(CXXLINK) -rpath $(libdir) $(libConfiguration_la_OBJECTS) $(libConfiguration_la_LIBADD) $(LIBS)
-dim_v19r15/src/$(am__dirstamp):
-	@$(MKDIR_P) dim_v19r15/src
-	@: > dim_v19r15/src/$(am__dirstamp)
-dim_v19r15/src/$(DEPDIR)/$(am__dirstamp):
-	@$(MKDIR_P) dim_v19r15/src/$(DEPDIR)
-	@: > dim_v19r15/src/$(DEPDIR)/$(am__dirstamp)
-dim_v19r15/src/diccpp.lo: dim_v19r15/src/$(am__dirstamp) \
-	dim_v19r15/src/$(DEPDIR)/$(am__dirstamp)
-dim_v19r15/src/dimcpp.lo: dim_v19r15/src/$(am__dirstamp) \
-	dim_v19r15/src/$(DEPDIR)/$(am__dirstamp)
-dim_v19r15/src/tokenstring.lo: dim_v19r15/src/$(am__dirstamp) \
-	dim_v19r15/src/$(DEPDIR)/$(am__dirstamp)
-dim_v19r15/src/discpp.lo: dim_v19r15/src/$(am__dirstamp) \
-	dim_v19r15/src/$(DEPDIR)/$(am__dirstamp)
+dim/src/$(am__dirstamp):
+	@$(MKDIR_P) dim/src
+	@: > dim/src/$(am__dirstamp)
+dim/src/$(DEPDIR)/$(am__dirstamp):
+	@$(MKDIR_P) dim/src/$(DEPDIR)
+	@: > dim/src/$(DEPDIR)/$(am__dirstamp)
+dim/src/diccpp.lo: dim/src/$(am__dirstamp) \
+	dim/src/$(DEPDIR)/$(am__dirstamp)
+dim/src/dimcpp.lo: dim/src/$(am__dirstamp) \
+	dim/src/$(DEPDIR)/$(am__dirstamp)
+dim/src/tokenstring.lo: dim/src/$(am__dirstamp) \
+	dim/src/$(DEPDIR)/$(am__dirstamp)
+dim/src/discpp.lo: dim/src/$(am__dirstamp) \
+	dim/src/$(DEPDIR)/$(am__dirstamp)
 libDim++.la: $(libDim___la_OBJECTS) $(libDim___la_DEPENDENCIES) 
 	$(AM_V_CXXLD)$(CXXLINK) -rpath $(libdir) $(libDim___la_OBJECTS) $(libDim___la_LIBADD) $(LIBS)
-dim_v19r15/src/dic.lo: dim_v19r15/src/$(am__dirstamp) \
-	dim_v19r15/src/$(DEPDIR)/$(am__dirstamp)
-dim_v19r15/src/dis.lo: dim_v19r15/src/$(am__dirstamp) \
-	dim_v19r15/src/$(DEPDIR)/$(am__dirstamp)
-dim_v19r15/src/dna.lo: dim_v19r15/src/$(am__dirstamp) \
-	dim_v19r15/src/$(DEPDIR)/$(am__dirstamp)
-dim_v19r15/src/sll.lo: dim_v19r15/src/$(am__dirstamp) \
-	dim_v19r15/src/$(DEPDIR)/$(am__dirstamp)
-dim_v19r15/src/dll.lo: dim_v19r15/src/$(am__dirstamp) \
-	dim_v19r15/src/$(DEPDIR)/$(am__dirstamp)
-dim_v19r15/src/hash.lo: dim_v19r15/src/$(am__dirstamp) \
-	dim_v19r15/src/$(DEPDIR)/$(am__dirstamp)
-dim_v19r15/src/swap.lo: dim_v19r15/src/$(am__dirstamp) \
-	dim_v19r15/src/$(DEPDIR)/$(am__dirstamp)
-dim_v19r15/src/copy_swap.lo: dim_v19r15/src/$(am__dirstamp) \
-	dim_v19r15/src/$(DEPDIR)/$(am__dirstamp)
-dim_v19r15/src/open_dns.lo: dim_v19r15/src/$(am__dirstamp) \
-	dim_v19r15/src/$(DEPDIR)/$(am__dirstamp)
-dim_v19r15/src/conn_handler.lo: dim_v19r15/src/$(am__dirstamp) \
-	dim_v19r15/src/$(DEPDIR)/$(am__dirstamp)
-dim_v19r15/src/tcpip.lo: dim_v19r15/src/$(am__dirstamp) \
-	dim_v19r15/src/$(DEPDIR)/$(am__dirstamp)
-dim_v19r15/src/dtq.lo: dim_v19r15/src/$(am__dirstamp) \
-	dim_v19r15/src/$(DEPDIR)/$(am__dirstamp)
-dim_v19r15/src/dim_thr.lo: dim_v19r15/src/$(am__dirstamp) \
-	dim_v19r15/src/$(DEPDIR)/$(am__dirstamp)
-dim_v19r15/src/utilities.lo: dim_v19r15/src/$(am__dirstamp) \
-	dim_v19r15/src/$(DEPDIR)/$(am__dirstamp)
+dim/src/dic.lo: dim/src/$(am__dirstamp) \
+	dim/src/$(DEPDIR)/$(am__dirstamp)
+dim/src/dis.lo: dim/src/$(am__dirstamp) \
+	dim/src/$(DEPDIR)/$(am__dirstamp)
+dim/src/dna.lo: dim/src/$(am__dirstamp) \
+	dim/src/$(DEPDIR)/$(am__dirstamp)
+dim/src/sll.lo: dim/src/$(am__dirstamp) \
+	dim/src/$(DEPDIR)/$(am__dirstamp)
+dim/src/dll.lo: dim/src/$(am__dirstamp) \
+	dim/src/$(DEPDIR)/$(am__dirstamp)
+dim/src/hash.lo: dim/src/$(am__dirstamp) \
+	dim/src/$(DEPDIR)/$(am__dirstamp)
+dim/src/swap.lo: dim/src/$(am__dirstamp) \
+	dim/src/$(DEPDIR)/$(am__dirstamp)
+dim/src/copy_swap.lo: dim/src/$(am__dirstamp) \
+	dim/src/$(DEPDIR)/$(am__dirstamp)
+dim/src/open_dns.lo: dim/src/$(am__dirstamp) \
+	dim/src/$(DEPDIR)/$(am__dirstamp)
+dim/src/conn_handler.lo: dim/src/$(am__dirstamp) \
+	dim/src/$(DEPDIR)/$(am__dirstamp)
+dim/src/tcpip.lo: dim/src/$(am__dirstamp) \
+	dim/src/$(DEPDIR)/$(am__dirstamp)
+dim/src/dtq.lo: dim/src/$(am__dirstamp) \
+	dim/src/$(DEPDIR)/$(am__dirstamp)
+dim/src/dim_thr.lo: dim/src/$(am__dirstamp) \
+	dim/src/$(DEPDIR)/$(am__dirstamp)
+dim/src/utilities.lo: dim/src/$(am__dirstamp) \
+	dim/src/$(DEPDIR)/$(am__dirstamp)
 libDim.la: $(libDim_la_OBJECTS) $(libDim_la_DEPENDENCIES) 
 	$(AM_V_CCLD)$(LINK) -rpath $(libdir) $(libDim_la_OBJECTS) $(libDim_la_LIBADD) $(LIBS)
-src/EventImp.lo: src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp)
-src/Event.lo: src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp)
-src/MessageImp.lo: src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp)
-src/MessageDim.lo: src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp)
-src/Converter.lo: src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp)
-src/StateMachineImp.lo: src/$(am__dirstamp) \
-	src/$(DEPDIR)/$(am__dirstamp)
-src/StateMachineDim.lo: src/$(am__dirstamp) \
-	src/$(DEPDIR)/$(am__dirstamp)
-src/StateMachine.lo: src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp)
-src/ServiceList.lo: src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp)
-src/DimErrorRedirecter.lo: src/$(am__dirstamp) \
-	src/$(DEPDIR)/$(am__dirstamp)
 src/WindowLog.lo: src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp)
 src/Readline.lo: src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp)
@@ -746,5 +729,18 @@
 src/Console.lo: src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp)
 src/Shell.lo: src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp)
+src/EventImp.lo: src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp)
+src/Event.lo: src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp)
 src/Description.lo: src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp)
+src/MessageImp.lo: src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp)
+src/Converter.lo: src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp)
+src/StateMachineImp.lo: src/$(am__dirstamp) \
+	src/$(DEPDIR)/$(am__dirstamp)
+src/StateMachine.lo: src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp)
+src/MessageDim.lo: src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp)
+src/StateMachineDim.lo: src/$(am__dirstamp) \
+	src/$(DEPDIR)/$(am__dirstamp)
+src/ServiceList.lo: src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp)
+src/DimErrorRedirecter.lo: src/$(am__dirstamp) \
+	src/$(DEPDIR)/$(am__dirstamp)
 src/DimDescriptionService.lo: src/$(am__dirstamp) \
 	src/$(DEPDIR)/$(am__dirstamp)
@@ -833,21 +829,19 @@
 	@rm -f dclient5$(EXEEXT)
 	$(AM_V_CXXLD)$(CXXLINK) $(dclient5_OBJECTS) $(dclient5_LDADD) $(LIBS)
-dim_v19r15/src/did/$(am__dirstamp):
-	@$(MKDIR_P) dim_v19r15/src/did
-	@: > dim_v19r15/src/did/$(am__dirstamp)
-dim_v19r15/src/did/$(DEPDIR)/$(am__dirstamp):
-	@$(MKDIR_P) dim_v19r15/src/did/$(DEPDIR)
-	@: > dim_v19r15/src/did/$(DEPDIR)/$(am__dirstamp)
-dim_v19r15/src/did/did-did.$(OBJEXT):  \
-	dim_v19r15/src/did/$(am__dirstamp) \
-	dim_v19r15/src/did/$(DEPDIR)/$(am__dirstamp)
-dim_v19r15/src/did/did-dui_util.$(OBJEXT):  \
-	dim_v19r15/src/did/$(am__dirstamp) \
-	dim_v19r15/src/did/$(DEPDIR)/$(am__dirstamp)
+dim/src/did/$(am__dirstamp):
+	@$(MKDIR_P) dim/src/did
+	@: > dim/src/did/$(am__dirstamp)
+dim/src/did/$(DEPDIR)/$(am__dirstamp):
+	@$(MKDIR_P) dim/src/did/$(DEPDIR)
+	@: > dim/src/did/$(DEPDIR)/$(am__dirstamp)
+dim/src/did/did-did.$(OBJEXT): dim/src/did/$(am__dirstamp) \
+	dim/src/did/$(DEPDIR)/$(am__dirstamp)
+dim/src/did/did-dui_util.$(OBJEXT): dim/src/did/$(am__dirstamp) \
+	dim/src/did/$(DEPDIR)/$(am__dirstamp)
 did$(EXEEXT): $(did_OBJECTS) $(did_DEPENDENCIES) 
 	@rm -f did$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(did_OBJECTS) $(did_LDADD) $(LIBS)
-dim_v19r15/src/dns.$(OBJEXT): dim_v19r15/src/$(am__dirstamp) \
-	dim_v19r15/src/$(DEPDIR)/$(am__dirstamp)
+dim/src/dns.$(OBJEXT): dim/src/$(am__dirstamp) \
+	dim/src/$(DEPDIR)/$(am__dirstamp)
 dns$(EXEEXT): $(dns_OBJECTS) $(dns_DEPENDENCIES) 
 	@rm -f dns$(EXEEXT)
@@ -880,43 +874,43 @@
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
-	-rm -f dim_v19r15/src/conn_handler.$(OBJEXT)
-	-rm -f dim_v19r15/src/conn_handler.lo
-	-rm -f dim_v19r15/src/copy_swap.$(OBJEXT)
-	-rm -f dim_v19r15/src/copy_swap.lo
-	-rm -f dim_v19r15/src/dic.$(OBJEXT)
-	-rm -f dim_v19r15/src/dic.lo
-	-rm -f dim_v19r15/src/diccpp.$(OBJEXT)
-	-rm -f dim_v19r15/src/diccpp.lo
-	-rm -f dim_v19r15/src/did/did-did.$(OBJEXT)
-	-rm -f dim_v19r15/src/did/did-dui_util.$(OBJEXT)
-	-rm -f dim_v19r15/src/dim_thr.$(OBJEXT)
-	-rm -f dim_v19r15/src/dim_thr.lo
-	-rm -f dim_v19r15/src/dimcpp.$(OBJEXT)
-	-rm -f dim_v19r15/src/dimcpp.lo
-	-rm -f dim_v19r15/src/dis.$(OBJEXT)
-	-rm -f dim_v19r15/src/dis.lo
-	-rm -f dim_v19r15/src/discpp.$(OBJEXT)
-	-rm -f dim_v19r15/src/discpp.lo
-	-rm -f dim_v19r15/src/dll.$(OBJEXT)
-	-rm -f dim_v19r15/src/dll.lo
-	-rm -f dim_v19r15/src/dna.$(OBJEXT)
-	-rm -f dim_v19r15/src/dna.lo
-	-rm -f dim_v19r15/src/dns.$(OBJEXT)
-	-rm -f dim_v19r15/src/dtq.$(OBJEXT)
-	-rm -f dim_v19r15/src/dtq.lo
-	-rm -f dim_v19r15/src/hash.$(OBJEXT)
-	-rm -f dim_v19r15/src/hash.lo
-	-rm -f dim_v19r15/src/open_dns.$(OBJEXT)
-	-rm -f dim_v19r15/src/open_dns.lo
-	-rm -f dim_v19r15/src/sll.$(OBJEXT)
-	-rm -f dim_v19r15/src/sll.lo
-	-rm -f dim_v19r15/src/swap.$(OBJEXT)
-	-rm -f dim_v19r15/src/swap.lo
-	-rm -f dim_v19r15/src/tcpip.$(OBJEXT)
-	-rm -f dim_v19r15/src/tcpip.lo
-	-rm -f dim_v19r15/src/tokenstring.$(OBJEXT)
-	-rm -f dim_v19r15/src/tokenstring.lo
-	-rm -f dim_v19r15/src/utilities.$(OBJEXT)
-	-rm -f dim_v19r15/src/utilities.lo
+	-rm -f dim/src/conn_handler.$(OBJEXT)
+	-rm -f dim/src/conn_handler.lo
+	-rm -f dim/src/copy_swap.$(OBJEXT)
+	-rm -f dim/src/copy_swap.lo
+	-rm -f dim/src/dic.$(OBJEXT)
+	-rm -f dim/src/dic.lo
+	-rm -f dim/src/diccpp.$(OBJEXT)
+	-rm -f dim/src/diccpp.lo
+	-rm -f dim/src/did/did-did.$(OBJEXT)
+	-rm -f dim/src/did/did-dui_util.$(OBJEXT)
+	-rm -f dim/src/dim_thr.$(OBJEXT)
+	-rm -f dim/src/dim_thr.lo
+	-rm -f dim/src/dimcpp.$(OBJEXT)
+	-rm -f dim/src/dimcpp.lo
+	-rm -f dim/src/dis.$(OBJEXT)
+	-rm -f dim/src/dis.lo
+	-rm -f dim/src/discpp.$(OBJEXT)
+	-rm -f dim/src/discpp.lo
+	-rm -f dim/src/dll.$(OBJEXT)
+	-rm -f dim/src/dll.lo
+	-rm -f dim/src/dna.$(OBJEXT)
+	-rm -f dim/src/dna.lo
+	-rm -f dim/src/dns.$(OBJEXT)
+	-rm -f dim/src/dtq.$(OBJEXT)
+	-rm -f dim/src/dtq.lo
+	-rm -f dim/src/hash.$(OBJEXT)
+	-rm -f dim/src/hash.lo
+	-rm -f dim/src/open_dns.$(OBJEXT)
+	-rm -f dim/src/open_dns.lo
+	-rm -f dim/src/sll.$(OBJEXT)
+	-rm -f dim/src/sll.lo
+	-rm -f dim/src/swap.$(OBJEXT)
+	-rm -f dim/src/swap.lo
+	-rm -f dim/src/tcpip.$(OBJEXT)
+	-rm -f dim/src/tcpip.lo
+	-rm -f dim/src/tokenstring.$(OBJEXT)
+	-rm -f dim/src/tokenstring.lo
+	-rm -f dim/src/utilities.$(OBJEXT)
+	-rm -f dim/src/utilities.lo
 	-rm -f src/Configuration.$(OBJEXT)
 	-rm -f src/Configuration.lo
@@ -977,25 +971,25 @@
 	-rm -f *.tab.c
 
-@AMDEP_TRUE@@am__include@ @am__quote@dim_v19r15/src/$(DEPDIR)/conn_handler.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@dim_v19r15/src/$(DEPDIR)/copy_swap.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@dim_v19r15/src/$(DEPDIR)/dic.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@dim_v19r15/src/$(DEPDIR)/diccpp.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@dim_v19r15/src/$(DEPDIR)/dim_thr.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@dim_v19r15/src/$(DEPDIR)/dimcpp.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@dim_v19r15/src/$(DEPDIR)/dis.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@dim_v19r15/src/$(DEPDIR)/discpp.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@dim_v19r15/src/$(DEPDIR)/dll.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@dim_v19r15/src/$(DEPDIR)/dna.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@dim_v19r15/src/$(DEPDIR)/dns.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@dim_v19r15/src/$(DEPDIR)/dtq.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@dim_v19r15/src/$(DEPDIR)/hash.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@dim_v19r15/src/$(DEPDIR)/open_dns.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@dim_v19r15/src/$(DEPDIR)/sll.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@dim_v19r15/src/$(DEPDIR)/swap.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@dim_v19r15/src/$(DEPDIR)/tcpip.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@dim_v19r15/src/$(DEPDIR)/tokenstring.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@dim_v19r15/src/$(DEPDIR)/utilities.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@dim_v19r15/src/did/$(DEPDIR)/did-did.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@dim_v19r15/src/did/$(DEPDIR)/did-dui_util.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@dim/src/$(DEPDIR)/conn_handler.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@dim/src/$(DEPDIR)/copy_swap.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@dim/src/$(DEPDIR)/dic.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@dim/src/$(DEPDIR)/diccpp.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@dim/src/$(DEPDIR)/dim_thr.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@dim/src/$(DEPDIR)/dimcpp.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@dim/src/$(DEPDIR)/dis.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@dim/src/$(DEPDIR)/discpp.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@dim/src/$(DEPDIR)/dll.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@dim/src/$(DEPDIR)/dna.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@dim/src/$(DEPDIR)/dns.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@dim/src/$(DEPDIR)/dtq.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@dim/src/$(DEPDIR)/hash.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@dim/src/$(DEPDIR)/open_dns.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@dim/src/$(DEPDIR)/sll.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@dim/src/$(DEPDIR)/swap.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@dim/src/$(DEPDIR)/tcpip.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@dim/src/$(DEPDIR)/tokenstring.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@dim/src/$(DEPDIR)/utilities.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@dim/src/did/$(DEPDIR)/did-did.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@dim/src/did/$(DEPDIR)/did-dui_util.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/Configuration.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/Connection.Plo@am__quote@
@@ -1058,35 +1052,35 @@
 @am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
 
-dim_v19r15/src/did/did-did.o: dim_v19r15/src/did/did.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(did_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT dim_v19r15/src/did/did-did.o -MD -MP -MF dim_v19r15/src/did/$(DEPDIR)/did-did.Tpo -c -o dim_v19r15/src/did/did-did.o `test -f 'dim_v19r15/src/did/did.c' || echo '$(srcdir)/'`dim_v19r15/src/did/did.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) dim_v19r15/src/did/$(DEPDIR)/did-did.Tpo dim_v19r15/src/did/$(DEPDIR)/did-did.Po
+dim/src/did/did-did.o: dim/src/did/did.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(did_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT dim/src/did/did-did.o -MD -MP -MF dim/src/did/$(DEPDIR)/did-did.Tpo -c -o dim/src/did/did-did.o `test -f 'dim/src/did/did.c' || echo '$(srcdir)/'`dim/src/did/did.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) dim/src/did/$(DEPDIR)/did-did.Tpo dim/src/did/$(DEPDIR)/did-did.Po
 @am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='dim_v19r15/src/did/did.c' object='dim_v19r15/src/did/did-did.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='dim/src/did/did.c' object='dim/src/did/did-did.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(did_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o dim_v19r15/src/did/did-did.o `test -f 'dim_v19r15/src/did/did.c' || echo '$(srcdir)/'`dim_v19r15/src/did/did.c
-
-dim_v19r15/src/did/did-did.obj: dim_v19r15/src/did/did.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(did_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT dim_v19r15/src/did/did-did.obj -MD -MP -MF dim_v19r15/src/did/$(DEPDIR)/did-did.Tpo -c -o dim_v19r15/src/did/did-did.obj `if test -f 'dim_v19r15/src/did/did.c'; then $(CYGPATH_W) 'dim_v19r15/src/did/did.c'; else $(CYGPATH_W) '$(srcdir)/dim_v19r15/src/did/did.c'; fi`
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) dim_v19r15/src/did/$(DEPDIR)/did-did.Tpo dim_v19r15/src/did/$(DEPDIR)/did-did.Po
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(did_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o dim/src/did/did-did.o `test -f 'dim/src/did/did.c' || echo '$(srcdir)/'`dim/src/did/did.c
+
+dim/src/did/did-did.obj: dim/src/did/did.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(did_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT dim/src/did/did-did.obj -MD -MP -MF dim/src/did/$(DEPDIR)/did-did.Tpo -c -o dim/src/did/did-did.obj `if test -f 'dim/src/did/did.c'; then $(CYGPATH_W) 'dim/src/did/did.c'; else $(CYGPATH_W) '$(srcdir)/dim/src/did/did.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) dim/src/did/$(DEPDIR)/did-did.Tpo dim/src/did/$(DEPDIR)/did-did.Po
 @am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='dim_v19r15/src/did/did.c' object='dim_v19r15/src/did/did-did.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='dim/src/did/did.c' object='dim/src/did/did-did.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(did_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o dim_v19r15/src/did/did-did.obj `if test -f 'dim_v19r15/src/did/did.c'; then $(CYGPATH_W) 'dim_v19r15/src/did/did.c'; else $(CYGPATH_W) '$(srcdir)/dim_v19r15/src/did/did.c'; fi`
-
-dim_v19r15/src/did/did-dui_util.o: dim_v19r15/src/did/dui_util.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(did_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT dim_v19r15/src/did/did-dui_util.o -MD -MP -MF dim_v19r15/src/did/$(DEPDIR)/did-dui_util.Tpo -c -o dim_v19r15/src/did/did-dui_util.o `test -f 'dim_v19r15/src/did/dui_util.c' || echo '$(srcdir)/'`dim_v19r15/src/did/dui_util.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) dim_v19r15/src/did/$(DEPDIR)/did-dui_util.Tpo dim_v19r15/src/did/$(DEPDIR)/did-dui_util.Po
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(did_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o dim/src/did/did-did.obj `if test -f 'dim/src/did/did.c'; then $(CYGPATH_W) 'dim/src/did/did.c'; else $(CYGPATH_W) '$(srcdir)/dim/src/did/did.c'; fi`
+
+dim/src/did/did-dui_util.o: dim/src/did/dui_util.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(did_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT dim/src/did/did-dui_util.o -MD -MP -MF dim/src/did/$(DEPDIR)/did-dui_util.Tpo -c -o dim/src/did/did-dui_util.o `test -f 'dim/src/did/dui_util.c' || echo '$(srcdir)/'`dim/src/did/dui_util.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) dim/src/did/$(DEPDIR)/did-dui_util.Tpo dim/src/did/$(DEPDIR)/did-dui_util.Po
 @am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='dim_v19r15/src/did/dui_util.c' object='dim_v19r15/src/did/did-dui_util.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='dim/src/did/dui_util.c' object='dim/src/did/did-dui_util.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(did_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o dim_v19r15/src/did/did-dui_util.o `test -f 'dim_v19r15/src/did/dui_util.c' || echo '$(srcdir)/'`dim_v19r15/src/did/dui_util.c
-
-dim_v19r15/src/did/did-dui_util.obj: dim_v19r15/src/did/dui_util.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(did_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT dim_v19r15/src/did/did-dui_util.obj -MD -MP -MF dim_v19r15/src/did/$(DEPDIR)/did-dui_util.Tpo -c -o dim_v19r15/src/did/did-dui_util.obj `if test -f 'dim_v19r15/src/did/dui_util.c'; then $(CYGPATH_W) 'dim_v19r15/src/did/dui_util.c'; else $(CYGPATH_W) '$(srcdir)/dim_v19r15/src/did/dui_util.c'; fi`
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) dim_v19r15/src/did/$(DEPDIR)/did-dui_util.Tpo dim_v19r15/src/did/$(DEPDIR)/did-dui_util.Po
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(did_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o dim/src/did/did-dui_util.o `test -f 'dim/src/did/dui_util.c' || echo '$(srcdir)/'`dim/src/did/dui_util.c
+
+dim/src/did/did-dui_util.obj: dim/src/did/dui_util.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(did_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT dim/src/did/did-dui_util.obj -MD -MP -MF dim/src/did/$(DEPDIR)/did-dui_util.Tpo -c -o dim/src/did/did-dui_util.obj `if test -f 'dim/src/did/dui_util.c'; then $(CYGPATH_W) 'dim/src/did/dui_util.c'; else $(CYGPATH_W) '$(srcdir)/dim/src/did/dui_util.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) dim/src/did/$(DEPDIR)/did-dui_util.Tpo dim/src/did/$(DEPDIR)/did-dui_util.Po
 @am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='dim_v19r15/src/did/dui_util.c' object='dim_v19r15/src/did/did-dui_util.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='dim/src/did/dui_util.c' object='dim/src/did/did-dui_util.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(did_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o dim_v19r15/src/did/did-dui_util.obj `if test -f 'dim_v19r15/src/did/dui_util.c'; then $(CYGPATH_W) 'dim_v19r15/src/did/dui_util.c'; else $(CYGPATH_W) '$(srcdir)/dim_v19r15/src/did/dui_util.c'; fi`
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(did_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o dim/src/did/did-dui_util.obj `if test -f 'dim/src/did/dui_util.c'; then $(CYGPATH_W) 'dim/src/did/dui_util.c'; else $(CYGPATH_W) '$(srcdir)/dim/src/did/dui_util.c'; fi`
 
 .cc.o:
@@ -1149,5 +1143,5 @@
 clean-libtool:
 	-rm -rf .libs _libs
-	-rm -rf dim_v19r15/src/.libs dim_v19r15/src/_libs
+	-rm -rf dim/src/.libs dim/src/_libs
 	-rm -rf src/.libs src/_libs
 
@@ -1473,8 +1467,8 @@
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
 	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-	-rm -f dim_v19r15/src/$(DEPDIR)/$(am__dirstamp)
-	-rm -f dim_v19r15/src/$(am__dirstamp)
-	-rm -f dim_v19r15/src/did/$(DEPDIR)/$(am__dirstamp)
-	-rm -f dim_v19r15/src/did/$(am__dirstamp)
+	-rm -f dim/src/$(DEPDIR)/$(am__dirstamp)
+	-rm -f dim/src/$(am__dirstamp)
+	-rm -f dim/src/did/$(DEPDIR)/$(am__dirstamp)
+	-rm -f dim/src/did/$(am__dirstamp)
 	-rm -f src/$(DEPDIR)/$(am__dirstamp)
 	-rm -f src/$(am__dirstamp)
@@ -1490,5 +1484,5 @@
 distclean: distclean-am
 	-rm -f $(am__CONFIG_DISTCLEAN_FILES)
-	-rm -rf dim_v19r15/src/$(DEPDIR) dim_v19r15/src/did/$(DEPDIR) src/$(DEPDIR)
+	-rm -rf dim/src/$(DEPDIR) dim/src/did/$(DEPDIR) src/$(DEPDIR)
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
@@ -1539,5 +1533,5 @@
 	-rm -f $(am__CONFIG_DISTCLEAN_FILES)
 	-rm -rf $(top_srcdir)/autom4te.cache
-	-rm -rf dim_v19r15/src/$(DEPDIR) dim_v19r15/src/did/$(DEPDIR) src/$(DEPDIR)
+	-rm -rf dim/src/$(DEPDIR) dim/src/did/$(DEPDIR) src/$(DEPDIR)
 	-rm -f Makefile
 maintainer-clean-am: distclean-am maintainer-clean-generic
