charon-tkm: Support for out-of-tree build added

diff --git a/src/charon-tkm/Makefile.am b/src/charon-tkm/Makefile.am
index 0fef1f62da82b121c272398b7372f1b208a82a9b..c3da7d7f4eca6a7e34928ad12f077df3967515b8 100644 (file)
--- a/src/charon-tkm/Makefile.am
+++ b/src/charon-tkm/Makefile.am
@@ -1,23 +1,23 @@
-SRC = $(top_builddir)/src
+SRC = $(abs_top_srcdir)/src
+OBJ = $(abs_top_builddir)/src
 
-# includes relative to obj directory
 AM_CPPFLAGS = \
-       -include $(top_builddir)/config.h \
-       -I../$(SRC)/libstrongswan \
-       -I../$(SRC)/libhydra \
-       -I../$(SRC)/libcharon
+       -include $(abs_top_builddir)/config.h \
+       -I$(SRC)/libstrongswan \
+       -I$(SRC)/libhydra \
+       -I$(SRC)/libcharon
 
 LIBLD = \
-       -L$(SRC)/libstrongswan/.libs \
-       -L$(SRC)/libhydra/.libs \
-       -L$(SRC)/libcharon/.libs
-LIBPT = $(SRC)/libstrongswan/.libs:$(SRC)/libhydra/.libs:$(SRC)/libcharon/.libs
+       -L$(OBJ)/libstrongswan/.libs \
+       -L$(OBJ)/libhydra/.libs \
+       -L$(OBJ)/libcharon/.libs
+LIBPT = $(OBJ)/libstrongswan/.libs:$(OBJ)/libhydra/.libs:$(OBJ)/libcharon/.libs
 LIBFL = -lstrongswan -lhydra -lcharon
 
 DEFS += -DPLUGINS=\""$(PLUGINS)\"" -DIPSEC_PIDDIR=\"${piddir}\"
 
 BUILD_OPTS = \
-       -XOBJ_DIR=$(CURDIR)/obj \
+       -XOBJ_DIR=$(abs_builddir)/obj \
        -cargs $(AM_CPPFLAGS) $(DEFS) \
        -largs $(LIBLD) $(LIBFL)
 

diff --git a/src/charon-tkm/build_common.gpr b/src/charon-tkm/build_common.gpr
index ac322d7133f809ec51714a41097c701fd9c4e854..102f6b7a27739845d3fa2eafac571c778dd42adb 100644 (file)
--- a/src/charon-tkm/build_common.gpr
+++ b/src/charon-tkm/build_common.gpr
@@ -5,7 +5,7 @@ project Build_Common is
 
    for Source_Dirs use ();
 
-   Obj_Dir := "obj";
+   Obj_Dir := external ("OBJ_DIR", "obj");
 
    C_Compiler_Switches   := ("-W",
                              "-Wall",