Rename htcommon to hlcommon

solbu · Sep 7, 2018 · 778df50 · 778df50
1 parent 1f3558e
commit 778df50
Show file tree

Hide file tree

Showing 57 changed files with 55 additions and 55 deletions.
diff --git a/Makefile.am b/Makefile.am
@@ -13,7 +13,7 @@ endif
 # process the Makefile.am files in these directories. the po directory
 # is a little # different because of a rule near the end of configure.ac
 
-SUBDIRS = db hllib hlword htcommon hlnet hlfuzzy hldb hldig hlsearch	\
+SUBDIRS = db hllib hlword hlcommon hlnet hlfuzzy hldb hldig hlsearch	\
 hltools installdir include $(TESTDIR) po
 
 # files to be installed to destination docdir when 'make install' is run

diff --git a/Makefile.config b/Makefile.config
@@ -20,14 +20,14 @@ VERSION = @VERSION@
 AM_CPPFLAGS=	\
 		-DDEFAULT_CONFIG_FILE=\"$(DEFAULT_CONFIG_FILE)\" \
 		-I$(top_srcdir)/include -I$(top_srcdir)/hllib \
-		-I$(top_srcdir)/hlnet -I$(top_srcdir)/htcommon \
+		-I$(top_srcdir)/hlnet -I$(top_srcdir)/hlcommon \
 		-I$(top_srcdir)/hlword \
 		-I$(top_srcdir)/db -I$(top_builddir)/db \
 		$(LOCAL_DEFINES) $(PROFILING) \
 		-DLOCALEDIR=\"$(localedir)\"
 
 HLLIBS=		$(top_builddir)/hlnet/libhlnet.la \
-		$(top_builddir)/htcommon/libcommon.la \
+		$(top_builddir)/hlcommon/libcommon.la \
 		$(top_builddir)/hlword/libhlword.la \
 		$(top_builddir)/hllib/libhl.la \
 		$(top_builddir)/db/libhldb.la

diff --git a/Makefile.in b/Makefile.in
@@ -170,7 +170,7 @@ am__define_uniq_tagged_files = \
 ETAGS = etags
 CTAGS = ctags
 CSCOPE = cscope
-DIST_SUBDIRS = db hllib hlword htcommon hlnet hlfuzzy hldb hldig \
+DIST_SUBDIRS = db hllib hlword hlcommon hlnet hlfuzzy hldb hldig \
 	hlsearch hltools installdir include test po
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 top_distdir = $(distdir)
@@ -389,14 +389,14 @@ AUTOMAKE_OPTIONS = foreign no-dependencies
 AM_CPPFLAGS = \
 		-DDEFAULT_CONFIG_FILE=\"$(DEFAULT_CONFIG_FILE)\" \
 		-I$(top_srcdir)/include -I$(top_srcdir)/hllib \
-		-I$(top_srcdir)/hlnet -I$(top_srcdir)/htcommon \
+		-I$(top_srcdir)/hlnet -I$(top_srcdir)/hlcommon \
 		-I$(top_srcdir)/hlword \
 		-I$(top_srcdir)/db -I$(top_builddir)/db \
 		$(LOCAL_DEFINES) $(PROFILING) \
 		-DLOCALEDIR=\"$(localedir)\"
 
 HLLIBS = $(top_builddir)/hlnet/libhlnet.la \
-		$(top_builddir)/htcommon/libcommon.la \
+		$(top_builddir)/hlcommon/libcommon.la \
 		$(top_builddir)/hlword/libhlword.la \
 		$(top_builddir)/hllib/libhl.la \
 		$(top_builddir)/db/libhldb.la
@@ -406,7 +406,7 @@ LDADD = $(HLLIBS) @LIBINTL@
 
 # process the Makefile.am files in these directories. the po directory
 # is a little # different because of a rule near the end of configure.ac
-SUBDIRS = db hllib hlword htcommon hlnet hlfuzzy hldb hldig hlsearch	\
+SUBDIRS = db hllib hlword hlcommon hlnet hlfuzzy hldb hldig hlsearch	\
 hltools installdir include $(TESTDIR) po
 
 

diff --git a/configure b/configure
@@ -22577,7 +22577,7 @@ while echo $VERSION | grep '\$' >/dev/null ; do
   eval "VERSION=$VERSION"
 done
 
