diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2008-12-23 22:12:23 +0100 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2008-12-23 22:12:23 +0100 |
| commit | 5c75b65ca15f7c71babd835a45b252fed6534acf (patch) | |
| tree | 6b8baa3f5d27c4eafd89fece7deedae30a6ff1fd /lib/talloc | |
| parent | 86cee0b28c50dd849fe919bbe3faa4deba5275bf (diff) | |
| parent | ff26cb4b1c1d0292231e1cfc0490f4be6040d3e3 (diff) | |
| download | samba-5c75b65ca15f7c71babd835a45b252fed6534acf.tar.gz samba-5c75b65ca15f7c71babd835a45b252fed6534acf.tar.bz2 samba-5c75b65ca15f7c71babd835a45b252fed6534acf.zip | |
Merge branch 'master' of ssh://git.samba.org/data/git/samba
Diffstat (limited to 'lib/talloc')
| -rw-r--r-- | lib/talloc/talloc.mk | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/lib/talloc/talloc.mk b/lib/talloc/talloc.mk index 7f0afed560..ce7784c8a2 100644 --- 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 |