[PATCH] [FreeBSD 2] Patches for 3.4/4.0

Timur I. Bakeyev timur at com.bat.ru
Sun Jun 7 11:56:14 GMT 2009


This patch fixes the problem with building 'test' target, when we are using
external libtalloc. In this case @tallocdir@ is undefined and test suit
doesn't build. Using relative paths fixes the problem.

Also, this patch contains small fix necessary for BSD make to be able
to process precompiled headers. You have to explicitly define generic
rule for obtaining precompiled headers, otherwise $< variable not get
defined and the whole compilation fails.

With regards,
Timur Bakeyev.
-------------- next part --------------
--- ./source3/Makefile.in.orig	2009-06-02 07:30:53.000000000 +0000
+++ ./source3/Makefile.in	2009-06-03 00:22:57.000000000 +0000
@@ -1028,7 +1029,7 @@
 		$(LIBSAMBA_OBJ) \
                 $(POPT_LIB_OBJ)
 
-TALLOCTORT_OBJ = @tallocdir@/testsuite.o @tallocdir@/testsuite_main.o \
+TALLOCTORT_OBJ = ../lib/talloc/testsuite.o ../lib/talloc/testsuite_main.o \
 		$(PARAM_OBJ) $(LIB_NONSMBD_OBJ) $(LIBSAMBA_OBJ)
 
 REPLACETORT_OBJ = @libreplacedir@/test/testsuite.o \
@@ -1281,6 +1282,7 @@
 
 .SUFFIXES:
 .SUFFIXES: .c .o .lo
+.SUFFIXES: .h .h.gch
 
 .PHONY: showflags SHOWFLAGS
 
@@ -1342,6 +1344,9 @@
 		$(COMPILE_CC) >/dev/null 2>&1
 @BROKEN_CC@	-mv `echo $@ | sed 's%^.*/%%g'` $@
 
+.h.h.gch:
+	@echo Compiling $*.h
+
 PRECOMPILED_HEADER = $(builddir)/include/includes.h.gch
 
 # this adds support for precompiled headers. To use it, install a snapshot


More information about the samba-technical mailing list