Merge branch 'bug6524_nm'

2 files changed, 73 insertions, 67 deletions

diff --git a/src/common/Makefile.am b/src/common/Makefile.am
deleted file mode 100644
index 5e7684259a..0000000000
--- a/src/common/Makefile.am
+++ /dev/null
@@ -1,67 +0,0 @@
-
-noinst_LIBRARIES = libor.a libor-crypto.a libor-event.a
-
-EXTRA_DIST = common_sha1.i sha256.c Makefile.nmake
-
-#CFLAGS  = -Wall -Wpointer-arith -O2
-
-if USE_OPENBSD_MALLOC
-libor_extra_source=OpenBSD_malloc_Linux.c
-else
-libor_extra_source=
-endif
-
-libor_a_SOURCES = \
-  address.c					\
-  compat.c					\
-  container.c					\
-  di_ops.c					\
-  log.c						\
-  memarea.c					\
-  mempool.c					\
-  procmon.c					\
-  util.c					\
-  util_codedigest.c				\
-  $(libor_extra_source)
-
-libor_crypto_a_SOURCES = \
-  aes.c		\
-  crypto.c	\
-  torgzip.c	\
-  tortls.c
-
-libor_event_a_SOURCES = compat_libevent.c
-
-noinst_HEADERS = 				\
-  address.h					\
-  aes.h						\
-  ciphers.inc					\
-  compat.h					\
-  compat_libevent.h				\
-  container.h					\
-  crypto.h					\
-  di_ops.h					\
-  ht.h						\
-  memarea.h					\
-  mempool.h					\
-  procmon.h					\
-  strlcat.c					\
-  strlcpy.c					\
-  torgzip.h					\
-  torint.h					\
-  torlog.h					\
-  tortls.h					\
-  util.h
-
-common_sha1.i: $(libor_SOURCES) $(libor_crypto_a_SOURCES) $(noinst_HEADERS)
-	if test "@SHA1SUM@" != none; then \
-	  (cd "$(srcdir)" && "@SHA1SUM@" $(libor_SOURCES) $(libor_crypto_a_SOURCES) $(noinst_HEADERS)) | "@SED@" -n 's/^\(.*\)$$/"\1\\n"/p' > common_sha1.i; \
-	elif test "@OPENSSL@" != none; then \
-	  (cd "$(srcdir)" && "@OPENSSL@" sha1 $(libor_SOURCES) $(libor_crypto_a_SOURCES) $(noinst_HEADERS)) | "@SED@" -n 's/SHA1(\(.*\))= \(.*\)/"\2  \1\\n"/p' > common_sha1.i; \
-	else \
-	  rm common_sha1.i; \
-	  touch common_sha1.i; \
-	fi
-
-util_codedigest.o: common_sha1.i
-crypto.o: sha256.c
diff --git a/src/common/include.am b/src/common/include.am
new file mode 100644
index 0000000000..0ab4769847
--- /dev/null
+++ b/src/common/include.am
@@ -0,0 +1,73 @@
+
+noinst_LIBRARIES+= src/common/libor.a src/common/libor-crypto.a src/common/libor-event.a
+
+EXTRA_DIST+= \
+  src/common/common_sha1.i	\
+  src/common/sha256.c		\
+  src/common/Makefile.nmake
+
+#CFLAGS  = -Wall -Wpointer-arith -O2
+AM_CPPFLAGS += -I$(srcdir)/src/common -Isrc/common
+
+if USE_OPENBSD_MALLOC
+libor_extra_source=src/common/OpenBSD_malloc_Linux.c
+else
+libor_extra_source=
+endif
+
+src_common_libor_a_SOURCES = \
+  src/common/address.c					\
+  src/common/compat.c					\
+  src/common/container.c				\
+  src/common/di_ops.c					\
+  src/common/log.c					\
+  src/common/memarea.c					\
+  src/common/mempool.c					\
+  src/common/procmon.c					\
+  src/common/util.c					\
+  src/common/util_codedigest.c				\
+  $(libor_extra_source)
+
+src_common_libor_crypto_a_SOURCES = \
+  src/common/aes.c		\
+  src/common/crypto.c		\
+  src/common/torgzip.c		\
+  src/common/tortls.c
+
+src_common_libor_event_a_SOURCES = src/common/compat_libevent.c
+
+noinst_HEADERS+= 				\
+  src/common/address.h				\
+  src/common/aes.h				\
+  src/common/ciphers.inc			\
+  src/common/compat.h				\
+  src/common/compat_libevent.h			\
+  src/common/container.h			\
+  src/common/crypto.h				\
+  src/common/di_ops.h				\
+  src/common/ht.h				\
+  src/common/memarea.h				\
+  src/common/mempool.h				\
+  src/common/procmon.h				\
+  src/common/strlcat.c				\
+  src/common/strlcpy.c				\
+  src/common/torgzip.h				\
+  src/common/torint.h				\
+  src/common/torlog.h				\
+  src/common/tortls.h				\
+  src/common/util.h
+
+DISTCLEANFILES+= src/common/common_sha1.i
+
+src/common/common_sha1.i: $(libor_SOURCES) $(libor_crypto_a_SOURCES) $(noinst_HEADERS)
+	$(AM_V_GEN)if test "@SHA1SUM@" != none; then \
+	  (cd "$(srcdir)" && "@SHA1SUM@" $(src_common_libor_SOURCES) $(src_common_libor_crypto_a_SOURCES) $(noinst_HEADERS)) | "@SED@" -n 's/^\(.*\)$$/"\1\\n"/p' > $@; \
+	elif test "@OPENSSL@" != none; then \
+	  (cd "$(srcdir)" && "@OPENSSL@" sha1 $(src_common_libor_SOURCES) $(src_Common_libor_crypto_a_SOURCES) $(noinst_HEADERS)) | "@SED@" -n 's/SHA1(\(.*\))= \(.*\)/"\2  \1\\n"/p' > $@; \
+	else \
+	  rm $@; \
+	  touch $@; \
+	fi
+
+src/common/util_codedigest.o: src/common/common_sha1.i
+src/common/crypto.c: src/common/sha256.c