6 files changed, 18 insertions, 22 deletions
diff --git a/source4/lib/talloc/Makefile.in b/source4/lib/talloc/Makefile.in
index f5d1cd109c..07b8fd4ff0 100644
--- a/source4/lib/talloc/Makefile.in
+++ b/source4/lib/talloc/Makefile.in
@@ -28,8 +28,8 @@ all:: showflags $(EXTRA_TARGETS)
 include $(tallocdir)/rules.mk
 include $(tallocdir)/talloc.mk
 
-$(SOLIB): $(LIBOBJ)
-	$(SHLD) $(SHLD_FLAGS) -o $@ $(LIBOBJ) @SONAMEFLAG@$(SONAME)
+$(TALLOC_SOLIB): $(LIBOBJ)
+	$(SHLD) $(SHLD_FLAGS) -o $@ $(LIBOBJ) @SONAMEFLAG@$(TALLOC_SONAME)
 
 check: test
 
diff --git a/source4/lib/talloc/config.mk b/source4/lib/talloc/config.mk
index 540a05d100..af1b590c98 100644
--- a/source4/lib/talloc/config.mk
+++ b/source4/lib/talloc/config.mk
@@ -1,8 +1,6 @@
 [LIBRARY::LIBTALLOC]
-VERSION = 1.2.0
-SO_VERSION = 1
+OUTPUT_TYPE = STATIC_LIBRARY
 OBJ_FILES = talloc.o
-PC_FILE = talloc.pc
 MANPAGE = talloc.3
 CFLAGS = -Ilib/talloc
 PUBLIC_HEADERS = talloc.h
diff --git a/source4/lib/talloc/talloc.mk b/source4/lib/talloc/talloc.mk
index 590adc74f2..d7a0e0d83e 100644
--- a/source4/lib/talloc/talloc.mk
+++ b/source4/lib/talloc/talloc.mk
@@ -1,9 +1,9 @@
 TALLOC_OBJ = $(tallocdir)/talloc.o 
 
-SOLIB = libtalloc.$(SHLIBEXT).$(PACKAGE_VERSION)
-SONAME = libtalloc.$(SHLIBEXT).1
+TALLOC_SOLIB = libtalloc.$(SHLIBEXT).$(PACKAGE_VERSION)
+TALLOC_SONAME = libtalloc.$(SHLIBEXT).1
 
-all:: libtalloc.a $(SOLIB) testsuite
+all:: libtalloc.a $(TALLOC_SOLIB) testsuite
 
 testsuite:: $(LIBOBJ) testsuite.o
 	$(CC) $(CFLAGS) -o testsuite testsuite.o $(LIBOBJ) $(LIBS)
@@ -28,7 +28,7 @@ install:: all
 doc:: talloc.3 talloc.3.html
 
 clean::
-	rm -f *~ $(LIBOBJ) $(SOLIB) libtalloc.a testsuite testsuite.o *.gc?? talloc.3 talloc.3.html
+	rm -f *~ $(LIBOBJ) $(TALLOC_SOLIB) libtalloc.a testsuite testsuite.o *.gc?? talloc.3 talloc.3.html
 
 test:: testsuite
 	./testsuite
diff --git a/source4/lib/tdb/Makefile.in b/source4/lib/tdb/Makefile.in
index 4a95fdb380..090bb6e2dc 100644
--- a/source4/lib/tdb/Makefile.in
+++ b/source4/lib/tdb/Makefile.in
@@ -37,11 +37,11 @@ default: all
 include $(tdbdir)/tdb.mk
 include $(tdbdir)/rules.mk
 
-all:: showflags dirs $(PROGS) $(SOLIB) libtdb.a $(PYTHON_BUILD_TARGET)
+all:: showflags dirs $(PROGS) $(TDB_SOLIB) libtdb.a $(PYTHON_BUILD_TARGET)
 
 install:: all