-ac_config_files="$ac_config_files Makefile htcommon/Makefile hldb/Makefile hldig/Makefile installdir/hldig.1 installdir/hldig-pdfparser.1 installdir/hlfuzzy.1 installdir/hlmerge.1 installdir/hlpurge.1 installdir/hlstat.1 installdir/hldigconfig.8 installdir/hldump.1 installdir/hlload.1 installdir/hlnotify.1 installdir/hlsearch.1 installdir/rundig.1 hlfuzzy/Makefile hllib/Makefile hlnet/Makefile hlsearch/Makefile hltools/Makefile hlword/Makefile include/Makefile installdir/Makefile test/Makefile po/Makefile.in test/test_functions"
+ac_config_files="$ac_config_files Makefile hlcommon/Makefile hldb/Makefile hldig/Makefile installdir/hldig.1 installdir/hldig-pdfparser.1 installdir/hlfuzzy.1 installdir/hlmerge.1 installdir/hlpurge.1 installdir/hlstat.1 installdir/hldigconfig.8 installdir/hldump.1 installdir/hlload.1 installdir/hlnotify.1 installdir/hlsearch.1 installdir/rundig.1 hlfuzzy/Makefile hllib/Makefile hlnet/Makefile hlsearch/Makefile hltools/Makefile hlword/Makefile include/Makefile installdir/Makefile test/Makefile po/Makefile.in test/test_functions"
 
 cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure
@@ -23713,7 +23713,7 @@ do
     "libtool") CONFIG_COMMANDS="$CONFIG_COMMANDS libtool" ;;
     "po-directories") CONFIG_COMMANDS="$CONFIG_COMMANDS po-directories" ;;
     "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
-    "htcommon/Makefile") CONFIG_FILES="$CONFIG_FILES htcommon/Makefile" ;;
+    "hlcommon/Makefile") CONFIG_FILES="$CONFIG_FILES hlcommon/Makefile" ;;
     "hldb/Makefile") CONFIG_FILES="$CONFIG_FILES hldb/Makefile" ;;
     "hldig/Makefile") CONFIG_FILES="$CONFIG_FILES hldig/Makefile" ;;
     "installdir/hldig.1") CONFIG_FILES="$CONFIG_FILES installdir/hldig.1" ;;

