mirror of
https://git.openldap.org/openldap/openldap.git
synced 2025-02-05 13:40:08 +08:00
Don't specify LDFLAGS when using LTLINK to avoid duplicate
specfication of flags.
This commit is contained in:
parent
74b048a5a4
commit
003a293e2b
@ -17,4 +17,4 @@ PROGRAMS = testavl
|
|||||||
XLIBS = -lavl
|
XLIBS = -lavl
|
||||||
|
|
||||||
testavl: $(LIBRARY) testavl.o
|
testavl: $(LIBRARY) testavl.o
|
||||||
$(LTLINK) $(LDFLAGS) -o $@ testavl.o $(LIBS)
|
$(LTLINK) -o $@ testavl.o $(LIBS)
|
||||||
|
@ -37,11 +37,11 @@ EXTRA_LIBS =
|
|||||||
CPPFLAGS = $(@PLAT@_@LIB_LINKAGE@_TEST_DEFS)
|
CPPFLAGS = $(@PLAT@_@LIB_LINKAGE@_TEST_DEFS)
|
||||||
|
|
||||||
dtest: $(LIBRARY) dtest.o
|
dtest: $(LIBRARY) dtest.o
|
||||||
$(LTLINK) $(LDFLAGS) -o $@ dtest.o $(LIBS)
|
$(LTLINK) -o $@ dtest.o $(LIBS)
|
||||||
etest: $(LIBRARY) etest.o
|
etest: $(LIBRARY) etest.o
|
||||||
$(LTLINK) $(LDFLAGS) -o $@ etest.o $(LIBS)
|
$(LTLINK) -o $@ etest.o $(LIBS)
|
||||||
idtest: $(LIBRARY) idtest.o
|
idtest: $(LIBRARY) idtest.o
|
||||||
$(LTLINK) $(LDFLAGS) -o $@ idtest.o $(LIBS)
|
$(LTLINK) -o $@ idtest.o $(LIBS)
|
||||||
|
|
||||||
install-local: FORCE
|
install-local: FORCE
|
||||||
-$(MKDIR) $(DESTDIR)$(libdir)
|
-$(MKDIR) $(DESTDIR)$(libdir)
|
||||||
|
@ -55,11 +55,11 @@ EXTRA_LIBS = $(@PLAT@_@LIB_LINKAGE@_LIB_LIBS) $(@PLAT@_XXLIBS)
|
|||||||
CPPFLAGS = $(@PLAT@_@LIB_LINKAGE@_TEST_DEFS)
|
CPPFLAGS = $(@PLAT@_@LIB_LINKAGE@_TEST_DEFS)
|
||||||
|
|
||||||
apitest: $(LIBRARY) apitest.o $(LDAP_LIBLBER_DEPEND)
|
apitest: $(LIBRARY) apitest.o $(LDAP_LIBLBER_DEPEND)
|
||||||
$(LTLINK) $(LDFLAGS) -o $@ apitest.o $(LIBS)
|
$(LTLINK) -o $@ apitest.o $(LIBS)
|
||||||
ltest: $(LIBRARY) test.o $(LDAP_LIBLBER_DEPEND)
|
ltest: $(LIBRARY) test.o $(LDAP_LIBLBER_DEPEND)
|
||||||
$(LTLINK) $(LDFLAGS) -o $@ test.o $(LIBS)
|
$(LTLINK) -o $@ test.o $(LIBS)
|
||||||
ttest: $(LIBRARY) tmpltest.o $(LDAP_LIBLBER_DEPEND)
|
ttest: $(LIBRARY) tmpltest.o $(LDAP_LIBLBER_DEPEND)
|
||||||
$(LTLINK) $(LDFLAGS) -o $@ tmpltest.o $(LIBS)
|
$(LTLINK) -o $@ tmpltest.o $(LIBS)
|
||||||
|
|
||||||
CFFILES=ldap.conf ldapfilter.conf ldaptemplates.conf ldapsearchprefs.conf
|
CFFILES=ldap.conf ldapfilter.conf ldaptemplates.conf ldapsearchprefs.conf
|
||||||
|
|
||||||
|
@ -78,11 +78,11 @@ clean-local: FORCE
|
|||||||
depend-common: .links
|
depend-common: .links
|
||||||
|
|
||||||
apitest: $(LIBRARY) apitest.o $(LDAP_LIBLBER_DEPEND)
|
apitest: $(LIBRARY) apitest.o $(LDAP_LIBLBER_DEPEND)
|
||||||
$(LTLINK) $(LDFLAGS) -o $@ apitest.o $(LIBS)
|
$(LTLINK) -o $@ apitest.o $(LIBS)
|
||||||
ltest: $(LIBRARY) test.o $(LDAP_LIBLBER_DEPEND)
|
ltest: $(LIBRARY) test.o $(LDAP_LIBLBER_DEPEND)
|
||||||
$(LTLINK) $(LDFLAGS) -o $@ test.o $(LIBS)
|
$(LTLINK) -o $@ test.o $(LIBS)
|
||||||
ttest: $(LIBRARY) tmpltest.o $(LDAP_LIBLBER_DEPEND)
|
ttest: $(LIBRARY) tmpltest.o $(LDAP_LIBLBER_DEPEND)
|
||||||
$(LTLINK) $(LDFLAGS) -o $@ tmpltest.o $(LIBS)
|
$(LTLINK) -o $@ tmpltest.o $(LIBS)
|
||||||
|
|
||||||
install-local: $(CFFILES) FORCE
|
install-local: $(CFFILES) FORCE
|
||||||
-$(MKDIR) $(DESTDIR)$(libdir)
|
-$(MKDIR) $(DESTDIR)$(libdir)
|
||||||
|
@ -6,7 +6,6 @@
|
|||||||
##
|
##
|
||||||
|
|
||||||
LIBRARY = libldbm.a
|
LIBRARY = libldbm.a
|
||||||
XPROGRAMS = testldbm
|
|
||||||
SRCS = ldbm.c
|
SRCS = ldbm.c
|
||||||
OBJS = ldbm.o
|
OBJS = ldbm.o
|
||||||
|
|
||||||
@ -19,6 +18,3 @@ CPPFLAGS = $(@PLAT@_@LIB_LINKAGE@_LIB_DEFS)
|
|||||||
XLIBS = -lldbm -lavl
|
XLIBS = -lldbm -lavl
|
||||||
XXLIBS = $(LDBM_LIBS)
|
XXLIBS = $(LDBM_LIBS)
|
||||||
|
|
||||||
testldbm: libldbm.a testldbm.o
|
|
||||||
$(CC) $(LDFLAGS) -o $@ testldbm.o $(LIBS)
|
|
||||||
|
|
||||||
|
@ -20,7 +20,7 @@ LDAP_INCDIR= ../../include
|
|||||||
LDAP_LIBDIR= ../../libraries
|
LDAP_LIBDIR= ../../libraries
|
||||||
|
|
||||||
ucgendat: $(LIBRARY) ucgendat.o
|
ucgendat: $(LIBRARY) ucgendat.o
|
||||||
$(LTLINK) $(LDFLAGS) -o $@ ucgendat.o $(LIBS)
|
$(LTLINK) -o $@ ucgendat.o $(LIBS)
|
||||||
./ucgendat $(srcdir)/UnicodeData.txt
|
./ucgendat $(srcdir)/UnicodeData.txt
|
||||||
|
|
||||||
DATFILES = case.dat cmbcl.dat ctype.dat decomp.dat num.dat
|
DATFILES = case.dat cmbcl.dat ctype.dat decomp.dat num.dat
|
||||||
|
Loading…
Reference in New Issue
Block a user