Merge branch 'master' of ssh://git.samba.org/data/git/samba into regsrv

Conflicts:
	source4/lib/registry/ldb.c
	source4/rpc_server/winreg/rpc_winreg.c

1 files changed, 0 insertions, 63 deletions

diff --git a/source4/lib/replace/Makefile.in b/source4/lib/replace/Makefile.in
deleted file mode 100644
index c989835a8d..0000000000
--- a/source4/lib/replace/Makefile.in
+++ /dev/null
@@ -1,63 +0,0 @@
-#!gmake
-#
-CC = @CC@
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-bindir = @bindir@
-includedir = @includedir@
-libdir = @libdir@
-VPATH = @libreplacedir@
-srcdir = @srcdir@
-builddir = @builddir@
-INSTALL = @INSTALL@
-LIBS = @LIBS@
-
-.PHONY: test all showflags install installcheck clean distclean realdistclean
-
-CFLAGS=-I. @CFLAGS@
-LDFLAGS=@LDFLAGS@
-
-OBJS = @LIBREPLACEOBJ@
-
-all: showflags libreplace.a testsuite
-
-showflags:
-	@echo 'libreplace will be compiled with flags:'
-	@echo '  CC     = $(CC)'
-	@echo '  CFLAGS = $(CFLAGS)'
-	@echo '  LDFLAGS= $(LDFLAGS)'
-	@echo '  LIBS   = $(LIBS)'
-
-install: all
-	mkdir -p $(libdir)
-	$(INSTALL) libreplace.a $(libdir)
-
-libreplace.a: $(OBJS)
-	ar -rcsv $@ $(OBJS)
-
-test: all
-	./testsuite
-
-installcheck: install test
-
-TEST_OBJS = test/testsuite.o test/os2_delete.o test/strptime.o test/getifaddrs.o
-
-testsuite: libreplace.a $(TEST_OBJS)
-	$(CC) -o testsuite $(TEST_OBJS) -L. -lreplace $(LDFLAGS) $(LIBS)
-
-.c.o:
-	@echo Compiling $*.c
-	@mkdir -p `dirname $@`
-	@$(CC) $(CFLAGS) -c $< -o $@
-
-clean:
-	rm -f *.o test/*.o *.a testsuite
-	rm -f testfile.dat
-
-distclean: clean
-	rm -f *~ */*~
-	rm -f config.log config.status config.h config.cache
-	rm -f Makefile
-
-realdistclean: distclean
-	rm -f configure config.h.in