diff --git a/configure.ac b/configure.ac
@@ -425,7 +425,7 @@ while echo $VERSION | grep '\$' >/dev/null ; do
 done
 
 AC_CONFIG_FILES([Makefile
-                 htcommon/Makefile
+                 hlcommon/Makefile
                  hldb/Makefile
                  hldig/Makefile
                  installdir/hldig.1

diff --git a/htcommon/DocumentDB.cc → hlcommon/DocumentDB.cc b/htcommon/DocumentDB.cc → hlcommon/DocumentDB.cc
diff --git a/htcommon/DocumentDB.h → hlcommon/DocumentDB.h b/htcommon/DocumentDB.h → hlcommon/DocumentDB.h
diff --git a/htcommon/DocumentRef.cc → hlcommon/DocumentRef.cc b/htcommon/DocumentRef.cc → hlcommon/DocumentRef.cc
diff --git a/htcommon/DocumentRef.h → hlcommon/DocumentRef.h b/htcommon/DocumentRef.h → hlcommon/DocumentRef.h
diff --git a/htcommon/HtConfiguration.cc → hlcommon/HtConfiguration.cc b/htcommon/HtConfiguration.cc → hlcommon/HtConfiguration.cc
diff --git a/htcommon/HtConfiguration.h → hlcommon/HtConfiguration.h b/htcommon/HtConfiguration.h → hlcommon/HtConfiguration.h
diff --git a/htcommon/HtSGMLCodec.cc → hlcommon/HtSGMLCodec.cc b/htcommon/HtSGMLCodec.cc → hlcommon/HtSGMLCodec.cc
diff --git a/htcommon/HtSGMLCodec.h → hlcommon/HtSGMLCodec.h b/htcommon/HtSGMLCodec.h → hlcommon/HtSGMLCodec.h
diff --git a/htcommon/HtURLCodec.cc → hlcommon/HtURLCodec.cc b/htcommon/HtURLCodec.cc → hlcommon/HtURLCodec.cc
diff --git a/htcommon/HtURLCodec.h → hlcommon/HtURLCodec.h b/htcommon/HtURLCodec.h → hlcommon/HtURLCodec.h
diff --git a/htcommon/HtURLRewriter.cc → hlcommon/HtURLRewriter.cc b/htcommon/HtURLRewriter.cc → hlcommon/HtURLRewriter.cc
diff --git a/htcommon/HtURLRewriter.h → hlcommon/HtURLRewriter.h b/htcommon/HtURLRewriter.h → hlcommon/HtURLRewriter.h
diff --git a/htcommon/HtWordList.cc → hlcommon/HtWordList.cc b/htcommon/HtWordList.cc → hlcommon/HtWordList.cc
diff --git a/htcommon/HtWordList.h → hlcommon/HtWordList.h b/htcommon/HtWordList.h → hlcommon/HtWordList.h
diff --git a/htcommon/HtWordReference.cc → hlcommon/HtWordReference.cc b/htcommon/HtWordReference.cc → hlcommon/HtWordReference.cc
diff --git a/htcommon/HtWordReference.h → hlcommon/HtWordReference.h b/htcommon/HtWordReference.h → hlcommon/HtWordReference.h
diff --git a/htcommon/HtZlibCodec.cc → hlcommon/HtZlibCodec.cc b/htcommon/HtZlibCodec.cc → hlcommon/HtZlibCodec.cc
diff --git a/htcommon/HtZlibCodec.h → hlcommon/HtZlibCodec.h b/htcommon/HtZlibCodec.h → hlcommon/HtZlibCodec.h
diff --git a/htcommon/Makefile.am → hlcommon/Makefile.am b/htcommon/Makefile.am → hlcommon/Makefile.am
diff --git a/htcommon/Makefile.in → hlcommon/Makefile.in b/htcommon/Makefile.in → hlcommon/Makefile.in
@@ -89,7 +89,7 @@ DIST_COMMON = $(top_srcdir)/Makefile.config $(srcdir)/Makefile.in \
 	$(srcdir)/Makefile.am $(top_srcdir)/mkinstalldirs \
 	conf_lexer.cxx conf_parser.hxx conf_parser.cxx \
 	$(top_srcdir)/ylwrap $(noinst_HEADERS)
-subdir = htcommon
+subdir = hlcommon
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \
 	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \
@@ -423,14 +423,14 @@ AUTOMAKE_OPTIONS = foreign no-dependencies
 AM_CPPFLAGS = \
 		-DDEFAULT_CONFIG_FILE=\"$(DEFAULT_CONFIG_FILE)\" \
 		-I$(top_srcdir)/include -I$(top_srcdir)/hllib \
-		-I$(top_srcdir)/hlnet -I$(top_srcdir)/htcommon \
+		-I$(top_srcdir)/hlnet -I$(top_srcdir)/hlcommon \
 		-I$(top_srcdir)/hlword \
 		-I$(top_srcdir)/db -I$(top_builddir)/db \
 		$(LOCAL_DEFINES) $(PROFILING) \
 		-DLOCALEDIR=\"$(localedir)\"
 
 HLLIBS = $(top_builddir)/hlnet/libhlnet.la \
-		$(top_builddir)/htcommon/libcommon.la \
+		$(top_builddir)/hlcommon/libcommon.la \
 		$(top_builddir)/hlword/libhlword.la \
 		$(top_builddir)/hllib/libhl.la \
 		$(top_builddir)/db/libhldb.la
@@ -489,9 +489,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign htcommon/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign hlcommon/Makefile'; \
 	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign htcommon/Makefile
+	  $(AUTOMAKE) --foreign hlcommon/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \

diff --git a/htcommon/Makefile.win32 → hlcommon/Makefile.win32 b/htcommon/Makefile.win32 → hlcommon/Makefile.win32
diff --git a/htcommon/URL.cc → hlcommon/URL.cc b/htcommon/URL.cc → hlcommon/URL.cc
diff --git a/htcommon/URL.h → hlcommon/URL.h b/htcommon/URL.h → hlcommon/URL.h
diff --git a/htcommon/URLTrans.cc → hlcommon/URLTrans.cc b/htcommon/URLTrans.cc → hlcommon/URLTrans.cc
diff --git a/htcommon/cgi.cc → hlcommon/cgi.cc b/htcommon/cgi.cc → hlcommon/cgi.cc
diff --git a/htcommon/cgi.h → hlcommon/cgi.h b/htcommon/cgi.h → hlcommon/cgi.h
diff --git a/htcommon/conf_lexer.cxx → hlcommon/conf_lexer.cxx b/htcommon/conf_lexer.cxx → hlcommon/conf_lexer.cxx
diff --git a/htcommon/conf_lexer.lxx → hlcommon/conf_lexer.lxx b/htcommon/conf_lexer.lxx → hlcommon/conf_lexer.lxx
diff --git a/htcommon/conf_parser.cxx → hlcommon/conf_parser.cxx b/htcommon/conf_parser.cxx → hlcommon/conf_parser.cxx
diff --git a/htcommon/conf_parser.h → hlcommon/conf_parser.h b/htcommon/conf_parser.h → hlcommon/conf_parser.h
diff --git a/htcommon/conf_parser.yxx → hlcommon/conf_parser.yxx b/htcommon/conf_parser.yxx → hlcommon/conf_parser.yxx
diff --git a/htcommon/defaults.cc → hlcommon/defaults.cc b/htcommon/defaults.cc → hlcommon/defaults.cc
diff --git a/htcommon/defaults.h → hlcommon/defaults.h b/htcommon/defaults.h → hlcommon/defaults.h
diff --git a/htcommon/defaults.xml → hlcommon/defaults.xml b/htcommon/defaults.xml → hlcommon/defaults.xml
diff --git a/htcommon/messages.cc → hlcommon/messages.cc b/htcommon/messages.cc → hlcommon/messages.cc
diff --git a/htcommon/messages.h → hlcommon/messages.h b/htcommon/messages.h → hlcommon/messages.h
diff --git a/hldb/Makefile.in b/hldb/Makefile.in
@@ -364,14 +364,14 @@ AUTOMAKE_OPTIONS = foreign no-dependencies
 AM_CPPFLAGS = \
 		-DDEFAULT_CONFIG_FILE=\"$(DEFAULT_CONFIG_FILE)\" \
 		-I$(top_srcdir)/include -I$(top_srcdir)/hllib \
-		-I$(top_srcdir)/hlnet -I$(top_srcdir)/htcommon \
+		-I$(top_srcdir)/hlnet -I$(top_srcdir)/hlcommon \
 		-I$(top_srcdir)/hlword \
 		-I$(top_srcdir)/db -I$(top_builddir)/db \
 		$(LOCAL_DEFINES) $(PROFILING) \
 		-DLOCALEDIR=\"$(localedir)\"
 
 HLLIBS = $(top_builddir)/hlnet/libhlnet.la \
-		$(top_builddir)/htcommon/libcommon.la \
+		$(top_builddir)/hlcommon/libcommon.la \
 		$(top_builddir)/hlword/libhlword.la \
 		$(top_builddir)/hllib/libhl.la \
 		$(top_builddir)/db/libhldb.la

diff --git a/hldig/Makefile.in b/hldig/Makefile.in
@@ -358,14 +358,14 @@ AUTOMAKE_OPTIONS = foreign no-dependencies
 AM_CPPFLAGS = \
 		-DDEFAULT_CONFIG_FILE=\"$(DEFAULT_CONFIG_FILE)\" \
 		-I$(top_srcdir)/include -I$(top_srcdir)/hllib \
-		-I$(top_srcdir)/hlnet -I$(top_srcdir)/htcommon \
+		-I$(top_srcdir)/hlnet -I$(top_srcdir)/hlcommon \
 		-I$(top_srcdir)/hlword \
 		-I$(top_srcdir)/db -I$(top_builddir)/db \
 		$(LOCAL_DEFINES) $(PROFILING) \
 		-DLOCALEDIR=\"$(localedir)\"
 
 HLLIBS = $(top_builddir)/hlnet/libhlnet.la \
-		$(top_builddir)/htcommon/libcommon.la \
+		$(top_builddir)/hlcommon/libcommon.la \
 		$(top_builddir)/hlword/libhlword.la \
 		$(top_builddir)/hllib/libhl.la \
 		$(top_builddir)/db/libhldb.la

diff --git a/hlfuzzy/Makefile.in b/hlfuzzy/Makefile.in
@@ -391,14 +391,14 @@ AUTOMAKE_OPTIONS = foreign no-dependencies
 AM_CPPFLAGS = \
 		-DDEFAULT_CONFIG_FILE=\"$(DEFAULT_CONFIG_FILE)\" \
 		-I$(top_srcdir)/include -I$(top_srcdir)/hllib \
-		-I$(top_srcdir)/hlnet -I$(top_srcdir)/htcommon \
+		-I$(top_srcdir)/hlnet -I$(top_srcdir)/hlcommon \
 		-I$(top_srcdir)/hlword \
 		-I$(top_srcdir)/db -I$(top_builddir)/db \
 		$(LOCAL_DEFINES) $(PROFILING) \
 		-DLOCALEDIR=\"$(localedir)\"
 
 HLLIBS = $(top_builddir)/hlnet/libhlnet.la \
-		$(top_builddir)/htcommon/libcommon.la \
+		$(top_builddir)/hlcommon/libcommon.la \
 		$(top_builddir)/hlword/libhlword.la \
 		$(top_builddir)/hllib/libhl.la \
 		$(top_builddir)/db/libhldb.la

diff --git a/hllib/Makefile.in b/hllib/Makefile.in
@@ -87,7 +87,7 @@ build_triplet = @build@
 host_triplet = @host@
 DIST_COMMON = $(top_srcdir)/Makefile.config $(srcdir)/Makefile.in \
 	$(srcdir)/Makefile.am $(top_srcdir)/mkinstalldirs memcmp.c \
-	regex.c snprintf.c vsnprintf.c realloc.c malloc.c \
+	vsnprintf.c regex.c snprintf.c malloc.c realloc.c \
 	$(pkginclude_HEADERS)
 subdir = hllib
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -410,14 +410,14 @@ AUTOMAKE_OPTIONS = foreign no-dependencies
 AM_CPPFLAGS = \
 		-DDEFAULT_CONFIG_FILE=\"$(DEFAULT_CONFIG_FILE)\" \
 		-I$(top_srcdir)/include -I$(top_srcdir)/hllib \
-		-I$(top_srcdir)/hlnet -I$(top_srcdir)/htcommon \
+		-I$(top_srcdir)/hlnet -I$(top_srcdir)/hlcommon \
 		-I$(top_srcdir)/hlword \
 		-I$(top_srcdir)/db -I$(top_builddir)/db \
 		$(LOCAL_DEFINES) $(PROFILING) \
 		-DLOCALEDIR=\"$(localedir)\"
 
 HLLIBS = $(top_builddir)/hlnet/libhlnet.la \
-		$(top_builddir)/htcommon/libcommon.la \
+		$(top_builddir)/hlcommon/libcommon.la \
 		$(top_builddir)/hlword/libhlword.la \
 		$(top_builddir)/hllib/libhl.la \
 		$(top_builddir)/db/libhldb.la

diff --git a/hlnet/Makefile.in b/hlnet/Makefile.in
@@ -385,14 +385,14 @@ AUTOMAKE_OPTIONS = foreign no-dependencies
 AM_CPPFLAGS = \
 		-DDEFAULT_CONFIG_FILE=\"$(DEFAULT_CONFIG_FILE)\" \
 		-I$(top_srcdir)/include -I$(top_srcdir)/hllib \
-		-I$(top_srcdir)/hlnet -I$(top_srcdir)/htcommon \
+		-I$(top_srcdir)/hlnet -I$(top_srcdir)/hlcommon \
 		-I$(top_srcdir)/hlword \
 		-I$(top_srcdir)/db -I$(top_builddir)/db \
 		$(LOCAL_DEFINES) $(PROFILING) \
 		-DLOCALEDIR=\"$(localedir)\"
 
 HLLIBS = $(top_builddir)/hlnet/libhlnet.la \
-		$(top_builddir)/htcommon/libcommon.la \
+		$(top_builddir)/hlcommon/libcommon.la \
 		$(top_builddir)/hlword/libhlword.la \
 		$(top_builddir)/hllib/libhl.la \
 		$(top_builddir)/db/libhldb.la

diff --git a/hlsearch/Makefile.in b/hlsearch/Makefile.in
@@ -371,14 +371,14 @@ AUTOMAKE_OPTIONS = foreign no-dependencies
 AM_CPPFLAGS = \
 		-DDEFAULT_CONFIG_FILE=\"$(DEFAULT_CONFIG_FILE)\" \
 		-I$(top_srcdir)/include -I$(top_srcdir)/hllib \
-		-I$(top_srcdir)/hlnet -I$(top_srcdir)/htcommon \
+		-I$(top_srcdir)/hlnet -I$(top_srcdir)/hlcommon \
 		-I$(top_srcdir)/hlword \
 		-I$(top_srcdir)/db -I$(top_builddir)/db \
 		$(LOCAL_DEFINES) $(PROFILING) \
 		-DLOCALEDIR=\"$(localedir)\"
 
 HLLIBS = $(top_builddir)/hlnet/libhlnet.la \
-		$(top_builddir)/htcommon/libcommon.la \
+		$(top_builddir)/hlcommon/libcommon.la \
 		$(top_builddir)/hlword/libhlword.la \
 		$(top_builddir)/hllib/libhl.la \
 		$(top_builddir)/db/libhldb.la

diff --git a/hltools/Makefile.in b/hltools/Makefile.in
@@ -379,14 +379,14 @@ AUTOMAKE_OPTIONS = foreign no-dependencies
 AM_CPPFLAGS = \
 		-DDEFAULT_CONFIG_FILE=\"$(DEFAULT_CONFIG_FILE)\" \
 		-I$(top_srcdir)/include -I$(top_srcdir)/hllib \
-		-I$(top_srcdir)/hlnet -I$(top_srcdir)/htcommon \
+		-I$(top_srcdir)/hlnet -I$(top_srcdir)/hlcommon \
 		-I$(top_srcdir)/hlword \
 		-I$(top_srcdir)/db -I$(top_builddir)/db \
 		$(LOCAL_DEFINES) $(PROFILING) \
 		-DLOCALEDIR=\"$(localedir)\"
 
 HLLIBS = $(top_builddir)/hlnet/libhlnet.la \
-		$(top_builddir)/htcommon/libcommon.la \
+		$(top_builddir)/hlcommon/libcommon.la \
 		$(top_builddir)/hlword/libhlword.la \
 		$(top_builddir)/hllib/libhl.la \
 		$(top_builddir)/db/libhldb.la

diff --git a/hlword/Makefile.in b/hlword/Makefile.in
@@ -386,14 +386,14 @@ AUTOMAKE_OPTIONS = foreign no-dependencies
 AM_CPPFLAGS = \
 		-DDEFAULT_CONFIG_FILE=\"$(DEFAULT_CONFIG_FILE)\" \
 		-I$(top_srcdir)/include -I$(top_srcdir)/hllib \
-		-I$(top_srcdir)/hlnet -I$(top_srcdir)/htcommon \
+		-I$(top_srcdir)/hlnet -I$(top_srcdir)/hlcommon \
 		-I$(top_srcdir)/hlword \
 		-I$(top_srcdir)/db -I$(top_builddir)/db \
 		$(LOCAL_DEFINES) $(PROFILING) \
 		-DLOCALEDIR=\"$(localedir)\"
 
 HLLIBS = $(top_builddir)/hlnet/libhlnet.la \
-		$(top_builddir)/htcommon/libcommon.la \
+		$(top_builddir)/hlcommon/libcommon.la \
 		$(top_builddir)/hlword/libhlword.la \
 		$(top_builddir)/hllib/libhl.la \
 		$(top_builddir)/db/libhldb.la

diff --git a/include/Makefile.in b/include/Makefile.in
@@ -351,14 +351,14 @@ AUTOMAKE_OPTIONS = foreign no-dependencies
 AM_CPPFLAGS = \
 		-DDEFAULT_CONFIG_FILE=\"$(DEFAULT_CONFIG_FILE)\" \
 		-I$(top_srcdir)/include -I$(top_srcdir)/hllib \
-		-I$(top_srcdir)/hlnet -I$(top_srcdir)/htcommon \
+		-I$(top_srcdir)/hlnet -I$(top_srcdir)/hlcommon \
 		-I$(top_srcdir)/hlword \
 		-I$(top_srcdir)/db -I$(top_builddir)/db \
 		$(LOCAL_DEFINES) $(PROFILING) \
 		-DLOCALEDIR=\"$(localedir)\"
 
 HLLIBS = $(top_builddir)/hlnet/libhlnet.la \
-		$(top_builddir)/htcommon/libcommon.la \
+		$(top_builddir)/hlcommon/libcommon.la \
 		$(top_builddir)/hlword/libhlword.la \
 		$(top_builddir)/hllib/libhl.la \
 		$(top_builddir)/db/libhldb.la

diff --git a/installdir/Makefile.in b/installdir/Makefile.in
@@ -344,14 +344,14 @@ AUTOMAKE_OPTIONS = foreign no-dependencies
 AM_CPPFLAGS = \
 		-DDEFAULT_CONFIG_FILE=\"$(DEFAULT_CONFIG_FILE)\" \
 		-I$(top_srcdir)/include -I$(top_srcdir)/hllib \
-		-I$(top_srcdir)/hlnet -I$(top_srcdir)/htcommon \
+		-I$(top_srcdir)/hlnet -I$(top_srcdir)/hlcommon \
 		-I$(top_srcdir)/hlword \
 		-I$(top_srcdir)/db -I$(top_builddir)/db \
 		$(LOCAL_DEFINES) $(PROFILING) \
 		-DLOCALEDIR=\"$(localedir)\"
 
 HLLIBS = $(top_builddir)/hlnet/libhlnet.la \
-		$(top_builddir)/htcommon/libcommon.la \
+		$(top_builddir)/hlcommon/libcommon.la \
 		$(top_builddir)/hlword/libhlword.la \
 		$(top_builddir)/hllib/libhl.la \
 		$(top_builddir)/db/libhldb.la

diff --git a/po/POTFILES.in b/po/POTFILES.in
@@ -1,6 +1,6 @@
 # List of source files which contain translatable strings.
 
-htcommon/messages.cc
+hlcommon/messages.cc
 hldig/hldig.cc
 hldig/Retriever.cc
 hldig/Server.cc

diff --git a/po/hldig.pot b/po/hldig.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: hldig 0.3.0\n"
 "Report-Msgid-Bugs-To: https://github.com/solbu/hldig/issues\n"
-"POT-Creation-Date: 2018-09-07 07:30+0200\n"
+"POT-Creation-Date: 2018-09-07 11:50+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -27,12 +27,12 @@ msgid ""
 "\n"
 msgstr ""
 
-#: htcommon/messages.cc:39
+#: hlcommon/messages.cc:39
 #, c-format
 msgid " -a\tUse alternate work files.\n"
 msgstr ""
 
-#: htcommon/messages.cc:32
+#: hlcommon/messages.cc:32
 #, c-format
 msgid ""
 " -c\tconfigfile\n"
@@ -98,7 +98,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: htcommon/messages.cc:22
+#: hlcommon/messages.cc:22
 #, c-format
 msgid ""
 " -v\tVerbose mode\n"

diff --git a/po/nb.po b/po/nb.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: hldig 0.3.0\n"
 "Report-Msgid-Bugs-To: https://github.com/solbu/hldig/issues\n"
-"POT-Creation-Date: 2018-09-07 07:30+0200\n"
+"POT-Creation-Date: 2018-09-07 11:50+0200\n"
 "PO-Revision-Date: 2018-09-02 23:56+0200\n"
 "Last-Translator: Johnny A. Solbu <johnny@solbu.net>\n"
 "Language-Team: Norwegian Bokmal <i18n-nb@lister.ping.uio.no>\n"
@@ -28,12 +28,12 @@ msgid ""
 "\n"
 msgstr ""
 
-#: htcommon/messages.cc:39
+#: hlcommon/messages.cc:39
 #, c-format
 msgid " -a\tUse alternate work files.\n"
 msgstr ""
 
-#: htcommon/messages.cc:32
+#: hlcommon/messages.cc:32
 #, c-format
 msgid ""
 " -c\tconfigfile\n"
@@ -99,7 +99,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: htcommon/messages.cc:22
+#: hlcommon/messages.cc:22
 #, c-format
 msgid ""
 " -v\tVerbose mode\n"