[Opendnssec-commits] [keihatsu.kirei.se/svn/dnssec] r3714 - in trunk/OpenDNSSEC: enforcer/common enforcer/enforcerd enforcer/ksm enforcer/test enforcer/utils libhsm/src signer/src

Jakob Schlyter jakob at kirei.se
Tue Aug 10 22:24:33 CEST 2010


Author: jakob
Date: 2010-08-10 22:24:33 +0200 (Tue, 10 Aug 2010)
New Revision: 3714

Removed:
   trunk/OpenDNSSEC/enforcer/ksm/compat/
   trunk/OpenDNSSEC/libhsm/src/compat/
Modified:
   trunk/OpenDNSSEC/enforcer/common/Makefile.am
   trunk/OpenDNSSEC/enforcer/enforcerd/Makefile.am
   trunk/OpenDNSSEC/enforcer/ksm/Makefile.am
   trunk/OpenDNSSEC/enforcer/ksm/datetime.c
   trunk/OpenDNSSEC/enforcer/ksm/string_util.c
   trunk/OpenDNSSEC/enforcer/test/Makefile.am
   trunk/OpenDNSSEC/enforcer/utils/Makefile.am
   trunk/OpenDNSSEC/libhsm/src/Makefile.am
   trunk/OpenDNSSEC/libhsm/src/libhsm.c
   trunk/OpenDNSSEC/signer/src/Makefile.am
Log:
use common compat functions


Modified: trunk/OpenDNSSEC/enforcer/common/Makefile.am
===================================================================
--- trunk/OpenDNSSEC/enforcer/common/Makefile.am	2010-08-10 20:23:49 UTC (rev 3713)
+++ trunk/OpenDNSSEC/enforcer/common/Makefile.am	2010-08-10 20:24:33 UTC (rev 3714)
@@ -3,6 +3,7 @@
 MAINTAINERCLEANFILES = $(srcdir)/Makefile.in
 
 AM_CPPFLAGS = \
+	-I$(top_srcdir)/common \
 	-I$(top_builddir)/common \
 	-I$(srcdir)/../ksm/include \
 	-I$(builddir)/../ksm/include \

Modified: trunk/OpenDNSSEC/enforcer/enforcerd/Makefile.am
===================================================================
--- trunk/OpenDNSSEC/enforcer/enforcerd/Makefile.am	2010-08-10 20:23:49 UTC (rev 3713)
+++ trunk/OpenDNSSEC/enforcer/enforcerd/Makefile.am	2010-08-10 20:24:33 UTC (rev 3714)
@@ -7,6 +7,7 @@
 LIBENFORCER = ../common/libenforcer.a
 
 AM_CPPFLAGS = \
+	-I$(top_srcdir)/common \
 	-I$(top_builddir)/common \
 	-I$(srcdir)/../common \
 	-I$(builddir)/../common \

Modified: trunk/OpenDNSSEC/enforcer/ksm/Makefile.am
===================================================================
--- trunk/OpenDNSSEC/enforcer/ksm/Makefile.am	2010-08-10 20:23:49 UTC (rev 3713)
+++ trunk/OpenDNSSEC/enforcer/ksm/Makefile.am	2010-08-10 20:24:33 UTC (rev 3714)
@@ -5,6 +5,7 @@
 SUBDIRS = include
 
 AM_CPPFLAGS = \
+	-I$(top_srcdir)/common \
 	-I$(top_builddir)/common \
 	-I$(srcdir)/include \
 	-I$(builddir)/include \
@@ -19,8 +20,7 @@
 	ksm_key.c ksm_key_delete.c ksm_keyword.c ksm_list.c ksm_parameter.c \
 	ksm_parameter_value.c ksm_policy.c ksm_policy_value.c ksm_purge.c \
 	ksm_request.c ksm_time.c ksm_update.c ksm_version.c ksm_zone.c \
-	memory.c message.c string_util.c string_util2.c \
-	compat/strlcpy.c compat/strlcat.c
+	memory.c message.c string_util.c string_util2.c
 
 if USE_MYSQL
 libksm_a_SOURCES += \

Modified: trunk/OpenDNSSEC/enforcer/ksm/datetime.c
===================================================================
--- trunk/OpenDNSSEC/enforcer/ksm/datetime.c	2010-08-10 20:23:49 UTC (rev 3713)
+++ trunk/OpenDNSSEC/enforcer/ksm/datetime.c	2010-08-10 20:24:33 UTC (rev 3714)
@@ -42,6 +42,7 @@
 #include <limits.h>
 
 #include "config.h"
