commit 90d1c8575726f2169b9cdb7f7eb28b01e30cae80
Author: Jim Meyering <meyer...@redhat.com>
Date: Mon Aug 27 10:00:22 2012 -0400
build: minimal adjustments to make out-of-tree build work
---
Makefile.am | 1 +
src/common/include.am | 1 +
src/or/include.am | 30 +++++++++++++++---------------
3 files changed, 17 insertions(+), 15 deletions(-)
diff --git a/Makefile.am b/Makefile.am
index 4820255..466eaf8 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -16,6 +16,7 @@ TESTS=
noinst_PROGRAMS=
DISTCLEANFILES=
bin_SCRIPTS=
+AM_CPPFLAGS=
include src/include.am
include doc/include.am
include contrib/include.am
diff --git a/src/common/include.am b/src/common/include.am
index 116d268..0ab4769 100644
--- a/src/common/include.am
+++ b/src/common/include.am
@@ -7,6 +7,7 @@ EXTRA_DIST+= \
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
diff --git a/src/or/include.am b/src/or/include.am
index 7c31b53..65ff684 100644
--- a/src/or/include.am
+++ b/src/or/include.am
@@ -55,18 +55,18 @@ src_or_libtor_a_SOURCES = \
src/or/status.c \
$(evdns_source) \
$(tor_platform_source) \
- src/or/config_codedigest.c
+ src/or/config_codedigest.c
#libtor_a_LIBADD = ../common/libor.a ../common/libor-crypto.a \
# ../common/libor-event.a
src_or_tor_SOURCES = src/or/tor_main.c
-src_or_tor_INCLUDES= -Isrc/or/
+AM_CPPFLAGS += -I$(srcdir)/src/or -Isrc/or
-src/or/tor_main.c: src/or/micro-revision.i
+src/or/tor_main.c: micro-revision.i
-AM_CPPFLAGS = -DSHARE_DATADIR="\"$(datadir)\"" \
+AM_CPPFLAGS += -DSHARE_DATADIR="\"$(datadir)\"" \
-DLOCALSTATEDIR="\"$(localstatedir)\"" \
-DBINDIR="\"$(bindir)\""
@@ -123,24 +123,24 @@ noinst_HEADERS+= \
src/or/routerlist.h \
src/or/routerparse.h \
src/or/status.h \
- src/or/micro-revision.i
+ micro-revision.i
src/or/config_codedigest.o: src/or/or_sha1.i
-src/or/micro-revision.i: FORCE
- @rm -f src/or/micro-revision.tmp; \
+micro-revision.i: FORCE
+ @rm -f micro-revision.tmp; \
if test -d "$(top_srcdir)/.git" && \
test -x "`which git 2>&1;true`"; then \
HASH="`cd "$(top_srcdir)" && git rev-parse --short=16 HEAD`"; \
- echo \"$$HASH\" > src/or/micro-revision.tmp; \
+ echo \"$$HASH\" > micro-revision.tmp; \
fi; \
- if test ! -f src/or/micro-revision.tmp ; then \
- if test ! -f src/or/micro-revision.i ; then \
- echo '""' > src/or/micro-revision.i; \
+ if test ! -f micro-revision.tmp ; then \
+ if test ! -f micro-revision.i ; then \
+ echo '""' > micro-revision.i; \
fi; \
- elif test ! -f src/or/micro-revision.i || \
- test x"`cat src/or/micro-revision.tmp`" != x"`cat
src/or/micro-revision.i`"; then \
- mv src/or/micro-revision.tmp src/or/micro-revision.i; \
+ elif test ! -f micro-revision.i || \
+ test x"`cat micro-revision.tmp`" != x"`cat micro-revision.i`"; then \
+ mv micro-revision.tmp micro-revision.i; \
fi; true
src/or/or_sha1.i: $(src_or_tor_SOURCES) $(src_or_libtor_a_SOURCES)
@@ -155,6 +155,6 @@ src/or/or_sha1.i: $(src_or_tor_SOURCES)
$(src_or_libtor_a_SOURCES)
touch src/or/or_sha1.i; \
fi
-CLEANFILES+= src/or/micro-revision.i
+CLEANFILES+= micro-revision.i
FORCE:
_______________________________________________
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
