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:
@@ -8,6 +8,7 @@ srcdir = @srcdir@
|
||||
VPATH = @srcdir@
|
||||
|
||||
CC = @CC@
|
||||
LINK = @LINK@
|
||||
AR = ar
|
||||
LN_S = @LN_S@
|
||||
RANLIB = @RANLIB@
|
||||
|
@@ -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
|
||||
|
@@ -8,6 +8,7 @@ srcdir = @srcdir@
|
||||
VPATH = @srcdir@
|
||||
|
||||
CC = @CC@
|
||||
LINK = @LINK@
|
||||
AR = ar
|
||||
RANLIB = @RANLIB@
|
||||
DEFS = @DEFS@
|
||||
|
@@ -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
|
||||
|
@@ -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
|
||||
|
||||
|
@@ -8,6 +8,7 @@ srcdir = @srcdir@
|
||||
VPATH = @srcdir@
|
||||
|
||||
CC = @CC@
|
||||
LINK = @LINK@
|
||||
AR = ar
|
||||
LN_S = @LN_S@
|
||||
RANLIB = @RANLIB@
|
||||
|
@@ -8,6 +8,7 @@ srcdir = @srcdir@
|
||||
VPATH = @srcdir@
|
||||
|
||||
CC = @CC@
|
||||
LINK = @LINK@
|
||||
AR = ar
|
||||
RANLIB = @RANLIB@
|
||||
LN_S = @LN_S@
|
||||
|
@@ -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 $@
|
||||
|
@@ -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 ; \
|
||||
|
@@ -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
|
||||
|
Reference in New Issue
Block a user