oysteikt/heimdal
0
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

Link programs with $(LINK), not $(CC).

Browse Source 
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@5000 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Johan Danielsson
1998-05-31 18:05:21 +00:00
parent 0b691923cc
commit 99c23f7634
19 changed files with 41 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
appl/kx/Makefile.in
View File

@@ -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 > $@

5
appl/otp/Makefile.in
View File

@@ -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

5
appl/popper/Makefile.in
View File

@@ -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

3
appl/push/Makefile.in
View File

@@ -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

1
appl/telnet/Makefile.in
View File

@@ -9,6 +9,7 @@ SHELL = /bin/sh
@SET_MAKE@
CC = @CC@
LINK = @LINK@
RANLIB = @RANLIB@
DEFS = @DEFS@
CFLAGS = @CFLAGS@

1
appl/telnet/libtelnet/Makefile.in
View File

@@ -7,6 +7,7 @@ VPATH = @srcdir@
SHELL = /bin/sh
CC = @CC@
LINK = @LINK@
AR = ar
RANLIB = @RANLIB@
DEFS = @DEFS@

3
appl/telnet/telnet/Makefile.in
View File

@@ -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)

3
appl/telnet/telnetd/Makefile.in
View File

@@ -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)

3
appl/xnlock/Makefile.in
View File

@@ -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

1
lib/auth/afskauthlib/Makefile.in
View File

@@ -8,6 +8,7 @@ srcdir = @srcdir@
VPATH = @srcdir@
CC = @CC@
LINK = @LINK@
AR = ar
LN_S = @LN_S@
RANLIB = @RANLIB@

3
lib/auth/pam/Makefile.in
View File

@@ -8,6 +8,7 @@ srcdir = @srcdir@
VPATH = @srcdir@
CC = @CC@
LINK = @LINK@
AR = ar
RANLIB = @RANLIB@
DEFS = @DEFS@
@@ -82,6 +83,6 @@ $(OBJECTS): ../../../include/config.h
$(LIB): $(OBJECTS)
rm -f $@
$(LDSHARED) -o $@ $(OBJECTS) $(LD_FLAGS) $(LIB_DEPS)
# $(CC) -shared -Wl,-x -o $(LIB) $(OBJECTS) ../../kafs/libkafs.a ../../krb/libkrb.a ../../des/libdes.a
# $(LINK) -shared -Wl,-x -o $(LIB) $(OBJECTS) ../../kafs/libkafs.a ../../krb/libkrb.a ../../des/libdes.a
.PHONY: all Wall install uninstall check clean mostlyclean distclean realclean dist

1
lib/auth/sia/Makefile.in
View File

@@ -8,6 +8,7 @@ srcdir = @srcdir@
VPATH = @srcdir@
CC = @CC@
LINK = @LINK@
AR = ar
RANLIB = @RANLIB@
DEFS = @DEFS@

3
lib/com_err/Makefile.in
View File

@@ -8,6 +8,7 @@ srcdir = @srcdir@
VPATH = @srcdir@
CC = @CC@
LINK = @LINK@
AR = ar
RANLIB = @RANLIB@
LN_S = @LN_S@
@@ -127,7 +128,7 @@ COBJ = compile_et.o parse.o lex.o
$(COBJ): parse.h
compile_et$(EXECSUFFIX): $(COBJ)
$(CC) $(CFLAGS) -o $@ $(COBJ) -L../roken -lroken
$(LINK) $(CFLAGS) -o $@ $(COBJ) -L../roken -lroken
parse.c: parse.h
parse.h: $(srcdir)/parse.y

13
lib/des/Makefile.in
View File

@@ -8,6 +8,7 @@ srcdir = @srcdir@
VPATH = @srcdir@
CC = @CC@
LINK = @LINK@
AR = ar
RANLIB = @RANLIB@
LN_S = @LN_S@
@@ -138,22 +139,22 @@ rpw.o: rpw.c
speed.o: speed.c
mdtest$(EXECSUFFIX): mdtest.o $(LIB)
$(CC) $(LD_FLAGS) $(LDFLAGS) -o $@ mdtest.o -L. -ldes
$(LINK) $(LD_FLAGS) $(LDFLAGS) -o $@ mdtest.o -L. -ldes
des_opts$(EXECSUFFIX): des_opts.o set_key.o
$(CC) $(LD_FLAGS) $(LDFLAGS) -o $@ des_opts.o set_key.o
$(LINK) $(LD_FLAGS) $(LDFLAGS) -o $@ des_opts.o set_key.o
destest$(EXECSUFFIX): destest.o $(LIB)
$(CC) $(LD_FLAGS) $(LDFLAGS) -o $@ destest.o -L. -ldes
$(LINK) $(LD_FLAGS) $(LDFLAGS) -o $@ destest.o -L. -ldes
des$(EXECSUFFIX): des.o $(LIB)
$(CC) $(LD_FLAGS) $(LDFLAGS) -o $@ des.o -L. -ldes
$(LINK) $(LD_FLAGS) $(LDFLAGS) -o $@ des.o -L. -ldes
rpw$(EXECSUFFIX): rpw.o $(LIB)
$(CC) $(LD_FLAGS) $(LDFLAGS) -o $@ rpw.o -L. -ldes
$(LINK) $(LD_FLAGS) $(LDFLAGS) -o $@ rpw.o -L. -ldes
speed$(EXECSUFFIX): speed.o $(LIB)
$(CC) $(LD_FLAGS) $(LDFLAGS) -o $@ speed.o -L. -ldes
$(LINK) $(LD_FLAGS) $(LDFLAGS) -o $@ speed.o -L. -ldes
$(LIBOBJ): ../../include/config.h

