Link programs with $(LINK), not $(CC).
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@5000 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
@@ -9,6 +9,7 @@ XINCS = @X_CFLAGS@
|
||||
XLIBS = @X_LIBS@ @LIB_XauReadAuth@ @X_PRE_LIBS@ @X_EXTRA_LIBS@
|
||||
|
||||
CC = @CC@
|
||||
LINK = @LINK@
|
||||
AR = ar
|
||||
DEFS = @DEFS@
|
||||
CFLAGS = @CFLAGS@
|
||||
@@ -99,10 +100,10 @@ encdata.c:
|
||||
$(LN_S) $(srcdir)/../kauth/encdata.c .
|
||||
|
||||
kx$(EXECSUFFIX): $(OBJECTS_KX)
|
||||
$(CC) $(LD_FLAGS) $(LDFLAGS) -o $@ $(OBJECTS_KX) $(KLIB) $(LIBROKEN) $(LIBS) $(LIBROKEN)
|
||||
$(LINK) $(LD_FLAGS) $(LDFLAGS) -o $@ $(OBJECTS_KX) $(KLIB) $(LIBROKEN) $(LIBS) $(LIBROKEN)
|
||||
|
||||
kxd$(EXECSUFFIX): $(OBJECTS_KXD)
|
||||
$(CC) $(LD_FLAGS) $(LDFLAGS) -o $@ $(OBJECTS_KXD) $(KLIB) $(LIBROKEN) $(LIBS) $(LIBROKEN)
|
||||
$(LINK) $(LD_FLAGS) $(LDFLAGS) -o $@ $(OBJECTS_KXD) $(KLIB) $(LIBROKEN) $(LIBS) $(LIBROKEN)
|
||||
|
||||
rxterm: rxterm.in
|
||||
sed -e "s!%bindir%!$(bindir)!" $(srcdir)/rxterm.in > $@
|
||||
|
@@ -7,6 +7,7 @@ top_srcdir = @top_srcdir@
|
||||
VPATH = @srcdir@
|
||||
|
||||
CC = @CC@
|
||||
LINK = @LINK@
|
||||
RANLIB = @RANLIB@
|
||||
DEFS = @DEFS@
|
||||
CFLAGS = @CFLAGS@
|
||||
@@ -80,10 +81,10 @@ OLIB=-L../../lib/otp -lotp -L../../lib/des -ldes
|
||||
LIBROKEN=-L../../lib/roken -lroken
|
||||
|
||||
otp$(EXECSUFFIX): $(OBJECTS_OTP)
|
||||
$(CC) $(LD_FLAGS) $(LDFLAGS) -o $@ $(OBJECTS_OTP) $(OLIB) $(LIBROKEN) $(LIB_DBM) $(LIBS) $(LIBROKEN)
|
||||
$(LINK) $(LD_FLAGS) $(LDFLAGS) -o $@ $(OBJECTS_OTP) $(OLIB) $(LIBROKEN) $(LIB_DBM) $(LIBS) $(LIBROKEN)
|
||||
|
||||
otpprint$(EXECSUFFIX): $(OBJECTS_OTPPRINT)
|
||||
$(CC) $(LD_FLAGS) $(LDFLAGS) -o $@ $(OBJECTS_OTPPRINT) $(OLIB) $(LIBROKEN) $(LIB_DBM) $(LIBS) $(LIBROKEN)
|
||||
$(LINK) $(LD_FLAGS) $(LDFLAGS) -o $@ $(OBJECTS_OTPPRINT) $(OLIB) $(LIBROKEN) $(LIB_DBM) $(LIBS) $(LIBROKEN)
|
||||
|
||||
$(OBJECTS): ../../include/config.h
|
||||
|
||||
|
@@ -8,6 +8,7 @@ VPATH = @srcdir@
|
||||
top_builddir = ../..
|
||||
|
||||
CC = @CC@
|
||||
LINK = @LINK@
|
||||
AR = ar
|
||||
RANLIB = @RANLIB@
|
||||
DEFS = @DEFS@
|
||||
@@ -102,10 +103,10 @@ LIBROKEN=-L../../lib/roken -lroken
|
||||
OTPLIB=@LIB_otp@
|
||||
|
||||
popper$(EXECSUFFIX): $(POPPER_OBJECTS)
|
||||
$(CC) $(LD_FLAGS) $(LDFLAGS) -o $@ $(POPPER_OBJECTS) $(OTPLIB) $(KLIB) $(LIBROKEN) $(LIB_DBM) $(LIBS) $(LIBROKEN)
|
||||
$(LINK $(LD_FLAGS) $(LDFLAGS) -o $@ $(POPPER_OBJECTS) $(OTPLIB) $(KLIB) $(LIBROKEN) $(LIB_DBM) $(LIBS) $(LIBROKEN)
|
||||
|
||||
pop_debug$(EXECSUFFIX): $(POP_DEBUG_OBJECTS)
|
||||
$(CC) $(LD_FLAGS) $(LDFLAGS) -o $@ $(POP_DEBUG_OBJECTS) $(KLIB) $(LIBROKEN) $(LIBS) $(LIBROKEN)
|
||||
$(LINK) $(LD_FLAGS) $(LDFLAGS) -o $@ $(POP_DEBUG_OBJECTS) $(KLIB) $(LIBROKEN) $(LIBS) $(LIBROKEN)
|
||||
|
||||
$(OBJECTS): ../../include/config.h
|
||||
|
||||
|
@@ -7,6 +7,7 @@ top_srcdir = @top_srcdir@
|
||||
VPATH = @srcdir@
|
||||
|
||||
CC = @CC@
|
||||
LINK = @LINK@
|
||||
RANLIB = @RANLIB@
|
||||
DEFS = @DEFS@
|
||||
CFLAGS = @CFLAGS@
|
||||
@@ -73,7 +74,7 @@ KLIB=-L../../lib/krb -lkrb -L../../lib/des -ldes
|
||||
LIBROKEN=-L../../lib/roken -lroken
|
||||
|
||||
push$(EXECSUFFIX): $(push_OBJECTS)
|
||||
$(CC) $(LD_FLAGS) $(LDFLAGS) -o $@ $(push_OBJECTS) $(KLIB) $(LIBROKEN) $(LIBS) $(LIBROKEN)
|
||||
$(LINK) $(LD_FLAGS) $(LDFLAGS) -o $@ $(push_OBJECTS) $(KLIB) $(LIBROKEN) $(LIBS) $(LIBROKEN)
|
||||
|
||||
$(OBJECTS): ../../include/config.h
|
||||
|
||||
|
@@ -9,6 +9,7 @@ SHELL = /bin/sh
|
||||
@SET_MAKE@
|
||||
|
||||
CC = @CC@
|
||||
LINK = @LINK@
|
||||
RANLIB = @RANLIB@
|
||||
DEFS = @DEFS@
|
||||
CFLAGS = @CFLAGS@
|
||||
|
@@ -7,6 +7,7 @@ VPATH = @srcdir@
|
||||
SHELL = /bin/sh
|
||||
|
||||
CC = @CC@
|
||||
LINK = @LINK@
|
||||
AR = ar
|
||||
RANLIB = @RANLIB@
|
||||
DEFS = @DEFS@
|
||||
|
@@ -7,6 +7,7 @@ VPATH = @srcdir@
|
||||
SHELL = /bin/sh
|
||||
|
||||
CC = @CC@
|
||||
LINK = @LINK@
|
||||
AR = ar
|
||||
RANLIB = @RANLIB@
|
||||
DEFS = @DEFS@
|
||||
@@ -48,7 +49,7 @@ all: $(PROGS)
|
||||
$(CC) -c $(DEFS) -I../../../include -I.. -I$(srcdir)/.. $(CFLAGS) $(CPPFLAGS) $<
|
||||
|
||||
telnet$(EXECSUFFIX): $(OBJECTS)
|
||||
$(CC) $(LD_FLAGS) $(LDFLAGS) -o $@ $(OBJECTS) -L../libtelnet -ltelnet $(KLIB) $(LIBROKEN) $(LIBS) @LIB_tgetent@ $(LIBROKEN)
|
||||
$(LINK) $(LD_FLAGS) $(LDFLAGS) -o $@ $(OBJECTS) -L../libtelnet -ltelnet $(KLIB) $(LIBROKEN) $(LIBS) @LIB_tgetent@ $(LIBROKEN)
|
||||
|
||||
install: all
|
||||
$(MKINSTALLDIRS) $(DESTDIR)$(bindir)
|
||||
|
@@ -9,6 +9,7 @@ top_builddir = ../../..
|
||||
SHELL = /bin/sh
|
||||
|
||||
CC = @CC@
|
||||
LINK = @LINK@
|
||||
AR = ar
|
||||
RANLIB = @RANLIB@
|
||||
DEFS = @DEFS@ -DBINDIR='"$(bindir)"'
|
||||
@@ -51,7 +52,7 @@ all: $(PROGS)
|
||||
$(CC) -c $(DEFS) -I../../../include -I.. -I$(srcdir)/.. -I. -I$(srcdir) $(CFLAGS) $(CPPFLAGS) $<
|
||||
|
||||
telnetd$(EXECSUFFIX): $(OBJECTS)
|
||||
$(CC) $(LD_FLAGS) $(LDFLAGS) -o $@ $(OBJECTS) -L../libtelnet -ltelnet $(KLIB) $(LIBROKEN) $(LIBS) @LIB_tgetent@ $(LIBROKEN)
|
||||
$(LINK) $(LD_FLAGS) $(LDFLAGS) -o $@ $(OBJECTS) -L../libtelnet -ltelnet $(KLIB) $(LIBROKEN) $(LIBS) @LIB_tgetent@ $(LIBROKEN)
|
||||
|
||||
install: all
|
||||
$(MKINSTALLDIRS) $(DESTDIR)$(libexecdir)
|
||||
|
@@ -11,6 +11,7 @@ XINCS = @X_CFLAGS@
|
||||
XLIBS = @X_LIBS@ -lXt @X_PRE_LIBS@ -lX11 @X_EXTRA_LIBS@
|
||||
|
||||
CC = @CC@
|
||||
LINK = @LINK@
|
||||
RANLIB = @RANLIB@
|
||||
DEFS = @DEFS@ -DBINDIR='"$(bindir)"'
|
||||
CFLAGS = $(XINCS) @CFLAGS@
|
||||
@@ -96,7 +97,7 @@ KLIB=-L../../lib/krb -lkrb -L../../lib/des -ldes
|
||||
LIBROKEN=-L../../lib/roken -lroken
|
||||
|
||||
xnlock$(EXECSUFFIX): xnlock.o
|
||||
$(CC) $(LD_FLAGS) $(LDFLAGS) -o $@ xnlock.o @KRB_KAFS_LIB@ $(KLIB) $(LIBROKEN) $(LIBS) $(LIBROKEN)
|
||||
$(LINK) $(LD_FLAGS) $(LDFLAGS) -o $@ xnlock.o @KRB_KAFS_LIB@ $(KLIB) $(LIBROKEN) $(LIBS) $(LIBROKEN)
|
||||
|
||||
$(OBJECTS): ../../include/config.h
|
||||
|
||||
|
Reference in New Issue
Block a user