-$(SOLIB): $(TDB_OBJ)
-	$(SHLD) $(SHLD_FLAGS) -o $@ $(TDB_OBJ) @SONAMEFLAG@$(SONAME)
+$(TDB_SOLIB): $(TDB_OBJ)
+	$(SHLD) $(SHLD_FLAGS) -o $@ $(TDB_OBJ) @SONAMEFLAG@$(TDB_SONAME)
 
 check: test
 
diff --git a/source4/lib/tdb/config.mk b/source4/lib/tdb/config.mk
index 820c55e363..89d6af9043 100644
--- a/source4/lib/tdb/config.mk
+++ b/source4/lib/tdb/config.mk
@@ -1,9 +1,7 @@
 ################################################
 # Start SUBSYSTEM LIBTDB
 [LIBRARY::LIBTDB]
-VERSION = 0.0.1
-SO_VERSION = 0
-PC_FILE = tdb.pc
+OUTPUT_TYPE = STATIC_LIBRARY
 OBJ_FILES = \
 	common/tdb.o common/dump.o common/io.o common/lock.o \
 	common/open.o common/traverse.o common/freelist.o \
diff --git a/source4/lib/tdb/tdb.mk b/source4/lib/tdb/tdb.mk
index d0f9815c13..0e53927366 100644
--- a/source4/lib/tdb/tdb.mk
+++ b/source4/lib/tdb/tdb.mk
@@ -5,8 +5,8 @@ PROGS = bin/tdbtool$(EXEEXT) bin/tdbdump$(EXEEXT) bin/tdbbackup$(EXEEXT)
 PROGS_NOINSTALL = bin/tdbtest$(EXEEXT) bin/tdbtorture$(EXEEXT)
 ALL_PROGS = $(PROGS) $(PROGS_NOINSTALL)
 
-SONAME = libtdb.$(SHLIBEXT).1
-SOLIB = libtdb.$(SHLIBEXT).$(PACKAGE_VERSION)
+TDB_SONAME = libtdb.$(SHLIBEXT).1
+TDB_SOLIB = libtdb.$(SHLIBEXT).$(PACKAGE_VERSION)
 
 TDB_LIB = libtdb.a
 
@@ -25,12 +25,12 @@ bin/tdbdump$(EXEEXT): tools/tdbdump.o $(TDB_LIB)
 bin/tdbbackup$(EXEEXT): tools/tdbbackup.o $(TDB_LIB)
 	$(CC) $(CFLAGS) $(LDFLAGS) -o bin/tdbbackup tools/tdbbackup.o -L. -ltdb
 
-test:: bin/tdbtorture$(EXEEXT) $(SONAME)
+test:: bin/tdbtorture$(EXEEXT) $(TDB_SONAME)
 	$(LIB_PATH_VAR)=. bin/tdbtorture$(EXEEXT)
 
 clean:: 
 	rm -f test.db test.tdb torture.tdb test.gdbm
-	rm -f $(SONAME) $(SOLIB) libtdb.a libtdb.$(SHLIBEXT)
+	rm -f $(TDB_SONAME) $(TDB_SOLIB) libtdb.a libtdb.$(SHLIBEXT)
 	rm -f $(ALL_PROGS) tdb.pc
 
 build-python:: _tdb.$(SHLIBEXT) 
@@ -74,13 +74,13 @@ installheaders:: installdirs
 
 installlibs:: all installdirs
 	cp tdb.pc $(DESTDIR)$(libdir)/pkgconfig
-	cp libtdb.a $(SOLIB) $(DESTDIR)$(libdir)
+	cp libtdb.a $(TDB_SOLIB) $(DESTDIR)$(libdir)
 
 libtdb.a: $(TDB_OBJ)
 	ar -rv libtdb.a $(TDB_OBJ)
 
-libtdb.$(SHLIBEXT): $(SOLIB)
+libtdb.$(SHLIBEXT): $(TDB_SOLIB)
 	ln -fs $< $@
 
-$(SONAME): $(SOLIB)
+$(TDB_SONAME): $(TDB_SOLIB)
 	ln -fs $< $@