1 |
diff -up bind-9.9.3rc2/isc-config.sh.in.exportlib bind-9.9.3rc2/isc-config.sh.in |
diff -Naurp bind-9.9.5/lib/export/dns/Makefile.in bind-9.9.5.oden/lib/export/dns/Makefile.in |
2 |
diff -up bind-9.9.3rc2/lib/export/dns/Makefile.in.exportlib bind-9.9.3rc2/lib/export/dns/Makefile.in |
--- bind-9.9.5/lib/export/dns/Makefile.in 2014-01-27 19:58:24.000000000 +0100 |
3 |
--- bind-9.9.3rc2/lib/export/dns/Makefile.in.exportlib 2013-04-30 08:38:46.000000000 +0200 |
+++ bind-9.9.5.oden/lib/export/dns/Makefile.in 2014-02-02 14:10:53.380285512 +0100 |
|
+++ bind-9.9.3rc2/lib/export/dns/Makefile.in 2013-05-13 10:45:22.574089729 +0200 |
|
4 |
@@ -35,9 +35,9 @@ CDEFINES = -DUSE_MD5 @USE_OPENSSL@ @USE_ |
@@ -35,9 +35,9 @@ CDEFINES = -DUSE_MD5 @USE_OPENSSL@ @USE_ |
5 |
|
|
6 |
CWARNINGS = |
CWARNINGS = |
49 |
rm -f gen code.h include/dns/enumtype.h include/dns/enumclass.h |
rm -f gen code.h include/dns/enumtype.h include/dns/enumclass.h |
50 |
rm -f include/dns/rdatastruct.h |
rm -f include/dns/rdatastruct.h |
51 |
|
|
52 |
diff -up bind-9.9.3rc2/lib/export/irs/Makefile.in.exportlib bind-9.9.3rc2/lib/export/irs/Makefile.in |
diff -Naurp bind-9.9.5/lib/export/irs/Makefile.in bind-9.9.5.oden/lib/export/irs/Makefile.in |
53 |
--- bind-9.9.3rc2/lib/export/irs/Makefile.in.exportlib 2013-04-30 08:38:46.000000000 +0200 |
--- bind-9.9.5/lib/export/irs/Makefile.in 2014-01-27 19:58:24.000000000 +0100 |
54 |
+++ bind-9.9.3rc2/lib/export/irs/Makefile.in 2013-05-13 10:45:22.575089729 +0200 |
+++ bind-9.9.5.oden/lib/export/irs/Makefile.in 2014-02-02 14:10:53.381285512 +0100 |
55 |
@@ -43,9 +43,9 @@ SRCS = context.c \ |
@@ -43,9 +43,9 @@ SRCS = context.c \ |
56 |
gai_sterror.c getaddrinfo.c getnameinfo.c \ |
gai_sterror.c getaddrinfo.c getnameinfo.c \ |
57 |
resconf.c |
resconf.c |
98 |
clean distclean:: |
clean distclean:: |
99 |
- rm -f libirs.@A@ libirs.la timestamp |
- rm -f libirs.@A@ libirs.la timestamp |
100 |
+ rm -f libirs-export.@A@ libirs-export.la timestamp |
+ rm -f libirs-export.@A@ libirs-export.la timestamp |
101 |
diff -up bind-9.9.3rc2/lib/export/isccfg/Makefile.in.exportlib bind-9.9.3rc2/lib/export/isccfg/Makefile.in |
diff -Naurp bind-9.9.5/lib/export/isc/Makefile.in bind-9.9.5.oden/lib/export/isc/Makefile.in |
102 |
--- bind-9.9.3rc2/lib/export/isccfg/Makefile.in.exportlib 2013-04-30 08:38:46.000000000 +0200 |
--- bind-9.9.5/lib/export/isc/Makefile.in 2014-01-27 19:58:24.000000000 +0100 |
103 |
+++ bind-9.9.3rc2/lib/export/isccfg/Makefile.in 2013-05-13 10:45:22.576089729 +0200 |
+++ bind-9.9.5.oden/lib/export/isc/Makefile.in 2014-02-02 14:10:53.381285512 +0100 |
104 |
|
@@ -103,6 +103,10 @@ SRCS = @ISC_EXTRA_SRCS@ \ |
105 |
|
|
106 |
|
LIBS = @LIBS@ |
107 |
|
|
108 |
|
+# Note: the order of SUBDIRS is important. |
109 |
|
+# Attempt to disable parallel processing. |
110 |
|
+.NOTPARALLEL: |
111 |
|
+.NO_PARALLEL: |
112 |
|
SUBDIRS = include unix nls @ISC_THREAD_DIR@ |
113 |
|
TARGETS = timestamp |
114 |
|
|
115 |
|
@@ -116,26 +120,26 @@ version.@O@: ${srcdir}/version.c |
116 |
|
-DLIBAGE=${LIBAGE} \ |
117 |
|
-c ${srcdir}/version.c |
118 |
|
|
119 |
|
-libisc.@SA@: ${OBJS} |
120 |
|
+libisc-export.@SA@: ${OBJS} |
121 |
|
${AR} ${ARFLAGS} $@ ${OBJS} |
122 |
|
${RANLIB} $@ |
123 |
|
|
124 |
|
-libisc.la: ${OBJS} |
125 |
|
+libisc-export.la: ${OBJS} |
126 |
|
${LIBTOOL_MODE_LINK} \ |
127 |
|
- ${CC} ${ALL_CFLAGS} ${LDFLAGS} -o libisc.la \ |
128 |
|
+ ${CC} ${ALL_CFLAGS} ${LDFLAGS} -o libisc-export.la \ |
129 |
|
-rpath ${export_libdir} \ |
130 |
|
-version-info ${LIBINTERFACE}:${LIBREVISION}:${LIBAGE} \ |
131 |
|
${OBJS} ${LIBS} |
132 |
|
|
133 |
|
-timestamp: libisc.@A@ |
134 |
|
+timestamp: libisc-export.@A@ |
135 |
|
touch timestamp |
136 |
|
|
137 |
|
installdirs: |
138 |
|
$(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${export_libdir} |
139 |
|
|
140 |
|
install:: timestamp installdirs |
141 |
|
- ${LIBTOOL_MODE_INSTALL} ${INSTALL_DATA} libisc.@A@ \ |
142 |
|
+ ${LIBTOOL_MODE_INSTALL} ${INSTALL_PROGRAM} libisc-export.@A@ \ |
143 |
|
${DESTDIR}${export_libdir} |
144 |
|
|
145 |
|
clean distclean:: |
146 |
|
- rm -f libisc.@A@ libisc.la timestamp |
147 |
|
+ rm -f libisc-export.@A@ libisc-export.la timestamp |
148 |
|
diff -Naurp bind-9.9.5/lib/export/isccfg/Makefile.in bind-9.9.5.oden/lib/export/isccfg/Makefile.in |
149 |
|
--- bind-9.9.5/lib/export/isccfg/Makefile.in 2014-01-27 19:58:24.000000000 +0100 |
150 |
|
+++ bind-9.9.5.oden/lib/export/isccfg/Makefile.in 2014-02-02 14:10:53.381285512 +0100 |
151 |
@@ -30,11 +30,11 @@ CINCLUDES = -I. ${DNS_INCLUDES} -I${expo |
@@ -30,11 +30,11 @@ CINCLUDES = -I. ${DNS_INCLUDES} -I${expo |
152 |
CDEFINES = |
CDEFINES = |
153 |
CWARNINGS = |
CWARNINGS = |
196 |
clean distclean:: |
clean distclean:: |
197 |
- rm -f libisccfg.@A@ timestamp |
- rm -f libisccfg.@A@ timestamp |
198 |
+ rm -f libisccfg-export.@A@ timestamp |
+ rm -f libisccfg-export.@A@ timestamp |
199 |
diff -up bind-9.9.3rc2/lib/export/isc/Makefile.in.exportlib bind-9.9.3rc2/lib/export/isc/Makefile.in |
diff -Naurp bind-9.9.5/lib/export/samples/Makefile.in bind-9.9.5.oden/lib/export/samples/Makefile.in |
200 |
--- bind-9.9.3rc2/lib/export/isc/Makefile.in.exportlib 2013-04-30 08:38:46.000000000 +0200 |
--- bind-9.9.5/lib/export/samples/Makefile.in 2014-01-27 19:58:24.000000000 +0100 |
201 |
+++ bind-9.9.3rc2/lib/export/isc/Makefile.in 2013-05-13 10:45:22.576089729 +0200 |
+++ bind-9.9.5.oden/lib/export/samples/Makefile.in 2014-02-02 14:10:53.382285512 +0100 |
|
@@ -100,6 +100,10 @@ SRCS = @ISC_EXTRA_SRCS@ \ |
|
|
|
|
|
LIBS = @LIBS@ |
|
|
|
|
|
+# Note: the order of SUBDIRS is important. |
|
|
+# Attempt to disable parallel processing. |
|
|
+.NOTPARALLEL: |
|
|
+.NO_PARALLEL: |
|
|
SUBDIRS = include unix nls @ISC_THREAD_DIR@ |
|
|
TARGETS = timestamp |
|
|
|
|
|
@@ -113,26 +117,26 @@ version.@O@: ${srcdir}/version.c |
|
|
-DLIBAGE=${LIBAGE} \ |
|
|
-c ${srcdir}/version.c |
|
|
|
|
|
-libisc.@SA@: ${OBJS} |
|
|
+libisc-export.@SA@: ${OBJS} |
|
|
${AR} ${ARFLAGS} $@ ${OBJS} |
|
|
${RANLIB} $@ |
|
|
|
|
|
-libisc.la: ${OBJS} |
|
|
+libisc-export.la: ${OBJS} |
|
|
${LIBTOOL_MODE_LINK} \ |
|
|
- ${CC} ${ALL_CFLAGS} ${LDFLAGS} -o libisc.la \ |
|
|
+ ${CC} ${ALL_CFLAGS} ${LDFLAGS} -o libisc-export.la \ |
|
|
-rpath ${export_libdir} \ |
|
|
-version-info ${LIBINTERFACE}:${LIBREVISION}:${LIBAGE} \ |
|
|
${OBJS} ${LIBS} |
|
|
|
|
|
-timestamp: libisc.@A@ |
|
|
+timestamp: libisc-export.@A@ |
|
|
touch timestamp |
|
|
|
|
|
installdirs: |
|
|
$(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${export_libdir} |
|
|
|
|
|
install:: timestamp installdirs |
|
|
- ${LIBTOOL_MODE_INSTALL} ${INSTALL_DATA} libisc.@A@ \ |
|
|
+ ${LIBTOOL_MODE_INSTALL} ${INSTALL_PROGRAM} libisc-export.@A@ \ |
|
|
${DESTDIR}${export_libdir} |
|
|
|
|
|
clean distclean:: |
|
|
- rm -f libisc.@A@ libisc.la timestamp |
|
|
+ rm -f libisc-export.@A@ libisc-export.la timestamp |
|
|
diff -up bind-9.9.3rc2/lib/export/samples/Makefile.in.exportlib bind-9.9.3rc2/lib/export/samples/Makefile.in |
|
|
--- bind-9.9.3rc2/lib/export/samples/Makefile.in.exportlib 2013-04-30 08:38:46.000000000 +0200 |
|
|
+++ bind-9.9.3rc2/lib/export/samples/Makefile.in 2013-05-13 10:45:22.577089729 +0200 |
|
202 |
@@ -31,15 +31,15 @@ CINCLUDES = -I${srcdir}/include -I../dns |
@@ -31,15 +31,15 @@ CINCLUDES = -I${srcdir}/include -I../dns |
203 |
CDEFINES = |
CDEFINES = |
204 |
CWARNINGS = |
CWARNINGS = |