git.samba.org
/
samba.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
08c1c5f
)
s3:build: don't use pieflags twice - ldflags already have them
author
Björn Jacke
<bj@sernet.de>
Sat, 22 May 2010 14:48:16 +0000
(16:48 +0200)
committer
Karolin Seeger
<kseeger@samba.org>
Wed, 16 Jun 2010 06:29:47 +0000
(08:29 +0200)
source3/Makefile.in
patch
|
blob
|
history
diff --git
a/source3/Makefile.in
b/source3/Makefile.in
index f58bb7078a23dbe160ff26c11edb1f746d88438b..0823be74468bd5d4694294fe5eb50ad35521d9e7 100644
(file)
--- a/
source3/Makefile.in
+++ b/
source3/Makefile.in
@@
-1681,12
+1681,12
@@
bin/talloctort@EXEEXT@: $(BINARY_PREREQS) $(TALLOCTORT_OBJ) @BUILD_POPT@ $(LIBTA
bin/replacetort@EXEEXT@: $(REPLACETORT_OBJ) @BUILD_POPT@ $(LIBTALLOC)
@echo Linking $@
bin/replacetort@EXEEXT@: $(REPLACETORT_OBJ) @BUILD_POPT@ $(LIBTALLOC)
@echo Linking $@
- @$(CC)
@PIE_LDFLAGS@
-o $@ $(REPLACETORT_OBJ) $(LDFLAGS) \
+ @$(CC) -o $@ $(REPLACETORT_OBJ) $(LDFLAGS) \
$(DYNEXP) $(LIBS) $(POPT_LIBS) $(LIBTALLOC_LIBS)
bin/smbconftort@EXEEXT@: $(SMBCONFTORT_OBJ) @BUILD_POPT@ $(LIBTALLOC) $(LIBTDB)
@echo Linking $@
$(DYNEXP) $(LIBS) $(POPT_LIBS) $(LIBTALLOC_LIBS)
bin/smbconftort@EXEEXT@: $(SMBCONFTORT_OBJ) @BUILD_POPT@ $(LIBTALLOC) $(LIBTDB)
@echo Linking $@
- @$(CC)
@PIE_LDFLAGS@
-o $@ $(SMBCONFTORT_OBJ) $(LDFLAGS) \
+ @$(CC) -o $@ $(SMBCONFTORT_OBJ) $(LDFLAGS) \
$(DYNEXP) $(LIBS) $(LDAP_LIBS) $(POPT_LIBS) \
$(LIBTALLOC_LIBS) $(LIBTDB_LIBS)
$(DYNEXP) $(LIBS) $(LDAP_LIBS) $(POPT_LIBS) \
$(LIBTALLOC_LIBS) $(LIBTDB_LIBS)