knot1to2: build with daemon, install to libexec

src/Makefile.am

@@ -184,6 +184,7 @@ endif
 if HAVE_DAEMON
 
 sbin_PROGRAMS = knotc knotd
+libexec_PROGRAMS = knot1to2
 noinst_LTLIBRARIES += libknotd.la
 
 knotc_SOURCES =					\
@@ -192,6 +193,17 @@ knotc_SOURCES =					\
 knotd_SOURCES =					\
 	knot/main.c
 
+knot1to2_SOURCES =				\
+	utils/knot1to2/cf-lex.c			\
+	utils/knot1to2/cf-parse.tab.c		\
+	utils/knot1to2/cf-parse.tab.h		\
+	utils/knot1to2/extra.c			\
+	utils/knot1to2/extra.h			\
+	utils/knot1to2/includes.c		\
+	utils/knot1to2/includes.h		\
+	utils/knot1to2/main.c			\
+	utils/knot1to2/scheme.h
+
 # static: server shared
 libknotd_la_SOURCES =				\
 	knot/conf/conf.c			\
@@ -332,6 +344,7 @@ libknotd_la_LIBADD = libknot.la
 
 knotd_LDADD = libknotd.la libknot-yparser.la
 knotc_LDADD = libknotd.la libknot-yparser.la
+knot1to2_LDADD = libknot-int.la
 
 ####################################
 # Optional Knot DNS Daemon modules #
@@ -365,7 +378,7 @@ endif # HAVE_DAEMON
 
 if HAVE_UTILS
 
-bin_PROGRAMS = kdig khost knsupdate knot1to2
+bin_PROGRAMS = kdig khost knsupdate
 noinst_LTLIBRARIES += libknotus.la
 
 kdig_SOURCES =					\
@@ -391,17 +404,6 @@ knsupdate_SOURCES =				\
 	utils/knsupdate/knsupdate_params.c	\
 	utils/knsupdate/knsupdate_params.h
 
-knot1to2_SOURCES =				\
-	utils/knot1to2/cf-lex.c			\
-	utils/knot1to2/cf-parse.tab.c		\
-	utils/knot1to2/cf-parse.tab.h		\
-	utils/knot1to2/extra.c			\
-	utils/knot1to2/extra.h			\
-	utils/knot1to2/includes.c		\
-	utils/knot1to2/includes.h		\
-	utils/knot1to2/main.c			\
-	utils/knot1to2/scheme.h
-
 # static: utilities shared
 libknotus_la_SOURCES =				\
 	utils/common/exec.c			\
@@ -428,7 +430,6 @@ libknotus_la_LIBADD = libknot-int.la libknot.la
 kdig_LDADD       = $(libidn_LIBS) libknotus.la
 khost_LDADD      = $(libidn_LIBS) libknotus.la
 knsupdate_LDADD  = zscanner/libzscanner.la libknotus.la
-knot1to2_LDADD   = libknot-int.la
 
 #######################################
 # Optional Knot DNS Utilities modules #