1
lib/editline/Makefile.in
View File

@@ -8,6 +8,7 @@ srcdir = @srcdir@
VPATH = @srcdir@
CC = @CC@
LINK = @LINK@
AR = ar
LN_S = @LN_S@
RANLIB = @RANLIB@

1
lib/kafs/Makefile.in
View File

@@ -8,6 +8,7 @@ srcdir = @srcdir@
VPATH = @srcdir@
CC = @CC@
LINK = @LINK@
AR = ar
RANLIB = @RANLIB@
LN_S = @LN_S@

3
lib/otp/Makefile.in
View File

@@ -8,6 +8,7 @@ srcdir = @srcdir@
VPATH = @srcdir@
CC = @CC@
LINK = @LINK@
AR = ar
RANLIB = @RANLIB@
LN_S = @LN_S@
@@ -97,7 +98,7 @@ realclean: distclean
rm -f TAGS $(EXTRA_LIB_SOURCES)
otptest$(EXECSUFFIX): $(OTPTEST_OBJECTS) $(LIB)
$(CC) $(LD_FLAGS) $(LDFLAGS) -o $@ $(OTPTEST_OBJECTS) -L. -lotp -L../des -ldes $(LIBROKEN) $(LIB_DBM) $(LIBS) $(LIBROKEN)
$(LINK) $(LD_FLAGS) $(LDFLAGS) -o $@ $(OTPTEST_OBJECTS) -L. -lotp -L../des -ldes $(LIBROKEN) $(LIB_DBM) $(LIBS) $(LIBROKEN)
$(LIBNAME).a: $(LIB_OBJECTS) $(LIBADD)
rm -f $@

5
lib/roken/Makefile.in
View File

@@ -8,6 +8,7 @@ srcdir = @srcdir@
VPATH = @srcdir@
CC = @CC@
LINK = @LINK@
CPP = @CPP@
AR = ar
RANLIB = @RANLIB@
@@ -175,7 +176,7 @@ roken.h: make-roken$(EXECSUFFIX)
else rm -f roken.h; mv tmp.h roken.h; fi
make-roken$(EXECSUFFIX): make-roken.o
$(CC) $(CFLAGS) -o $@ make-roken.o
$(LINK) $(CFLAGS) -o $@ make-roken.o
make-roken.c: roken.h.in roken.awk
$(AWK) -f $(srcdir)/roken.awk $(srcdir)/roken.h.in > make-roken.c
@@ -186,7 +187,7 @@ print_version.h: make-print-version$(EXESUFFIX)
@./make-print-version$(EXESUFFIX) print_version.h
make-print-version$(EXECSUFFIX): make-print-version.o
$(CC) $(CFLAGS) -o $@ make-print-version.o
$(LINK) $(CFLAGS) -o $@ make-print-version.o
install-roken-h: roken.h
@if [ -f ../../include/roken.h ] && cmp -s ../../include/roken.h roken.h ; \

3
lib/sl/Makefile.in
View File

@@ -10,6 +10,7 @@ VPATH = @srcdir@
top_builddir=../..
CC = @CC@
LINK = @LINK@
AR = ar
RANLIB = @RANLIB@
LN_S = @LN_S@
@@ -113,7 +114,7 @@ $(OBJECTS): ../../include/config.h
$(mk_cmds_OBJECTS): parse.h
mk_cmds$(EXECSUFFIX): $(mk_cmds_OBJECTS)
$(CC) $(CFLAGS) -o $@ $(mk_cmds_OBJECTS) -L../roken -lroken
$(LINK) $(CFLAGS) -o $@ $(mk_cmds_OBJECTS) -L../roken -lroken
parse.c: parse.h
parse.h: $(srcdir)/parse.y