diff options
| author | Ezra Peisach <epeisach@mit.edu> | 1998-03-02 21:25:32 +0000 |
|---|---|---|
| committer | Ezra Peisach <epeisach@mit.edu> | 1998-03-02 21:25:32 +0000 |
| commit | 068ee28ca1f44ee70665ad501fe3e089f640fa47 (patch) | |
| tree | 57d665c1ef800330e3b87fe731394c781914153b /src/util | |
| parent | 2957a895189b053a41ccc9821ec6d1ba4266f562 (diff) | |
| download | krb5-068ee28ca1f44ee70665ad501fe3e089f640fa47.tar.gz krb5-068ee28ca1f44ee70665ad501fe3e089f640fa47.tar.xz krb5-068ee28ca1f44ee70665ad501fe3e089f640fa47.zip | |
* Makefile.in: Integrate in the krb5 build tree rules.
(use CC_LINK, etc).
* configure.in: Add AC_BUILD_PROGRAM for test programs.
These changes allow --enable-profiled combined with --disable-static
to function in the build tree.
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@10492 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/util')
| -rw-r--r-- | src/util/profile/ChangeLog | 7 | ||||
| -rw-r--r-- | src/util/profile/Makefile.in | 13 | ||||
| -rw-r--r-- | src/util/profile/configure.in | 1 |
3 files changed, 16 insertions, 5 deletions
diff --git a/src/util/profile/ChangeLog b/src/util/profile/ChangeLog index 17fc6f0a7..c8bc9ce81 100644 --- a/src/util/profile/ChangeLog +++ b/src/util/profile/ChangeLog @@ -1,3 +1,10 @@ +Mon Mar 2 16:19:58 1998 Ezra Peisach <epeisach@mit.edu> + + * Makefile.in: Integrate in the krb5 build tree rules. + (use CC_LINK, etc). + + * configure.in: Add AC_BUILD_PROGRAM for test programs. + Wed Feb 18 16:33:38 1998 Tom Yu <tlyu@mit.edu> * Makefile.in: Remove trailing slash from thisconfigdir. Fix up diff --git a/src/util/profile/Makefile.in b/src/util/profile/Makefile.in index 5b3428e50..6dd0377c8 100644 --- a/src/util/profile/Makefile.in +++ b/src/util/profile/Makefile.in @@ -1,5 +1,7 @@ thisconfigdir=. BUILDTOP=$(REL)$(U)$(S)$(U) +PROG_LIBPATH=-L$(TOPLIBD) +PROG_RPATH=$(KRB5_LIBDIR) ##DOS##BUILDTOP = ..\.. ##DOS##OBJFILE=profile.lst ##DOS##LIBNAME=profile.lib @@ -28,7 +30,8 @@ SRCS = $(srcdir)/prof_tree.c \ prof_err.c \ $(srcdir)/prof_init.c -LIBS = ../et/libcom_err.$(LIBEXT) +DEPLIBS = $(COM_ERR_DEPLIB) +MLIBS = -lcom_err $(GEN_LIB) LIB=profile LIBMAJOR=1 @@ -59,11 +62,11 @@ awk-windows: if exist prof_err.h copy profile.hin+prof_err.h profile.h if exist profile.h copy profile.h $(BUILDTOP)\include\profile.h -test_parse: test_parse.$(OBJEXT) $(OBJS) $(LIBS) - $(CC) -o test_parse test_parse.$(OBJEXT) $(OBJS) $(LIBS) +test_parse: test_parse.$(OBJEXT) $(OBJS) $(DEPLIBS) + $(CC_LINK) -o test_parse test_parse.$(OBJEXT) $(OBJS) $(MLIBS) -test_profile: test_profile.$(OBJEXT) $(OBJS) $(LIBS) - $(CC) -o test_profile test_profile.$(OBJEXT) $(OBJS) $(LIBS) +test_profile: test_profile.$(OBJEXT) $(OBJS) $(DEPLIBS) + $(CC_LINK) -o test_profile test_profile.$(OBJEXT) $(OBJS) $(MLIBS) test_parse.exe: $(CC) $(CFLAGS2) -o test_parse.exe test_parse.c \ diff --git a/src/util/profile/configure.in b/src/util/profile/configure.in index b9245edce..7441f615c 100644 --- a/src/util/profile/configure.in +++ b/src/util/profile/configure.in @@ -8,5 +8,6 @@ AC_CHECK_HEADERS(unistd.h stdlib.h) AC_HAVE_FUNCS(stat) AC_PROG_AWK KRB5_BUILD_LIBOBJS +KRB5_BUILD_PROGRAM KRB5_BUILD_LIBRARY V5_AC_OUTPUT_MAKEFILE |