diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2008-06-30 18:06:02 +1000 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2008-06-30 18:06:02 +1000 |
| commit | 8da3c72e5841ff6416d64a9375fda7305f12ef58 (patch) | |
| tree | 8025b5a765ac657c90682513bf4115eb9f5b21cf /source4/lib/talloc/config.mk | |
| parent | f78c5e2c72be912f2f05a07f98a8e1e3619539c7 (diff) | |
| parent | 69964a24d735dd59c1b95b9c5bb93b4c06b4cfea (diff) | |
| download | samba-8da3c72e5841ff6416d64a9375fda7305f12ef58.tar.gz samba-8da3c72e5841ff6416d64a9375fda7305f12ef58.tar.bz2 samba-8da3c72e5841ff6416d64a9375fda7305f12ef58.zip | |
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-local
(This used to be commit 757acb6802cfb0e98e91e6062c62b6c5a852302b)
Diffstat (limited to 'source4/lib/talloc/config.mk')
| -rw-r--r-- | source4/lib/talloc/config.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source4/lib/talloc/config.mk b/source4/lib/talloc/config.mk index 84848ae77a..c13e1b79ab 100644 --- a/source4/lib/talloc/config.mk +++ b/source4/lib/talloc/config.mk @@ -1,5 +1,5 @@ [LIBRARY::LIBTALLOC] -OUTPUT_TYPE = STATIC_LIBRARY +OUTPUT_TYPE = MERGED_OBJ CFLAGS = -Ilib/talloc LIBTALLOC_OBJ_FILES = lib/talloc/talloc.o |