standalone: Use more variables, preparing to include these files from main

Samba 4 makefile.

diff --git a/lib/talloc/talloc.mk b/lib/talloc/talloc.mk
index 7f0afed560877b294a48e9455e2365a66df45490..ce7784c8a224bed224a73070ccc053a9789ace15 100644 (file)
--- a/lib/talloc/talloc.mk
+++ b/lib/talloc/talloc.mk
@@ -2,20 +2,21 @@ TALLOC_OBJ = $(tallocdir)/talloc.o
 
 TALLOC_SOLIB = libtalloc.$(SHLIBEXT).$(PACKAGE_VERSION)
 TALLOC_SONAME = libtalloc.$(SHLIBEXT).1
+TALLOC_STLIB = libtalloc.a
 
-all:: libtalloc.a $(TALLOC_SOLIB) testsuite
+all:: $(TALLOC_STLIB) $(TALLOC_SOLIB) testsuite
 
 testsuite:: $(LIBOBJ) testsuite.o testsuite_main.o
        $(CC) $(CFLAGS) -o testsuite testsuite.o testsuite_main.o $(LIBOBJ) $(LIBS)
 
-libtalloc.a: $(LIBOBJ)
+$(TALLOC_STLIB): $(LIBOBJ)
        ar -rv $@ $(LIBOBJ)
        @-ranlib $@
 
 install:: all 
        ${INSTALLCMD} -d $(DESTDIR)$(libdir)
        ${INSTALLCMD} -d $(DESTDIR)$(libdir)/pkgconfig
-       ${INSTALLCMD} -m 755 libtalloc.a $(DESTDIR)$(libdir)
+       ${INSTALLCMD} -m 755 $(TALLOC_STLIB) $(DESTDIR)$(libdir)
        ${INSTALLCMD} -m 755 $(TALLOC_SOLIB) $(DESTDIR)$(libdir)
        ${INSTALLCMD} -d $(DESTDIR)${includedir}
        ${INSTALLCMD} -m 644 $(srcdir)/talloc.h $(DESTDIR)$(includedir)
@@ -28,7 +29,7 @@ install:: all
 doc:: talloc.3 talloc.3.html
 
 clean::
-       rm -f *~ $(LIBOBJ) $(TALLOC_SOLIB) libtalloc.a testsuite testsuite.o testsuite_main.o *.gc?? talloc.3 talloc.3.html
+       rm -f *~ $(LIBOBJ) $(TALLOC_SOLIB) $(TALLOC_STLIB) testsuite testsuite.o testsuite_main.o *.gc?? talloc.3 talloc.3.html
 
 test:: testsuite
        ./testsuite

diff --git a/lib/tdb/tdb.mk b/lib/tdb/tdb.mk
index 72f44e7211ec6a509b2ff2c753257d216a085651..b786bdbf54006a899b4cc28a35f4320584e548a1 100644 (file)
--- a/lib/tdb/tdb.mk
+++ b/lib/tdb/tdb.mk
@@ -7,8 +7,9 @@ ALL_PROGS = $(PROGS) $(PROGS_NOINSTALL)
 
 TDB_SONAME = libtdb.$(SHLIBEXT).1
 TDB_SOLIB = libtdb.$(SHLIBEXT).$(PACKAGE_VERSION)
+TDB_STLIB = libtdb.a
 
-TDB_LIB = libtdb.a
+TDB_LIB = $(TDB_STLIB) 
 
 bin/tdbtest$(EXEEXT): tools/tdbtest.o $(TDB_LIB)
        $(CC) $(CFLAGS) $(LDFLAGS) -o bin/tdbtest tools/tdbtest.o -L. -ltdb -lgdbm
@@ -30,7 +31,7 @@ test:: bin/tdbtorture$(EXEEXT) $(TDB_SONAME)
 
 clean:: 
        rm -f test.db test.tdb torture.tdb test.gdbm
-       rm -f $(TDB_SONAME) $(TDB_SOLIB) libtdb.a libtdb.$(SHLIBEXT)
+       rm -f $(TDB_SONAME) $(TDB_SOLIB) $(TDB_STLIB) libtdb.$(SHLIBEXT)
        rm -f $(ALL_PROGS) tdb.pc
 
 build-python:: tdb.$(SHLIBEXT) 
@@ -68,10 +69,10 @@ installheaders:: installdirs
 
 installlibs:: all installdirs
        cp tdb.pc $(DESTDIR)$(libdir)/pkgconfig
-       cp libtdb.a $(TDB_SOLIB) $(DESTDIR)$(libdir)
+       cp $(TDB_STLIB) $(TDB_SOLIB) $(DESTDIR)$(libdir)
 
-libtdb.a: $(TDB_OBJ)
-       ar -rv libtdb.a $(TDB_OBJ)
+$(TDB_STLIB): $(TDB_OBJ)
+       ar -rv $(TDB_STLIB) $(TDB_OBJ)
 
 libtdb.$(SHLIBEXT): $(TDB_SOLIB)
        ln -fs $< $@

diff --git a/lib/tevent/tevent.mk b/lib/tevent/tevent.mk
index 8b4c6ed27ec0fee855acceff5ac4f033a784829d..2e4d5a96af7915846e05fa143432c13431803fc2 100644 (file)
--- a/lib/tevent/tevent.mk
+++ b/lib/tevent/tevent.mk
@@ -1,8 +1,9 @@
 TEVENT_SONAME = libtevent.$(SHLIBEXT).0
 TEVENT_SOLIB = libtevent.$(SHLIBEXT).$(PACKAGE_VERSION)
+TEVENT_STLIB = libtevent.a
 
-libtevent.a: $(TEVENT_OBJ)
-       ar -rv libtevent.a $(TEVENT_OBJ)
+$(TEVENT_STLIB): $(TEVENT_OBJ)
+       ar -rv $(TEVENT_STLIB) $(TEVENT_OBJ)
 
 libtevent.$(SHLIBEXT): $(TEVENT_SOLIB)
        ln -fs $< $@
@@ -23,14 +24,14 @@ installheaders:: installdirs
 
 installlibs:: installdirs
        cp tevent.pc $(DESTDIR)$(libdir)/pkgconfig
-       cp libtevent.a $(TEVENT_SOLIB) $(DESTDIR)$(libdir)
+       cp $(TEVENT_STLIB) $(TEVENT_SOLIB) $(DESTDIR)$(libdir)
 
 install:: all installdirs installheaders installlibs $(PYTHON_INSTALL_TARGET)
 
 clean::
-       rm -f $(TEVENT_SONAME) $(TEVENT_SOLIB) libtevent.a libtevent.$(SHLIBEXT)
+       rm -f $(TEVENT_SONAME) $(TEVENT_SOLIB) $(TEVENT_STLIB) libtevent.$(SHLIBEXT)
        rm -f tevent.pc
-       rm -f _libtevent.$(SHLIBEXT)
+       rm -f tevent.$(SHLIBEXT)
 
 #python stuff