Commit dfe3edd7 authored by Andreas Gustafsson's avatar Andreas Gustafsson

use ${srcdir}/include, not ./include, in the include path so

that builds into a separate object directory work; eliminiated the RNDCINCLUDES
and CONFINCLUDES macros since they are not really necessary;
eliminated -DRNDC_SYSCONFDIR option passed to compiler when compiling
rndc-confgen.c since it is not actually used
parent 89209405
......@@ -13,7 +13,7 @@
# NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
# WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
# $Id: Makefile.in,v 1.30 2001/08/03 05:56:16 marka Exp $
# $Id: Makefile.in,v 1.31 2001/08/03 22:03:10 gson Exp $
srcdir = @srcdir@
VPATH = @srcdir@
......@@ -23,11 +23,8 @@ top_srcdir = @top_srcdir@
@BIND9_INCLUDES@
CINCLUDES = ${ISC_INCLUDES}
RNDCINCLUDES = ${CINCLUDES} ${ISCCC_INCLUDES} ${ISCCFG_INCLUDES}
CONFINCLUDES = -Iinclude ${CINCLUDES} ${DNS_INCLUDES}
CINCLUDES = -I${srcdir}/include ${ISC_INCLUDES} ${ISCCC_INCLUDES} \
${ISCCFG_INCLUDES} ${DNS_INCLUDES}
CDEFINES =
CWARNINGS =
......@@ -63,16 +60,16 @@ UOBJS = unix/os.@O@
@BIND9_MAKE_RULES@
rndc.@O@: rndc.c
${LIBTOOL} ${CC} ${ALL_CFLAGS} ${RNDCINCLUDES} \
${LIBTOOL} ${CC} ${ALL_CFLAGS} \
-DVERSION=\"${VERSION}\" \
-DRNDC_CONFFILE=\"${sysconfdir}/rndc.conf\" \
-DRNDC_KEYFILE=\"${sysconfdir}/rndc.key\" \
-c ${srcdir}/rndc.c
rndc-confgen.@O@: rndc-confgen.c
${LIBTOOL} ${CC} ${ALL_CFLAGS} ${CONFINCLUDES} \
${LIBTOOL} ${CC} ${ALL_CFLAGS} \
-DRNDC_KEYFILE=\"${sysconfdir}/rndc.key\" \
-DRNDC_SYSCONFDIR=\"${sysconfdir}\" -c ${srcdir}/rndc-confgen.c
-c ${srcdir}/rndc-confgen.c
rndc: rndc.@O@ util.@O@ ${RNDCDEPLIBS}
${LIBTOOL} ${PURIFY} ${CC} ${CFLAGS} -o $@ rndc.@O@ util.@O@ \
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment