Commit fd354537 authored by David Lawrence's avatar David Lawrence
Browse files

use AR, ARFLAGS, O and A macros

parent 75a4dd0d
......@@ -40,19 +40,19 @@ LIBS = ${DEPLIBS} \
TARGETS = named
OBJS = client.o interfacemgr.o main.o query.o rootns.o server.o \
update.o xfrin.o xfrout.o
OBJS = client.@O@ interfacemgr.@O@ main.@O@ query.@O@ rootns.@O@ \
server.@O@ update.@O@ xfrin.@O@ xfrout.@O@
SRCS = client.c interfacemgr.c main.c query.c rootns.c server.c \
update.c xfrin.c xfrout.c
@BIND9_MAKE_RULES@
main.o: main.c
main.@O@: main.c
${CC} ${ALL_CFLAGS} -DVERSION=\"${VERSION}\" -c $<
printmsg.o: ${srcdir}/../tests/printmsg.c
${CC} -c -o printmsg.o ${ALL_CFLAGS} -I${srcdir}/../tests \
printmsg.@O@: ${srcdir}/../tests/printmsg.c
${CC} -c -o printmsg.@O@ ${ALL_CFLAGS} -I${srcdir}/../tests \
${srcdir}/../tests/printmsg.c
named: ${OBJS} ${DEPLIBS}
......
......@@ -95,104 +95,104 @@ SRCS = compress_test.c \
@BIND9_MAKE_RULES@
sdig: sdig.o printmsg.o ${ISCDEPLIBS} ${DNSDEPLIBS}
${LIBTOOL} ${CC} ${CFLAGS} -o $@ sdig.o printmsg.o \
sdig: sdig.@O@ printmsg.@O@ ${ISCDEPLIBS} ${DNSDEPLIBS}
${LIBTOOL} ${CC} ${CFLAGS} -o $@ sdig.@O@ printmsg.@O@ \
${DNSLIBS} ${ISCLIBS} ${LIBS}
nxtify: nxtify.o ${ISCDEPLIBS} ${DNSDEPLIBS}
${LIBTOOL} ${CC} ${CFLAGS} -o $@ nxtify.o \
nxtify: nxtify.@O@ ${ISCDEPLIBS} ${DNSDEPLIBS}
${LIBTOOL} ${CC} ${CFLAGS} -o $@ nxtify.@O@ \
${DNSLIBS} ${ISCLIBS} ${LIBS}
signer: signer.o ${ISCDEPLIBS} ${DNSDEPLIBS}
${LIBTOOL} ${CC} ${CFLAGS} -o $@ signer.o \
signer: signer.@O@ ${ISCDEPLIBS} ${DNSDEPLIBS}
${LIBTOOL} ${CC} ${CFLAGS} -o $@ signer.@O@ \
${DNSLIBS} ${ISCLIBS} ${LIBS}
keygen: keygen.o ${ISCDEPLIBS} ${DNSDEPLIBS}
${LIBTOOL} ${CC} ${CFLAGS} -o $@ keygen.o \
keygen: keygen.@O@ ${ISCDEPLIBS} ${DNSDEPLIBS}
${LIBTOOL} ${CC} ${CFLAGS} -o $@ keygen.@O@ \
${DNSLIBS} ${ISCLIBS} ${LIBS}
res_test: res_test.o ${ISCDEPLIBS} ${DNSDEPLIBS}
${LIBTOOL} ${CC} ${CFLAGS} -o $@ res_test.o \
res_test: res_test.@O@ ${ISCDEPLIBS} ${DNSDEPLIBS}
${LIBTOOL} ${CC} ${CFLAGS} -o $@ res_test.@O@ \
${DNSLIBS} ${ISCLIBS} ${LIBS}
lex_test: lex_test.o ${ISCDEPLIBS}
${LIBTOOL} ${CC} ${CFLAGS} -o $@ lex_test.o \
lex_test: lex_test.@O@ ${ISCDEPLIBS}
${LIBTOOL} ${CC} ${CFLAGS} -o $@ lex_test.@O@ \
${ISCLIBS} ${LIBS}
log_test: log_test.o ${ISCDEPLIBS} ${DNSDEPLIBS}
${LIBTOOL} ${CC} ${CFLAGS} -o $@ log_test.o \
log_test: log_test.@O@ ${ISCDEPLIBS} ${DNSDEPLIBS}
${LIBTOOL} ${CC} ${CFLAGS} -o $@ log_test.@O@ \
${DNSLIBS} ${ISCLIBS} ${LIBS}
name_test: name_test.o ${ISCDEPLIBS} ${DNSDEPLIBS}
${LIBTOOL} ${CC} ${CFLAGS} -o $@ name_test.o \
name_test: name_test.@O@ ${ISCDEPLIBS} ${DNSDEPLIBS}
${LIBTOOL} ${CC} ${CFLAGS} -o $@ name_test.@O@ \
${DNSLIBS} ${ISCLIBS} ${LIBS}
sock_test: sock_test.o ${ISCDEPLIBS}
${LIBTOOL} ${CC} ${CFLAGS} -o $@ sock_test.o \
sock_test: sock_test.@O@ ${ISCDEPLIBS}
${LIBTOOL} ${CC} ${CFLAGS} -o $@ sock_test.@O@ \
${ISCLIBS} ${LIBS}
sym_test: sym_test.o ${ISCDEPLIBS}
${LIBTOOL} ${CC} ${CFLAGS} -o $@ sym_test.o \
sym_test: sym_test.@O@ ${ISCDEPLIBS}
${LIBTOOL} ${CC} ${CFLAGS} -o $@ sym_test.@O@ \
${ISCLIBS} ${LIBS}
task_test: task_test.o ${ISCDEPLIBS}
${LIBTOOL} ${CC} ${CFLAGS} -o $@ task_test.o \
task_test: task_test.@O@ ${ISCDEPLIBS}
${LIBTOOL} ${CC} ${CFLAGS} -o $@ task_test.@O@ \
${ISCLIBS} ${LIBS}
shutdown_test: shutdown_test.o ${ISCDEPLIBS}
${LIBTOOL} ${CC} ${CFLAGS} -o $@ shutdown_test.o \
shutdown_test: shutdown_test.@O@ ${ISCDEPLIBS}
${LIBTOOL} ${CC} ${CFLAGS} -o $@ shutdown_test.@O@ \
${ISCLIBS} ${LIBS}
timer_test: timer_test.o ${ISCDEPLIBS}
${LIBTOOL} ${CC} ${CFLAGS} -o $@ timer_test.o \
timer_test: timer_test.@O@ ${ISCDEPLIBS}
${LIBTOOL} ${CC} ${CFLAGS} -o $@ timer_test.@O@ \
${ISCLIBS} ${LIBS}
rbt_test: rbt_test.o ${ISCDEPLIBS} ${DNSDEPLIBS}
${LIBTOOL} ${CC} ${CFLAGS} -o $@ rbt_test.o \
rbt_test: rbt_test.@O@ ${ISCDEPLIBS} ${DNSDEPLIBS}
${LIBTOOL} ${CC} ${CFLAGS} -o $@ rbt_test.@O@ \
${DNSLIBS} ${ISCLIBS} ${LIBS}
rdata_test: rdata_test.o ${ISCDEPLIBS} ${DNSDEPLIBS}
${LIBTOOL} ${CC} ${CFLAGS} -o $@ rdata_test.o \
rdata_test: rdata_test.@O@ ${ISCDEPLIBS} ${DNSDEPLIBS}
${LIBTOOL} ${CC} ${CFLAGS} -o $@ rdata_test.@O@ \
${DNSLIBS} ${ISCLIBS} ${LIBS}
rwlock_test: rwlock_test.o ${ISCDEPLIBS}
${LIBTOOL} ${CC} ${CFLAGS} -o $@ rwlock_test.o \
rwlock_test: rwlock_test.@O@ ${ISCDEPLIBS}
${LIBTOOL} ${CC} ${CFLAGS} -o $@ rwlock_test.@O@ \
${ISCLIBS} ${LIBS}
wire_test: wire_test.o printmsg.o ${ISCDEPLIBS} ${DNSDEPLIBS}
${LIBTOOL} ${CC} ${CFLAGS} -o $@ wire_test.o printmsg.o \
wire_test: wire_test.@O@ printmsg.@O@ ${ISCDEPLIBS} ${DNSDEPLIBS}
${LIBTOOL} ${CC} ${CFLAGS} -o $@ wire_test.@O@ printmsg.@O@ \
${DNSLIBS} ${ISCLIBS} ${LIBS}
master_test: master_test.o ${ISCDEPLIBS} ${DNSDEPLIBS}
${LIBTOOL} ${CC} ${CFLAGS} -o $@ master_test.o \
master_test: master_test.@O@ ${ISCDEPLIBS} ${DNSDEPLIBS}
${LIBTOOL} ${CC} ${CFLAGS} -o $@ master_test.@O@ \
${DNSLIBS} ${ISCLIBS} ${LIBS}
db_test: db_test.o ${ISCDEPLIBS} ${DNSDEPLIBS}
${LIBTOOL} ${CC} ${CFLAGS} -o $@ db_test.o \
db_test: db_test.@O@ ${ISCDEPLIBS} ${DNSDEPLIBS}
${LIBTOOL} ${CC} ${CFLAGS} -o $@ db_test.@O@ \
${DNSLIBS} ${ISCLIBS} ${LIBS}
compress_test: compress_test.o ${ISCDEPLIBS} ${DNSDEPLIBS}
${LIBTOOL} ${CC} ${CFLAGS} -o $@ compress_test.o \
compress_test: compress_test.@O@ ${ISCDEPLIBS} ${DNSDEPLIBS}
${LIBTOOL} ${CC} ${CFLAGS} -o $@ compress_test.@O@ \
${DNSLIBS} ${ISCLIBS} ${LIBS}
mempool_test: mempool_test.o ${ISCDEPLIBS}
${LIBTOOL} ${CC} ${CFLAGS} -o $@ mempool_test.o \
mempool_test: mempool_test.@O@ ${ISCDEPLIBS}
${LIBTOOL} ${CC} ${CFLAGS} -o $@ mempool_test.@O@ \
${ISCLIBS} ${LIBS}
serial_test: serial_test.o ${ISCDEPLIBS}
${LIBTOOL} ${CC} ${CFLAGS} -o $@ serial_test.o \
serial_test: serial_test.@O@ ${ISCDEPLIBS}
${LIBTOOL} ${CC} ${CFLAGS} -o $@ serial_test.@O@ \
${ISCLIBS} ${LIBS}
zone_test: zone_test.o ${ISCDEPLIBS} ${DNSDEPLIBS}
${LIBTOOL} ${CC} ${CFLAGS} -o $@ zone_test.o \
zone_test: zone_test.@O@ ${ISCDEPLIBS} ${DNSDEPLIBS}
${LIBTOOL} ${CC} ${CFLAGS} -o $@ zone_test.@O@ \
${DNSLIBS} ${ISCLIBS} ${LIBS}
dispatch_test: dispatch_test.o printmsg.o ${ISCDEPLIBS} ${DNSDEPLIBS}
${LIBTOOL} ${CC} ${CFLAGS} -o $@ dispatch_test.o printmsg.o \
dispatch_test: dispatch_test.@O@ printmsg.@O@ ${ISCDEPLIBS} ${DNSDEPLIBS}
${LIBTOOL} ${CC} ${CFLAGS} -o $@ dispatch_test.@O@ printmsg.@O@ \
${DNSLIBS} ${ISCLIBS} ${LIBS}
dispatch_tcp_test: dispatch_tcp_test.o printmsg.o ${ISCDEPLIBS} ${DNSDEPLIBS}
${LIBTOOL} ${CC} ${CFLAGS} -o $@ dispatch_tcp_test.o printmsg.o \
dispatch_tcp_test: dispatch_tcp_test.@O@ printmsg.@O@ ${ISCDEPLIBS} ${DNSDEPLIBS}
${LIBTOOL} ${CC} ${CFLAGS} -o $@ dispatch_tcp_test.@O@ printmsg.@O@ \
${DNSLIBS} ${ISCLIBS} ${LIBS}
clean distclean::
......
......@@ -30,15 +30,15 @@ CWARNINGS =
LIBS = ../../../lib/dns/libdns.@A@ \
../../../lib/isc/libisc.@A@ \
../../../lib/tests/libt_api.a \
../../../lib/tests/libt_api.@A@ \
@LIBS@
TARGETS = t_db
@BIND9_MAKE_RULES@
t_db: t_db.o
${LIBTOOL} ${CC} -o $@ t_db.o ${LIBS}
t_db: t_db.@O@
${LIBTOOL} ${CC} -o $@ t_db.@O@ ${LIBS}
test:
-@./t_db -c @top_srcdir@/t_config -a
......
......@@ -34,7 +34,7 @@ DEPLIBS = ../../../lib/dns/libdns.@A@ \
LIBS = ${DEPLIBS} \
@LIBS@
TLIB = ../../../lib/tests/libt_api.a
TLIB = ../../../lib/tests/libt_api.@A@
TARGETS = dst_test t_dst
......@@ -42,11 +42,11 @@ SRCS = dst_test.c t_dst.c
@BIND9_MAKE_RULES@
dst_test: dst_test.o ${DEPLIBS}
${LIBTOOL} ${CC} -o $@ dst_test.o ${LIBS}
dst_test: dst_test.@O@ ${DEPLIBS}
${LIBTOOL} ${CC} -o $@ dst_test.@O@ ${LIBS}
t_dst: t_dst.o ${DEPLIBS} ${TLIB}
${LIBTOOL} ${CC} -o $@ t_dst.o ${LIBS} ${TLIB}
t_dst: t_dst.@O@ ${DEPLIBS} ${TLIB}
${LIBTOOL} ${CC} -o $@ t_dst.@O@ ${LIBS} ${TLIB}
test:
-@ ./t_dst -a
......
......@@ -27,10 +27,10 @@ CINCLUDES = -I${srcdir}/../../../lib/isc/unix/include \
CDEFINES =
CWARNINGS =
# Note that we do not want to use libtool for libt_api.a
# Note that we do not want to use libtool for libt_api
LIBS = ../../../lib/dns/libdns.@A@ \
../../../lib/isc/libisc.@A@ \
../../../lib/tests/libt_api.a \
../../../lib/tests/libt_api.@A@ \
@LIBS@
TARGETS = t_master
......@@ -39,8 +39,8 @@ SRCS = t_master.c
@BIND9_MAKE_RULES@
t_master: t_master.o
${LIBTOOL} ${CC} -o $@ t_master.o ${LIBS}
t_master: t_master.@O@
${LIBTOOL} ${CC} -o $@ t_master.@O@ ${LIBS}
test:
-@ ./t_master -c @top_srcdir@/t_config -a
......
......@@ -29,7 +29,7 @@ CWARNINGS =
DEPLIBS = ../../../lib/dns/libdns.@A@ \
../../../lib/isc/libisc.@A@ \
../../../lib/tests/libt_api.a
../../../lib/tests/libt_api.@A@
LIBS = ${DEPLIBS} \
@LIBS@
......@@ -38,8 +38,8 @@ TARGETS = t_mem
@BIND9_MAKE_RULES@
t_mem: t_mem.o ${DEPLIBS}
${LIBTOOL} ${CC} -o $@ t_mem.o ${LIBS}
t_mem: t_mem.@O@ ${DEPLIBS}
${LIBTOOL} ${CC} -o $@ t_mem.@O@ ${LIBS}
test:
-@./t_mem -c @top_srcdir@/t_config
......
......@@ -27,10 +27,10 @@ CINCLUDES = -I${srcdir}/../../../lib/isc/unix/include \
CDEFINES =
CWARNINGS =
# Note that we do not want to use libtool for libt_api.a
# Note that we do not want to use libtool for libt_api
LIBS = ../../../lib/dns/libdns.@A@ \
../../../lib/isc/libisc.@A@ \
../../../lib/tests/libt_api.a \
../../../lib/tests/libt_api.@A@ \
@LIBS@
TARGETS = t_names
......@@ -39,8 +39,8 @@ SRCS = t_names.c
@BIND9_MAKE_RULES@
t_names: t_names.o
${LIBTOOL} ${CC} -o $@ t_names.o ${LIBS}
t_names: t_names.@O@
${LIBTOOL} ${CC} -o $@ t_names.@O@ ${LIBS}
test:
-@./t_names -c @top_srcdir@/t_config -a
......
......@@ -27,10 +27,10 @@ CINCLUDES = -I${srcdir}/../../../lib/isc/unix/include \
CDEFINES =
CWARNINGS =
# Note that we do not want to use libtool for libt_api.a
# Note that we do not want to use libtool for libt_api
LIBS = ../../../lib/dns/libdns.@A@ \
../../../lib/isc/libisc.@A@ \
../../../lib/tests/libt_api.a \
../../../lib/tests/libt_api.@A@ \
@LIBS@
TARGETS = t_rbt
......@@ -39,8 +39,8 @@ SRCS = t_rbt.c
@BIND9_MAKE_RULES@
t_rbt: t_rbt.o
${LIBTOOL} ${CC} -o $@ t_rbt.o ${LIBS}
t_rbt: t_rbt.@O@
${LIBTOOL} ${CC} -o $@ t_rbt.@O@ ${LIBS}
test:
-@./t_rbt -c @top_srcdir@/t_config -a
......
......@@ -30,7 +30,7 @@ CWARNINGS =
DEPLIBS = ../../../lib/dns/libdns.@A@ \
../../../lib/isc/libisc.@A@ \
../../../lib/tests/libt_api.a
../../../lib/tests/libt_api.@A@
LIBS = ${DEPLIBS} \
@LIBS@
......@@ -39,8 +39,8 @@ TARGETS = t_tasks
@BIND9_MAKE_RULES@
t_tasks: t_tasks.o ${DEPLIBS}
${LIBTOOL} ${CC} -o $@ t_tasks.o ${LIBS}
t_tasks: t_tasks.@O@ ${DEPLIBS}
${LIBTOOL} ${CC} -o $@ t_tasks.@O@ ${LIBS}
test:
-@./t_tasks -c @top_srcdir@/t_config
......
......@@ -29,15 +29,15 @@ CWARNINGS =
LIBS = ../../../lib/dns/libdns.@A@ \
../../../lib/isc/libisc.@A@ \
../../../lib/tests/libt_api.a \
../../../lib/tests/libt_api.@A@ \
@LIBS@
TARGETS = t_timers
@BIND9_MAKE_RULES@
t_timers: t_timers.o
${LIBTOOL} ${CC} -o $@ t_timers.o ${LIBS}
t_timers: t_timers.@O@
${LIBTOOL} ${CC} -o $@ t_timers.@O@ ${LIBS}
test:
-@./t_timers -c @top_srcdir@/t_config -q 60
......
......@@ -35,6 +35,7 @@ CDEFINES =
CWARNINGS =
LIBS = @LIBS@
LIBISC = ../isc/libisc.@A@
# Alphabetically
......@@ -157,9 +158,9 @@ version.@O@: version.c
-DLIBAGE=${LIBAGE} \
-c $<
libdns.a: ${OBJS}
${AR} cruv $@ ${OBJS}
${RANLIB} libdns.a
libdns.@A@: ${OBJS}
${AR} ${ARFLAGS} $@ ${OBJS}
${RANLIB} $@
libdns.la: ${OBJS}
${LIBTOOL} --mode=link \
......@@ -179,7 +180,7 @@ install:: timestamp installdirs
${LIBTOOL} ${INSTALL_DATA} libdns.@A@ ${libdir}
clean distclean::
rm -f libdns.a timestamp
rm -f libdns.@A@ timestamp
rm -f gen code.h include/dns/enumtype.h include/dns/enumclass.h
rm -f include/dns/rdatastruct.h
......
......@@ -73,9 +73,9 @@ version.@O@: version.c
-DLIBAGE=${LIBAGE} \
-c $<
libisc.a: ${OBJS}
${AR} cruv libisc.a ${OBJS}
${RANLIB} libisc.a
libisc.@A@: ${OBJS}
${AR} ${ARFLAGS} $@ ${OBJS}
${RANLIB} $@
libisc.la: ${OBJS}
${LIBTOOL} --mode=link \
......@@ -95,4 +95,4 @@ install:: timestamp installdirs
${LIBTOOL} ${INSTALL_DATA} libisc.@A@ ${libdir}
clean distclean::
rm -f libisc.a libisc.la timestamp
rm -f libisc.@A@ libisc.la timestamp
......@@ -30,7 +30,7 @@ CDEFINES =
CWARNINGS =
# Note: we are not using libtool with this library.
OBJS = t_api.o
OBJS = t_api.@O@
SRCS = t_api.c
......@@ -39,12 +39,12 @@ TARGETS = timestamp
@BIND9_MAKE_RULES@
libt_api.a: ${OBJS}
${AR} cruv libt_api.a ${OBJS}
libt_api.@A@: ${OBJS}
${AR} ${ARFLAGS} $@ ${OBJS}
${RANLIB} $@
timestamp: libt_api.a
${RANLIB} libt_api.a
timestamp: libt_api.@A@
touch timestamp
clean distclean::
rm -f t_api.o libt_api.a timestamp
rm -f t_api.@O@ libt_api.@A@ timestamp
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