+#include "compat.h"
 
 #include "ksm/ksm.h"
 #include "ksm/datetime.h"

Modified: trunk/OpenDNSSEC/enforcer/ksm/string_util.c
===================================================================
--- trunk/OpenDNSSEC/enforcer/ksm/string_util.c	2010-08-10 20:23:49 UTC (rev 3713)
+++ trunk/OpenDNSSEC/enforcer/ksm/string_util.c	2010-08-10 20:24:33 UTC (rev 3714)
@@ -40,6 +40,7 @@
 #include <stdlib.h>
 
 #include "config.h"
+#include "compat.h"
 
 #include "ksm/string_util.h"
 #include "ksm/message.h"

Modified: trunk/OpenDNSSEC/enforcer/test/Makefile.am
===================================================================
--- trunk/OpenDNSSEC/enforcer/test/Makefile.am	2010-08-10 20:23:49 UTC (rev 3713)
+++ trunk/OpenDNSSEC/enforcer/test/Makefile.am	2010-08-10 20:24:33 UTC (rev 3714)
@@ -5,6 +5,7 @@
 LIBHSM = ../../libhsm/src/libhsm.a
 
 AM_CPPFLAGS = \
+	-I$(top_srcdir)/common \
 	-I$(top_builddir)/common \
 	-I$(srcdir)/../ksm/include \
 	-I$(builddir)/../ksm/include \

Modified: trunk/OpenDNSSEC/enforcer/utils/Makefile.am
===================================================================
--- trunk/OpenDNSSEC/enforcer/utils/Makefile.am	2010-08-10 20:23:49 UTC (rev 3713)
+++ trunk/OpenDNSSEC/enforcer/utils/Makefile.am	2010-08-10 20:24:33 UTC (rev 3714)
@@ -6,6 +6,7 @@
 LIBKSM = ../ksm/libksm.a
 
 AM_CPPFLAGS = \
+	-I$(top_srcdir)/common \
 	-I$(top_builddir)/common \
 	-I$(srcdir)/../common \
 	-I$(builddir)/../common \

Modified: trunk/OpenDNSSEC/libhsm/src/Makefile.am
===================================================================
--- trunk/OpenDNSSEC/libhsm/src/Makefile.am	2010-08-10 20:23:49 UTC (rev 3713)
+++ trunk/OpenDNSSEC/libhsm/src/Makefile.am	2010-08-10 20:24:33 UTC (rev 3714)
@@ -3,6 +3,7 @@
 MAINTAINERCLEANFILES = $(srcdir)/Makefile.in
 
 AM_CPPFLAGS = \
+		-I$(top_srcdir)/common \
 		-I$(top_builddir)/common \
 		-I$(srcdir)/cryptoki_compat \
 		@LDNS_INCLUDES@ @XML2_INCLUDES@
@@ -10,9 +11,7 @@
 noinst_LIBRARIES = libhsm.a
 
 libhsm_a_SOURCES = libhsm.c libhsm.h libhsmdns.h \
-	cryptoki_compat/pkcs11.h \
-	compat/strlcpy.c compat/strlcat.h \
-	compat/strlcat.c compat/strlcat.h
+	cryptoki_compat/pkcs11.h
 
 bin_PROGRAMS = ods-hsmutil ods-hsmspeed
 

Modified: trunk/OpenDNSSEC/libhsm/src/libhsm.c
===================================================================
--- trunk/OpenDNSSEC/libhsm/src/libhsm.c	2010-08-10 20:23:49 UTC (rev 3713)
+++ trunk/OpenDNSSEC/libhsm/src/libhsm.c	2010-08-10 20:24:33 UTC (rev 3714)
@@ -44,7 +44,7 @@
 
 #include "libhsm.h"
 #include "libhsmdns.h"
-#include "compat/strlcpy.h"
+#include "compat.h"
 
 #include <pkcs11.h>
 

Modified: trunk/OpenDNSSEC/signer/src/Makefile.am
===================================================================
--- trunk/OpenDNSSEC/signer/src/Makefile.am	2010-08-10 20:23:49 UTC (rev 3713)
+++ trunk/OpenDNSSEC/signer/src/Makefile.am	2010-08-10 20:24:33 UTC (rev 3714)
@@ -5,6 +5,8 @@
 LIBHSM = ../../libhsm/src/libhsm.a
 
 AM_CPPFLAGS = \
+	-I$(top_srcdir)/common \
+	-I$(top_builddir)/common \
 	-I$(srcdir)/../../libhsm/src \
 	-I$(builddir)/../../libhsm/src \
 	@XML2_INCLUDES@ \




More information about the Opendnssec-commits mailing list