]> git.ipfire.org Git - thirdparty/krb5.git/commitdiff
Reduce boilerplate in makefiles
authorGreg Hudson <ghudson@mit.edu>
Thu, 16 May 2013 18:21:12 +0000 (14:21 -0400)
committerGreg Hudson <ghudson@mit.edu>
Fri, 17 May 2013 00:09:27 +0000 (20:09 -0400)
Provide default values in pre.in for PROG_LIBPATH, PROG_RPATH,
SHLIB_DIRS, SHLIB_RDIRS, and STOBJLISTS so that they don't have to be
specified in the common case.  Rename KRB5_RUN_ENV and KRB5_RUN_VARS
to RUN_SETUP (already the most commonly used name) and RUN_VARS.  Make
sure to use DEFINES for local defines (not DEFS).  Remove some other
unnecessary makefile content.

121 files changed:
src/Makefile.in
src/appl/gss-sample/Makefile.in
src/appl/sample/sclient/Makefile.in
src/appl/sample/sserver/Makefile.in
src/appl/simple/client/Makefile.in
src/appl/simple/server/Makefile.in
src/appl/user_user/Makefile.in
src/clients/kcpytkt/Makefile.in
src/clients/kdeltkt/Makefile.in
src/clients/kdestroy/Makefile.in
src/clients/kinit/Makefile.in
src/clients/klist/Makefile.in
src/clients/kpasswd/Makefile.in
src/clients/ksu/Makefile.in
src/clients/kswitch/Makefile.in
src/clients/kvno/Makefile.in
src/config/lib.in
src/config/libnover.in
src/config/pre.in
src/kadmin/cli/Makefile.in
src/kadmin/dbutil/Makefile.in
src/kadmin/ktutil/Makefile.in
src/kadmin/server/Makefile.in
src/kadmin/testing/util/Makefile.in
src/kdc/Makefile.in
src/lib/apputils/Makefile.in
src/lib/crypto/Makefile.in
src/lib/crypto/builtin/Makefile.in
src/lib/crypto/builtin/aes/Makefile.in
src/lib/crypto/builtin/camellia/Makefile.in
src/lib/crypto/builtin/des/Makefile.in
src/lib/crypto/builtin/enc_provider/Makefile.in
src/lib/crypto/builtin/hash_provider/Makefile.in
src/lib/crypto/builtin/md4/Makefile.in
src/lib/crypto/builtin/md5/Makefile.in
src/lib/crypto/builtin/sha1/Makefile.in
src/lib/crypto/builtin/sha2/Makefile.in
src/lib/crypto/crypto_tests/Makefile.in
src/lib/crypto/krb/Makefile.in
src/lib/crypto/nss/Makefile.in
src/lib/crypto/nss/aes/Makefile.in
src/lib/crypto/nss/camellia/Makefile.in
src/lib/crypto/nss/des/Makefile.in
src/lib/crypto/nss/enc_provider/Makefile.in
src/lib/crypto/nss/hash_provider/Makefile.in
src/lib/crypto/nss/md4/Makefile.in
src/lib/crypto/nss/md5/Makefile.in
src/lib/crypto/nss/sha1/Makefile.in
src/lib/crypto/nss/sha2/Makefile.in
src/lib/crypto/openssl/Makefile.in
src/lib/crypto/openssl/aes/Makefile.in
src/lib/crypto/openssl/camellia/Makefile.in
src/lib/crypto/openssl/des/Makefile.in
src/lib/crypto/openssl/enc_provider/Makefile.in
src/lib/crypto/openssl/hash_provider/Makefile.in
src/lib/crypto/openssl/md4/Makefile.in
src/lib/crypto/openssl/md5/Makefile.in
src/lib/crypto/openssl/sha1/Makefile.in
src/lib/crypto/openssl/sha2/Makefile.in
src/lib/gssapi/Makefile.in
src/lib/gssapi/generic/Makefile.in
src/lib/gssapi/krb5/Makefile.in
src/lib/gssapi/mechglue/Makefile.in
src/lib/gssapi/spnego/Makefile.in
src/lib/kadm5/Makefile.in
src/lib/kadm5/clnt/Makefile.in
src/lib/kadm5/srv/Makefile.in
src/lib/kadm5/unit-test/Makefile.in
src/lib/kdb/Makefile.in
src/lib/krb5/Makefile.in
src/lib/krb5/asn.1/Makefile.in
src/lib/krb5/ccache/Makefile.in
src/lib/krb5/ccache/ccapi/Makefile.in
src/lib/krb5/error_tables/Makefile.in
src/lib/krb5/keytab/Makefile.in
src/lib/krb5/krb/Makefile.in
src/lib/krb5/os/Makefile.in
src/lib/krb5/posix/Makefile.in
src/lib/krb5/rcache/Makefile.in
src/lib/krb5/unicode/Makefile.in
src/lib/rpc/Makefile.in
src/lib/rpc/unit-test/Makefile.in
src/plugins/authdata/greet/Makefile.in
src/plugins/authdata/greet_client/Makefile.in
src/plugins/authdata/greet_server/Makefile.in
src/plugins/kadm5_hook/test/Makefile.in
src/plugins/kdb/db2/Makefile.in
src/plugins/kdb/db2/libdb2/Makefile.in
src/plugins/kdb/db2/libdb2/test/Makefile.in
src/plugins/kdb/hdb/Makefile.in
src/plugins/kdb/ldap/Makefile.in
src/plugins/kdb/ldap/ldap_util/Makefile.in
src/plugins/kdb/ldap/libkdb_ldap/Makefile.in
src/plugins/localauth/test/Makefile.in
src/plugins/locate/python/Makefile.in
src/plugins/preauth/cksum_body/Makefile.in
src/plugins/preauth/pkinit/Makefile.in
src/plugins/preauth/securid_sam2/Makefile.in
src/plugins/preauth/wpse/Makefile.in
src/slave/Makefile.in
src/tests/Makefile.in
src/tests/asn.1/Makefile.in
src/tests/create/Makefile.in
src/tests/dejagnu/Makefile.in
src/tests/gss-threads/Makefile.in
src/tests/gssapi/Makefile.in
src/tests/hammer/Makefile.in
src/tests/misc/Makefile.in
src/tests/mkeystash_compat/Makefile.in
src/tests/resolve/Makefile.in
src/tests/shlib/Makefile.in
src/tests/threads/Makefile.in
src/tests/verify/Makefile.in
src/util/collected-client-lib/Makefile.in
src/util/et/Makefile.in
src/util/gss-kernel-lib/Makefile.in
src/util/profile/Makefile.in
src/util/profile/testmod/Makefile.in
src/util/ss/Makefile.in
src/util/support/Makefile.in
src/util/verto/Makefile.in

index d62033a022a5a1f32743c10a33ea27feb78c6329..cea7ddafb16a8ea1fa2eee79a46daf37c885c774 100644 (file)
@@ -18,9 +18,6 @@ SUBDIRS=util include lib \
        config-files build-tools man doc @po@
 WINSUBDIRS=include util lib ccapi windows clients appl
 BUILDTOP=$(REL).
-LOCALINCLUDES = -I$(srcdir) 
-PROG_LIBPATH=-L$(TOPLIBD)
-PROG_RPATH=$(KRB5_LIBDIR)
 
 SRCS =  
 HDRS = 
@@ -545,8 +542,8 @@ testrealm: runenv.py
 # environment variable settings to propagate to Python-based tests
 
 pyrunenv.vals: Makefile
-       $(KRB5_RUN_ENV) \
-       for i in $(KRB5_RUN_VARS); do \
+       $(RUN_SETUP) \
+       for i in $(RUN_VARS); do \
                eval echo 'env['\\\'$$i\\\''] = '\\\'\$$$$i\\\'; \
        done > $@
 
index 87931b94d173591b52bca978f729b32cd2774f80..0f67c0c059073b6e1f375085babc814f4445cb08 100644 (file)
@@ -1,8 +1,6 @@
 mydir=appl$(S)gss-sample
 BUILDTOP=$(REL)..$(S)..
 DEFINES = -DUSE_AUTOCONF_H -DGSSAPI_V2
-PROG_LIBPATH=-L$(TOPLIBD)
-PROG_RPATH=$(KRB5_LIBDIR)
 
 SRCS= $(srcdir)/gss-client.c $(srcdir)/gss-misc.c $(srcdir)/gss-server.c
 
index 069c4203559d9231be8dc76496e5856e5a901ad7..3d8df334724430cad6e976c2d411a36458b562dc 100644 (file)
@@ -1,8 +1,5 @@
 mydir=appl$(S)sample$(S)sclient
-
 BUILDTOP=$(REL)..$(S)..$(S)..
-PROG_LIBPATH=-L$(TOPLIBD)
-PROG_RPATH=$(KRB5_LIBDIR)
 
 all:: sclient
 
index 7205788bc1dc31c72af1be7e16373924bc76fd22..634e5a6b4c8b6c2e2c62e99e8a56941b3ae0abf8 100644 (file)
@@ -1,8 +1,5 @@
 mydir=appl$(S)sample$(S)sserver
-
 BUILDTOP=$(REL)..$(S)..$(S)..
-PROG_LIBPATH=-L$(TOPLIBD)
-PROG_RPATH=$(KRB5_LIBDIR)
 
 all:: sserver
 
index c357c1253c3c26f2d5276039165512380bca5be6..d59baac7b0f422d937d236859873970e21647bb6 100644 (file)
@@ -1,11 +1,9 @@
 mydir=appl$(S)simple$(S)client
 BUILDTOP=$(REL)..$(S)..$(S)..
-PROG_LIBPATH=-L$(TOPLIBD)
-PROG_RPATH=$(KRB5_LIBDIR)
 
 all:: sim_client
 
-LOCALINCLUDES= -I.. -I$(srcdir)/..
+LOCALINCLUDES= -I$(srcdir)/..
 
 sim_client: sim_client.o $(KRB5_BASE_DEPLIBS)
        $(CC_LINK) -o sim_client sim_client.o $(KRB5_BASE_LIBS)
index 1795bc8960418801d7c744402fa7b13bf85644db..a9926456873c9ab92ef23b2afc921f4f6b97da23 100644 (file)
@@ -1,10 +1,7 @@
 mydir=appl$(S)simple$(S)server
 BUILDTOP=$(REL)..$(S)..$(S)..
 
-LOCALINCLUDES= -I.. -I$(srcdir)/..
-
-PROG_LIBPATH=-L$(TOPLIBD)
-PROG_RPATH=$(KRB5_LIBDIR)
+LOCALINCLUDES= -I$(srcdir)/..
 
 all:: sim_server
 
index 20ddc59110b28b7d2a297b30fef1aef32ee06073..86408602a0e364ec47650f58f3d5927d65386e3f 100644 (file)
@@ -2,8 +2,6 @@ mydir=appl$(S)user_user
 BUILDTOP=$(REL)..$(S)..
 # If you remove the -DDEBUG, the test program needs a line changed
 DEFINES = -DDEBUG
-PROG_LIBPATH=-L$(TOPLIBD)
-PROG_RPATH=$(KRB5_LIBDIR)
 
 all:: uuclient uuserver
 
index c4e81c19290a789490bfff1d435162012f64b460..ea73514993d392cf84aa332d8b91789750f165c0 100644 (file)
@@ -1,9 +1,6 @@
 mydir=kcpytkt
 BUILDTOP=$(REL)..$(S)..
 
-PROG_LIBPATH=-L$(TOPLIBD)
-PROG_RPATH=$(KRB5_LIBDIR)
-
 ##WIN32##VERSIONRC = $(BUILDTOP)\windows\version.rc
 ##WIN32##RCFLAGS=$(CPPFLAGS) -I$(top_srcdir) -D_WIN32 -DRES_ONLY
 
index 5c7b183971bda74abdf2e3b26d8e42785e8e3781..e140b7b41ad60511f5a9351971843efe16202093 100644 (file)
@@ -1,9 +1,6 @@
 mydir=kvno
 BUILDTOP=$(REL)..$(S)..
 
-PROG_LIBPATH=-L$(TOPLIBD)
-PROG_RPATH=$(KRB5_LIBDIR)
-
 ##WIN32##VERSIONRC = $(BUILDTOP)\windows\version.rc
 ##WIN32##RCFLAGS=$(CPPFLAGS) -I$(top_srcdir) -D_WIN32 -DRES_ONLY
 
index e3d1c673a30fd3643e47d9d184ec97a4854baf6c..f29935277a463b1b5eb3769de080740250c280fd 100644 (file)
@@ -1,14 +1,10 @@
 mydir=clients$(S)kdestroy
 BUILDTOP=$(REL)..$(S)..
-DEFS=
 
 ##WIN32##LOCALINCLUDES=-I$(BUILDTOP)\util\windows\
 
 SRCS=kdestroy.c
 
-PROG_LIBPATH=-L$(TOPLIBD)
-PROG_RPATH=$(KRB5_LIBDIR)
-
 ##WIN32##VERSIONRC = $(BUILDTOP)\windows\version.rc
 ##WIN32##RCFLAGS=$(CPPFLAGS) -I$(top_srcdir) -D_WIN32 -DRES_ONLY
 
index 44e377426b543a474be58bf5d3f75df501255ee5..b1cd278a5387fea41d1d2475a5fe08d96c4943d2 100644 (file)
@@ -1,9 +1,5 @@
 mydir=clients$(S)kinit
 BUILDTOP=$(REL)..$(S)..
-DEFS=
-
-PROG_LIBPATH=-L$(TOPLIBD)
-PROG_RPATH=$(KRB5_LIBDIR)
 
 SRCS=kinit.c kinit_kdb.c
 
index 20d66ab08c71bcdd6b6082d0566c43054ff22b54..3cdbb86ddff358724fd9127d082660f220ce5f4a 100644 (file)
@@ -1,9 +1,5 @@
 mydir=clients$(S)klist
 BUILDTOP=$(REL)..$(S)..
-DEFS=
-
-PROG_LIBPATH=-L$(TOPLIBD)
-PROG_RPATH=$(KRB5_LIBDIR)
 
 ##WIN32##LOCALINCLUDES=-I$(BUILDTOP)\util\windows\
 
index 09ca1941435975f2f79589635bd289f0a87e1c97..3445c9f0dec02f203747965997b207538a02a31b 100644 (file)
@@ -1,8 +1,5 @@
 mydir=clients$(S)kpasswd
 BUILDTOP=$(REL)..$(S)..
-PROG_LIBPATH=-L$(TOPLIBD)
-PROG_RPATH=$(KRB5_LIBDIR)
-DEFS=
 
 SRCS=kpasswd.c ksetpwd.c
 
index 6cecf0dff4095f248f70bf88c00fcbbf31fa53c6..c705fda7f0c0f78febea2b6a1135219e84cf56f4 100644 (file)
@@ -1,10 +1,6 @@
 mydir=clients$(S)ksu
 BUILDTOP=$(REL)..$(S)..
 DEFINES = -DGET_TGT_VIA_PASSWD -DPRINC_LOOK_AHEAD -DCMD_PATH='"/bin /local/bin"'
-DEFS=
-
-PROG_LIBPATH=-L$(TOPLIBD)
-PROG_RPATH=$(KRB5_LIBDIR)
 
 KSU_LIBS=@KSU_LIBS@
 
index 2ae457b11f38e9b039b1948182baf8367965c463..b46fec622435a78ce4ca8c3c4f5e726bbc8272c2 100644 (file)
@@ -1,12 +1,8 @@
 mydir=clients$(S)kswitch
 BUILDTOP=$(REL)..$(S)..
-DEFS=
 
 SRCS=kswitch.c
 
-PROG_LIBPATH=-L$(TOPLIBD)
-PROG_RPATH=$(KRB5_LIBDIR)
-
 ##WIN32##VERSIONRC = $(BUILDTOP)\windows\version.rc
 ##WIN32##RCFLAGS=$(CPPFLAGS) -I$(top_srcdir) -D_WIN32 -DRES_ONLY
 
index 16ade4804443459bb943cddb11ce60ab7a4f8204..58519ae36e4845dbd181d8eae3eb25e231973b3d 100644 (file)
@@ -1,14 +1,10 @@
 mydir=clients$(S)kvno
 BUILDTOP=$(REL)..$(S)..
-DEFS=
 
 ##WIN32##LOCALINCLUDES=-I$(BUILDTOP)\util\windows\
 
 SRCS=kvno.c
 
-PROG_LIBPATH=-L$(TOPLIBD)
-PROG_RPATH=$(KRB5_LIBDIR)
-
 ##WIN32##VERSIONRC = $(BUILDTOP)\windows\version.rc
 ##WIN32##RCFLAGS=$(CPPFLAGS) -I$(top_srcdir) -D_WIN32 -DRES_ONLY
 
index 26d1d5ae47c225fb147d8f1e4ccdf7416a53a7b1..8dd54757ec5b5499ad995673156d1d6f9726d222 100644 (file)
@@ -8,25 +8,17 @@
 # LIBBASE      library name without "lib" or extension
 # LIBMAJOR     library major version
 # LIBMINOR     library minor version
-# STOBJLISTS   list of files, each of which is an OBJS.ST created by
-#                      libobj.in; *DO NOT* use ./OBJS.ST for the current
-#                      directory as that will cause some makes to lose.
 # SHLIB_EXPDEPS        list of libraries that this one has explicit
 #                      dependencies on, pref. in the form libfoo$(SHLIBEXT)
 # SHLIB_EXPLIBS        list of libraries that this one has explicit
 #                      dependencies on, in "-lfoo" form.
-# SHLIB_DIRS   list of directories where $(SHLIB_EXPLIBS) can be
-#                      found, in the form -Ldir1 -Ldir2 ...
-#                      since there are very few systems where -L is the
-#                      wrong thing (notable exception of SunOS but we
-#                      deal with it...)
-# SHLIB_RDIRS  rpath directories to search; given in the
-#                      form dir1:dir2 ...
 # RELDIR       path to this directory relative to $(TOPLIBD)
+#
+# Makefile.in can also override the defaults for SHLIB_DIRS,
+# SHLIB_RDIRS, and STOBJLISTS from pre.in.
 
 LIBPREFIX=lib
 
-# STOBJLISTS=dir1/OBJS.ST dir2/OBJS.ST etc...
 SHOBJLISTS=$(STOBJLISTS:.ST=.SH)
 PFOBJLISTS=$(STOBJLISTS:.ST=.PF)
 
index 4214aedf89bdb693ef58488b568de388e9b7c379..b55a42746c2e18327520049e5557beb9b3f9df60 100644 (file)
@@ -7,25 +7,17 @@
 # The following variables must be set in the Makefile.in:
 #
 # LIBBASE      library name without "lib" or extension
-# STOBJLISTS   list of files, each of which is an OBJS.ST created by
-#                      libobj.in; *DO NOT* use ./OBJS.ST for the current
-#                      directory as that will cause some makes to lose.
 # SHLIB_EXPDEPS        list of libraries that this one has explicit
 #                      dependencies on, pref. in the form libfoo$(SHLIBEXT)
 # SHLIB_EXPLIBS        list of libraries that this one has explicit
 #                      dependencies on, in "-lfoo" form.
-# SHLIB_DIRS   list of directories where $(SHLIB_EXPLIBS) can be
-#                      found, in the form -Ldir1 -Ldir2 ...
-#                      since there are very few systems where -L is the
-#                      wrong thing (notable exception of SunOS but we
-#                      deal with it...)
-# SHLIB_RDIRS  rpath directories to search; given in the
-#                      form dir1:dir2 ...
 # RELDIR       path to this directory relative to $(TOPLIBD)
+#
+# Makefile.in can also override the defaults for SHLIB_DIRS,
+# SHLIB_RDIRS, and STOBJLISTS from pre.in.
 
 LIBPREFIX=
 
-# STOBJLISTS=dir1/OBJS.ST dir2/OBJS.ST etc...
 SHOBJLISTS=$(STOBJLISTS:.ST=.SH)
 PFOBJLISTS=$(STOBJLISTS:.ST=.PF)
 
index bf6c93b6765b5206333de28d0169d9e82d2aedfe..fbc5c11e411fe4298702fbd5a09750f8184e5cb6 100644 (file)
@@ -275,21 +275,31 @@ EXEEXT =
 # variables for libraries, for use in linking programs
 # -- this may want to get broken out into a separate frag later
 #
-#
-# Note: the following variables must be set in any Makefile.in that
-# uses KRB5_BUILD_PROGRAM
-#
-# PROG_LIBPATH list of dirs, in -Ldir form, to search for libraries at link
-# PROG_RPATH   list of dirs, in dir1:dir2 form, for rpath purposes
-#
 # invocation is like:
 # prog: foo.o bar.o $(KRB5_BASE_DEPLIBS)
 #      $(CC_LINK) -o $@ foo.o bar.o $(KRB5_BASE_LIBS)
 
-
 CC_LINK=@CC_LINK@
 CXX_LINK=@CXX_LINK@
 
+# Makefile.in files which build programs can override the list of
+# directories to look for dependent libraries in (in the form -Ldir1
+# -Ldir2 ...) and also the list of rpath directories to search (in the
+# form dir1:dir2:...).
+PROG_LIBPATH=-L$(TOPLIBD)
+PROG_RPATH=$(KRB5_LIBDIR)
+
+# Library Makefile.in files can override this list of directories to
+# look for dependent libraries in (in the form -Ldir1 -Ldir2 ...) and
+# also the list of rpath directories to search (in the form
+# dir1:dir2:...)
+SHLIB_DIRS=-L$(TOPLIBD)
+SHLIB_RDIRS=$(KRB5_LIBDIR)
+
+# Multi-directory library Makefile.in files should override this list
+# of object files with the full list.
+STOBJLISTS=OBJS.ST
+
 # prefix (with no spaces after) for rpath flag to cc
 RPATH_FLAG=@RPATH_FLAG@
 
@@ -398,8 +408,8 @@ KADMCLNT_LIBS       = -lkadm5clnt_mit $(KADM_COMM_LIBS)
 APPUTILS_LIB   = -lapputils
 
 # So test programs can find their libraries without "make install", etc.
-KRB5_RUN_ENV=@KRB5_RUN_ENV@
-KRB5_RUN_VARS=@KRB5_RUN_VARS@
+RUN_SETUP=@KRB5_RUN_ENV@
+RUN_VARS=@KRB5_RUN_VARS@
 
 #
 # variables for --with-tcl=
index 2681399bad5f530e05a62b4b0c4ea1a178498b96..789c597f4af8d1904e760c6ee433b6a7879cfeb9 100644 (file)
@@ -1,9 +1,6 @@
 mydir=kadmin$(S)cli
 BUILDTOP=$(REL)..$(S)..
-PROG_LIBPATH=-L$(TOPLIBD)
-PROG_RPATH=$(KRB5_LIBDIR)
 KDB_DEP_LIB=$(DL_LIB) $(THREAD_LINKOPTS)
-DEFS=
 
 PROG = kadmin
 COMMON_OBJS = kadmin.o kadmin_ct.o ss_wrapper.o getdate.o
index 58c517aba8022b84127ae8d6b2c9fcb689f96d42..047587afc6b4f7f7117f0b07a212c119909a9ece 100644 (file)
@@ -1,9 +1,6 @@
 mydir=kadmin$(S)dbutil
 BUILDTOP=$(REL)..$(S)..
-DEFS=
 LOCALINCLUDES = -I.
-PROG_LIBPATH=-L$(TOPLIBD) $(KRB5_LIBPATH)
-PROG_RPATH=$(KRB5_LIBDIR)
 KDB_DEP_LIB=$(DL_LIB) $(THREAD_LINKOPTS)
 
 PROG = kdb5_util
index f92bcb27090e92b0f7b907e12d58ad785542fb55..e92f84f0e49a7bb353a0c1cc5bcf90af745896cb 100644 (file)
@@ -1,8 +1,5 @@
 mydir=kadmin$(S)ktutil
 BUILDTOP=$(REL)..$(S)..
-PROG_LIBPATH=-L$(TOPLIBD)
-PROG_RPATH=$(KRB5_LIBDIR)
-DEFS=
 
 OBJS=  ktutil.o \
        ktutil_ct.o \
index 694227d118d0a8cb827b85f5ec636f5f749efd9b..3218307f3b8d23b2d42b55cbde8c1117d4e8d238 100644 (file)
@@ -1,15 +1,11 @@
 mydir=kadmin$(S)server
 BUILDTOP=$(REL)..$(S)..
 KDB_DEP_LIB=$(DL_LIB) $(THREAD_LINKOPTS)
-DEFS=
 
 LOCALINCLUDES = -I$(top_srcdir)/lib/gssapi/generic \
        -I$(top_srcdir)/lib/gssapi/krb5 -I$(BUILDTOP)/lib/gssapi/generic \
        -I$(BUILDTOP)/lib/gssapi/krb5 -I$(top_srcdir)/lib/kadm5/srv
 
-PROG_LIBPATH=-L$(TOPLIBD)
-PROG_RPATH=$(KRB5_LIBDIR)
-
 PROG = kadmind
 OBJS = kadm_rpc_svc.o server_stubs.o ovsec_kadmd.o schpw.o misc.o ipropd_svc.o
 SRCS = kadm_rpc_svc.c server_stubs.c ovsec_kadmd.c schpw.c misc.c ipropd_svc.c
index 745a73ddd56eba1d47cea5d64f1f9ea95bf60382..6bb6f60c0b8c071be7a15b9ca1e98240fa913c30 100644 (file)
@@ -4,7 +4,6 @@ LOCALINCLUDES = $(TCL_INCLUDES) -I$(BUILDTOP)/lib/kdb/
 # Force Tcl headers to use stdarg.h, because krb5 does too, and if
 # Tcl uses varargs.h it'll just mess things up.
 DEFINES= -DHAS_STDARG
-DEFS=
 KRB5_PTHREAD_LIB=$(THREAD_LINKOPTS) 
 
 PROG_LIBPATH=-L$(TOPLIBD) $(TCL_LIBPATH)
index 5206f21ea49d35ab8798c8f5d394cd875019cc61..1b3b19b2cd67b8517c9fdd917be9816f20d805b4 100644 (file)
@@ -1,11 +1,6 @@
 mydir=kdc
 BUILDTOP=$(REL)..
-DEFINES =
-RUN_SETUP = @KRB5_RUN_ENV@
-PROG_LIBPATH=-L$(TOPLIBD) $(KRB4_LIBPATH)
-KDB5_LIB_DEPS=$(DL_LIB) $(THREAD_LINKOPTS)
-PROG_RPATH=$(KRB5_LIBDIR)
-DEFS=-DLIBDIR=\"$(KRB5_LIBDIR)\"
+DEFINES=-DLIBDIR=\"$(KRB5_LIBDIR)\"
 
 all:: krb5kdc rtest
 
index 75dd613dc00cadccca6851b015dcdee08399f51d..d7fe336778acc3485c67c09202b14dc7cc5aa985 100644 (file)
@@ -6,7 +6,6 @@ mydir=lib$(S)apputils
 BUILDTOP=$(REL)..$(S)..
 RELDIR=../lib/apputils
 SED = sed
-DEFS=
 
 ##DOS##BUILDTOP = ..\..
 ##DOS##LIBNAME=$(OUTPRE)apputils.lib
@@ -14,7 +13,6 @@ DEFS=
 ##DOS##OBJFILE=$(OUTPRE)apputils.lst
 
 STLIBOBJS=net-server.o @LIBOBJS@
-STOBJLISTS=OBJS.ST
 LIBBASE=apputils
 
 all-unix:: all-liblinks
index 6098f911e2ca3162a33e2fe989c129ecdf632b08..a036022333bbc5cf4313f606f68262df2549343b 100644 (file)
@@ -2,15 +2,6 @@ mydir=lib$(S)crypto
 BUILDTOP=$(REL)..$(S)..
 SUBDIRS= krb $(CRYPTO_IMPL) crypto_tests
 
-RUN_SETUP = @KRB5_RUN_ENV@
-PROG_LIBPATH=-L$(TOPLIBD)
-PROG_RPATH=$(KRB5_LIBDIR)
-DEFS=
-
-PROG_LIBPATH=-L$(TOPLIBD)
-PROG_RPATH=$(KRB5_LIBDIR)
-
-
 LIBBASE=k5crypto
 LIBMAJOR=3
 LIBMINOR=1
@@ -38,12 +29,9 @@ SUBDIROBJLISTS=$(CRYPTO_IMPL)/enc_provider/OBJS.ST                   \
 # link editor and loader support it.
 DEPLIBS=
 CRYPTO_IMPL_LIBS=@CRYPTO_IMPL_LIBS@
-SHLIB_DIRS=-L$(TOPLIBD)
 SHLIB_EXPLIBS= $(SUPPORT_LIB) $(CRYPTO_IMPL_LIBS) $(LIBS)
 SHLIB_EXPDEPLIBS= $(SUPPORT_DEPLIB)
 SHLIB_LDFLAGS= $(LDFLAGS) @SHLIB_RPATH_DIRS@
-SHLIB_LIBDIRS= @SHLIB_LIBDIRS@
-SHLIB_RDIRS=$(KRB5_LIBDIR)
 
 ##DOS##LIBNAME=$(OUTPRE)crypto.lib
 ##DOS##OBJFILEDEP=$(OUTPRE)krb.lst $(OUTPRE)aes.lst $(OUTPRE)enc_provider.lst $(OUTPRE)des.lst $(OUTPRE)md5.lst $(OUTPRE)camellia.lst $(OUTPRE)md4.lst $(OUTPRE)hash_provider.lst $(OUTPRE)sha2.lst $(OUTPRE)sha1.lst $(OUTPRE)builtin.lst
index 612d8f102b8369396908c7c287e7ebc62f619d3c..06312fa511a85de5daf34d1fe8c7341e4a7d46cb 100644 (file)
@@ -2,10 +2,6 @@ mydir=lib$(S)crypto$(S)builtin
 BUILDTOP=$(REL)..$(S)..$(S)..
 SUBDIRS=camellia des aes md4 md5 sha1 sha2 enc_provider hash_provider
 LOCALINCLUDES = -I$(srcdir)/../krb -I$(srcdir)
-RUN_SETUP = @KRB5_RUN_ENV@
-PROG_LIBPATH=-L$(TOPLIBD)
-PROG_RPATH=$(KRB5_LIBDIR)
-DEFS=
 
 ##DOS##BUILDTOP = ..\..\..
 ##DOS##PREFIXDIR = builtin
index 9a242cc45a46035f3c729f2738f15c70e203ff1e..f19604fd24fcb6c646807c5881363beaf5da93e8 100644 (file)
@@ -1,15 +1,10 @@
 mydir=lib$(S)crypto$(S)builtin$(S)aes
 BUILDTOP=$(REL)..$(S)..$(S)..$(S)..
-LOCALINCLUDES = -I$(srcdir)/.. -I$(srcdir)/../../krb/dk  -I$(srcdir)/../../../../include
-DEFS=
 
 ##DOS##BUILDTOP = ..\..\..\..
 ##DOS##PREFIXDIR = builtin\aes
 ##DOS##OBJFILE = ..\..\$(OUTPRE)aes.lst
 
-PROG_LIBPATH=-L$(TOPLIBD)
-PROG_RPATH=$(KRB5_LIBDIR)
-
 STLIBOBJS=\
        aescrypt.o      \
        aestab.o        \
@@ -39,7 +34,7 @@ includes:: depend
 depend:: $(SRCS)
 
 aes-gen: aes-gen.o $(GEN_OBJS)
-       $(CC_LINK) -I../../../../include $(LOCALINCLUDES) -o aes-gen aes-gen.o $(GEN_OBJS)
+       $(CC_LINK) -o aes-gen aes-gen.o $(GEN_OBJS)
 
 run-aes-gen: aes-gen
        ./aes-gen > kresults.out
index e6c86bc131e232d1b0509956b2ddbd89a5b6ee23..a15c6f9c6da94ae212a3f04e465b2b3952c06859 100644 (file)
@@ -2,28 +2,19 @@ thisconfigdir=../../../..
 myfulldir=lib/crypto/builtin/camellia
 mydir=lib$(S)crypto$(S)builtin$(S)camellia
 BUILDTOP=$(REL)..$(S)..$(S)..$(S)..
-LOCALINCLUDES = -I$(srcdir)/.. -I$(srcdir)/../../krb/dk \
-        -I$(srcdir)/../../../../include -I$(srcdir)/../aes
-DEFS=
+LOCALINCLUDES = -I$(srcdir)/../aes
 
 ##DOS##BUILDTOP = ..\..\..\..
 ##DOS##PREFIXDIR = builtin\camellia
 ##DOS##OBJFILE = ..\..\$(OUTPRE)camellia.lst
 
-PROG_LIBPATH=-L$(TOPLIBD)
-PROG_RPATH=$(KRB5_LIBDIR)
+STLIBOBJS= camellia.o
 
-STLIBOBJS=\
-       camellia.o
+OBJS= $(OUTPRE)camellia.$(OBJEXT)
 
-OBJS=\
-       $(OUTPRE)camellia.$(OBJEXT)
+SRCS= $(srcdir)/camellia.c
 
-SRCS=\
-       $(srcdir)/camellia.c
-
-GEN_OBJS=\
-       $(OUTPRE)camellia.$(OBJEXT)
+GEN_OBJS= $(OUTPRE)camellia.$(OBJEXT)
 
 ##DOS##LIBOBJS = $(OBJS)
 
@@ -34,7 +25,7 @@ includes:: depend
 depend:: $(SRCS)
 
 camellia-gen: camellia-gen.o $(GEN_OBJS)
-       $(CC_LINK) -I../../../../include $(LOCALINCLUDES) -o camellia-gen camellia-gen.o $(GEN_OBJS)
+       $(CC_LINK) -o camellia-gen camellia-gen.o $(GEN_OBJS)
 
 run-camellia-gen: camellia-gen
        ./camellia-gen > kresults.out
index 6a17b36734022b2b8749492a220f4cccc84897c2..cf4567ef23a038094b9d793d49ec4f50752d9bf2 100644 (file)
@@ -1,17 +1,11 @@
 mydir=lib$(S)crypto$(S)builtin$(S)des
 BUILDTOP=$(REL)..$(S)..$(S)..$(S)..
 LOCALINCLUDES = -I$(srcdir)/.. -I$(srcdir)/../../krb
-DEFS=
 
 ##DOS##BUILDTOP = ..\..\..\..
 ##DOS##PREFIXDIR = builtin\des
 ##DOS##OBJFILE = ..\..\$(OUTPRE)des.lst
 
-RUN_SETUP = @KRB5_RUN_ENV@
-PROG_LIBPATH=-L$(TOPLIBD)
-PROG_RPATH=$(KRB5_LIBDIR)
-
-
 STLIBOBJS=\
        d3_aead.o       \
        d3_kysched.o    \
index 6a7e96f3fa457cbca8c1612d6ad822742022863f..c87fb052a04fe3ac70c19443b97fee394bee97e4 100644 (file)
@@ -5,15 +5,11 @@ LOCALINCLUDES = -I$(srcdir)/../des    \
                -I$(srcdir)/../camellia \
                -I$(srcdir)/../../krb   \
                -I$(srcdir)/..
-DEFS=
 
 ##DOS##BUILDTOP = ..\..\..\..
 ##DOS##PREFIXDIR = builtin\enc_provider
 ##DOS##OBJFILE = ..\..\$(OUTPRE)enc_provider.lst
 
-PROG_LIBPATH=-L$(TOPLIBD)
-PROG_RPATH=$(KRB5_LIBDIR)
-
 STLIBOBJS= \
        des.o   \
        des3.o  \
index ad40ef6e3a6caa53e3ebccd480894db511ed6240..37d88d4586d7c0801ccd461d798048249bafc8f6 100644 (file)
@@ -2,15 +2,11 @@ mydir=lib$(S)crypto$(S)builtin$(S)hash_provider
 BUILDTOP=$(REL)..$(S)..$(S)..$(S)..
 LOCALINCLUDES = -I$(srcdir)/.. -I$(srcdir)/../../krb -I$(srcdir)/../md4 \
        -I$(srcdir)/../md5 -I$(srcdir)/../sha1
-DEFS=
 
 ##DOS##BUILDTOP = ..\..\..\..
 ##DOS##PREFIXDIR = builtin\hash_provider
 ##DOS##OBJFILE = ..\..\$(OUTPRE)hash_provider.lst
 
-PROG_LIBPATH=-L$(TOPLIBD)
-PROG_RPATH=$(KRB5_LIBDIR)
-
 STLIBOBJS= \
        hash_crc32.o    \
        hash_md4.o      \
index 3dbeb5bd70bc59096eec7eb850c6a67bbaadfc2e..d93f78f74dab607aca249c846b554906f4ae4135 100644 (file)
@@ -1,15 +1,11 @@
 mydir=lib$(S)crypto$(S)builtin$(S)md4
 BUILDTOP=$(REL)..$(S)..$(S)..$(S)..
 LOCALINCLUDES = -I$(srcdir)
-DEFS=
 
 ##DOS##BUILDTOP = ..\..\..\..
 ##DOS##PREFIXDIR = builtin\md4
 ##DOS##OBJFILE = ..\..\$(OUTPRE)md4.lst
 
-PROG_LIBPATH=-L$(TOPLIBD)
-PROG_RPATH=$(KRB5_LIBDIR)
-
 STLIBOBJS= md4.o
 
 OBJS= $(OUTPRE)md4.$(OBJEXT) 
index 1ab1ce96fabb10fce27d71c8cc6efa3d83426f42..c938da86a4bb0ff9b83ef01fb6476869db5c842b 100644 (file)
@@ -1,14 +1,10 @@
 mydir=lib$(S)crypto$(S)builtin$(S)md5
 BUILDTOP=$(REL)..$(S)..$(S)..$(S)..
-DEFS=
 
 ##DOS##BUILDTOP = ..\..\..\..
 ##DOS##PREFIXDIR = builtin\md5
 ##DOS##OBJFILE = ..\..\$(OUTPRE)md5.lst
 
-PROG_LIBPATH=-L$(TOPLIBD)
-PROG_RPATH=$(KRB5_LIBDIR)
-
 STLIBOBJS= md5.o
 
 OBJS= $(OUTPRE)md5.$(OBJEXT) 
index 00e6cb6d4ab57bf837acc1fde2d6b4c7b6aa1d38..339e47c18d3c050281a7bdcc8d6e3e2c9514c2e0 100644 (file)
@@ -1,15 +1,10 @@
 mydir=lib$(S)crypto$(S)builtin$(S)sha1
 BUILDTOP=$(REL)..$(S)..$(S)..$(S)..
-DEFS=
 
 ##DOS##BUILDTOP = ..\..\..\..
 ##DOS##PREFIXDIR = builtin\sha1
 ##DOS##OBJFILE = ..\..\$(OUTPRE)sha1.lst
 
-RUN_SETUP = @KRB5_RUN_ENV@
-PROG_LIBPATH=-L$(TOPLIBD)
-PROG_RPATH=$(KRB5_LIBDIR)
-
 STLIBOBJS= shs.o
 
 OBJS= $(OUTPRE)shs.$(OBJEXT) 
index ffb9b7480a97ce065eb9d56f76829f3f5af503bc..7c5e1375e77c553cf6c9a21e2dfdd10615b3e54a 100644 (file)
@@ -1,15 +1,10 @@
 mydir=lib$(S)crypto$(S)builtin$(S)sha2
 BUILDTOP=$(REL)..$(S)..$(S)..$(S)..
-DEFS=
 
 ##DOS##BUILDTOP = ..\..\..\..
 ##DOS##PREFIXDIR = builtin\sha2
 ##DOS##OBJFILE = ..\..\$(OUTPRE)sha2.lst
 
-RUN_SETUP = @KRB5_RUN_ENV@
-PROG_LIBPATH=-L$(TOPLIBD)
-PROG_RPATH=$(KRB5_LIBDIR)
-
 STLIBOBJS= sha256.o
 
 OBJS= $(OUTPRE)sha256.$(OBJEXT) 
index 58e1c48109a543d13fbb6604ff25ddb7ea236068..c3ecf2f1be764b4f348aa7af7fd93c769a830c1f 100644 (file)
@@ -1,10 +1,6 @@
 mydir=lib$(S)crypto$(S)crypto_tests
 BUILDTOP=$(REL)..$(S)..$(S)..
 LOCALINCLUDES = -I$(srcdir)/../krb -I$(srcdir)/../$(CRYPTO_IMPL)
-RUN_SETUP = @KRB5_RUN_ENV@
-PROG_LIBPATH=-L$(TOPLIBD)
-PROG_RPATH=$(KRB5_LIBDIR)
-DEFS=
 
 EXTRADEPSRCS=\
        $(srcdir)/t_nfold.c     \
index 66bcc8ab7ebcd4609f5a8e523194b1ddeeb48e9a..75ce4573f1e46de24782a9d4030a0a484b2f6e6f 100644 (file)
@@ -1,18 +1,11 @@
 mydir=lib$(S)crypto$(S)krb
 BUILDTOP=$(REL)..$(S)..$(S)..
-LOCALINCLUDES = -I$(srcdir) -I$(srcdir)/../$(CRYPTO_IMPL)
-RUN_SETUP = @KRB5_RUN_ENV@
-PROG_LIBPATH=-L$(TOPLIBD)
-PROG_RPATH=$(KRB5_LIBDIR)
-DEFS=
+LOCALINCLUDES = -I$(srcdir)/../$(CRYPTO_IMPL)
 
 ##DOS##BUILDTOP = ..\..\..
 ##DOS##PREFIXDIR = krb
 ##DOS##OBJFILE = ..\$(OUTPRE)krb.lst
 
-PROG_LIBPATH=-L$(TOPLIBD)
-PROG_RPATH=$(KRB5_LIBDIR)
-
 STLIBOBJS=\
        aead.o                  \
        block_size.o            \
index bb8b8c27576b121f2646be321d45ecb0d99e3e31..06d1d768b0f3848aadd4d6f45939495148a5832e 100644 (file)
@@ -4,10 +4,6 @@ SUBDIRS=des aes        camellia md4 md5  sha1 sha2 enc_provider hash_provider
 CRYPTO_IMPL_CFLAGS=@CRYPTO_IMPL_CFLAGS@
 LOCALINCLUDES = -I$(srcdir)/../krb -I$(srcdir) $(CRYPTO_IMPL_CFLAGS)
 
-PROG_LIBPATH=-L$(TOPLIBD)
-PROG_RPATH=$(KRB5_LIBDIR)
-DEFS=
-
 STLIBOBJS=\
        hmac.o  \
        pbkdf2.o \
index 947ad11b23aa1122dd676779fe01d86425a00132..ebc3200a9fc8f72fbc3939e1f6880e138d7263f3 100644 (file)
@@ -1,26 +1,2 @@
-# Nothing here!  But we can't remove this directory as the build
-# system currently assumes that all modules have the same directory
-# structure.
-
 mydir=lib$(S)crypto$(S)nss$(S)aes
 BUILDTOP=$(REL)..$(S)..$(S)..$(S)..
-LOCALINCLUDES = -I$(srcdir)/../../krb -I$(srcdir)/..
-DEFS=
-
-STLIBOBJS=
-
-OBJS=
-
-SRCS=
-
-
-all-unix:: all-libobjs 
-
-includes:: depend
-
-depend:: $(SRCS)
-
-clean-unix:: clean-libobjs
-
-@libobj_frag@
-
index 041227132f1d708b9bc5e455bf0d46212c19ee12..c7031720256d74c3955a7aaad6d78fe8b803e384 100644 (file)
@@ -1,26 +1,2 @@
-# Nothing here!  But we can't remove this directory as the build
-# system currently assumes that all modules have the same directory
-# structure.
-
 mydir=lib$(S)crypto$(S)nss$(S)camellia
 BUILDTOP=$(REL)..$(S)..$(S)..$(S)..
-LOCALINCLUDES = -I$(srcdir)/../../krb -I$(srcdir)/..
-DEFS=
-
-STLIBOBJS=
-
-OBJS=
-
-SRCS=
-
-
-all-unix:: all-libobjs 
-
-includes:: depend
-
-depend:: $(SRCS)
-
-clean-unix:: clean-libobjs
-
-@libobj_frag@
-
index cdef2818af178b78f972abf8d7fe980c4cf7145d..6b240e63bf9cec8cfcda8d7851ab63f29367a901 100644 (file)
@@ -3,12 +3,6 @@ BUILDTOP=$(REL)..$(S)..$(S)..$(S)..
 CRYPTO_IMPL_CFLAGS=@CRYPTO_IMPL_CFLAGS@
 LOCALINCLUDES = -I$(srcdir)/../../krb -I$(srcdir)/.. $(CRYPTO_IMPL_CFLAGS)
 
-DEFS=
-
-RUN_SETUP = @KRB5_RUN_ENV@
-PROG_LIBPATH=-L$(TOPLIBD)
-PROG_RPATH=$(KRB5_LIBDIR)
-
 STLIBOBJS= des_keys.o
 
 OBJS= $(OUTPRE)des_keys.$(OBJEXT)
index 3657d597c4b56a3764c177e0cf3f097df90006c9..e1d382e2ca3d22df1dde84f86dfde69035342f57 100644 (file)
@@ -2,10 +2,6 @@ mydir=lib$(S)crypto$(S)nss$(S)enc_provider
 BUILDTOP=$(REL)..$(S)..$(S)..$(S)..
 CRYPTO_IMPL_CFLAGS=@CRYPTO_IMPL_CFLAGS@
 LOCALINCLUDES = -I$(srcdir)/../../krb -I$(srcdir)/.. $(CRYPTO_IMPL_CFLAGS)
-DEFS=
-
-PROG_LIBPATH=-L$(TOPLIBD)
-PROG_RPATH=$(KRB5_LIBDIR)
 
 STLIBOBJS= \
        enc_gen.o       \
index e6b25caca637473e6b188ef5e0637410a62c169f..495309b320fd24e7d818cbd064b79ea851164cb1 100644 (file)
@@ -4,11 +4,6 @@ CRYPTO_IMPL_CFLAGS=@CRYPTO_IMPL_CFLAGS@
 LOCALINCLUDES = -I$(srcdir)/../../krb -I$(srcdir)/.. -I$(srcdir)/../md4 \
        $(CRYPTO_IMPL_CFLAGS)
 
-DEFS=
-
-PROG_LIBPATH=-L$(TOPLIBD)
-PROG_RPATH=$(KRB5_LIBDIR)
-
 STLIBOBJS= \
        hash_gen.o      \
        hash_crc32.o    \
index 3927d57191dead75832bac5cef6f934eee415da5..b71c192bc1ff8010a0eb651fac8e8257daed7a9a 100644 (file)
@@ -1,7 +1,5 @@
 mydir=lib$(S)crypto$(S)nss$(S)md4
 BUILDTOP=$(REL)..$(S)..$(S)..$(S)..
-LOCALINCLUDES =
-DEFS=
 
 STLIBOBJS= md4.o
 
@@ -18,4 +16,3 @@ depend:: $(SRCS)
 clean-unix:: clean-libobjs
 
 @libobj_frag@
-
index ec7279518e1411bc98324c984bde91a63e65d110..e0e3fa5d6fe33678bedbc072889689ad384ccd54 100644 (file)
@@ -1,17 +1,5 @@
 mydir=lib$(S)crypto$(S)nss$(S)md5
 BUILDTOP=$(REL)..$(S)..$(S)..$(S)..
-DEFS=
-
-PROG_LIBPATH=-L$(TOPLIBD)
-PROG_RPATH=$(KRB5_LIBDIR)
-LOCALINCLUDES =
-
-
-STLIBOBJS=
-
-OBJS=
-
-SRCS=
 
 all-unix:: all-libobjs
 
index 8e7809e7c3bf5ecafd2e1f83197335e477ac1eba..4bcc193a28d665061248b7fa87be6df71a9ca286 100644 (file)
@@ -1,21 +1,2 @@
 mydir=lib$(S)crypto$(S)nss$(S)sha1
 BUILDTOP=$(REL)..$(S)..$(S)..$(S)..
-DEFS=
-LOCALINCLUDES =
-
-STLIBOBJS=
-
-OBJS=
-
-SRCS=
-
-all-unix:: all-libobjs
-
-includes:: depend
-
-depend:: $(SRCS)
-
-clean-unix:: clean-libobjs
-
-@libobj_frag@
-
index 89662fa44674a73f8d66e7160fdf3bdff62ccdcb..01e30f3d3209f1f844ff247b5c999b96bb35c9ab 100644 (file)
@@ -4,18 +4,6 @@
 
 mydir=lib$(S)crypto$(S)nss$(S)aes
 BUILDTOP=$(REL)..$(S)..$(S)..$(S)..
-LOCALINCLUDES =
-DEFS=
-
-PROG_LIBPATH=-L$(TOPLIBD)
-PROG_RPATH=$(KRB5_LIBDIR)
-
-STLIBOBJS=
-
-OBJS=
-
-SRCS=
-
 
 all-unix:: all-libobjs 
 
index c889cbed1f05a7e0b36d711be24523a0062a2b85..c7bff2e9ac1fe8a7c22fc3d781cc9b1a7f24790d 100644 (file)
@@ -2,9 +2,6 @@ mydir=lib$(S)crypto$(S)openssl
 BUILDTOP=$(REL)..$(S)..$(S)..
 SUBDIRS=camellia des aes md4 md5  sha1 sha2 enc_provider hash_provider
 LOCALINCLUDES = -I$(srcdir)/../krb -I$(srcdir)
-PROG_LIBPATH=-L$(TOPLIBD)
-PROG_RPATH=$(KRB5_LIBDIR)
-DEFS=
 
 STLIBOBJS=\
        hmac.o  \
index 6df0e0d44eb96fcdc5c841d3b46eabc2d545edb1..22a101902c58c46c8793e950cd0ed022b4c16d95 100644 (file)
@@ -4,21 +4,3 @@
 
 mydir=lib$(S)crypto$(S)openssl$(S)aes
 BUILDTOP=$(REL)..$(S)..$(S)..$(S)..
-LOCALINCLUDES=
-DEFS=
-
-STLIBOBJS=
-
-OBJS=
-
-SRCS=
-
-all-unix:: all-libobjs 
-
-includes:: depend
-
-depend:: $(SRCS)
-
-clean-unix:: clean-libobjs
-
-@libobj_frag@
index b805e9fad5ca96399c39a6687cd8ad3f901b3b91..ce689e6e380ab46e5894fcf496468e0689011259 100644 (file)
@@ -1,26 +1,2 @@
-# Nothing here!  But we can't remove this directory as the build
-# system currently assumes that all modules have the same directory
-# structure.
-
 mydir=lib$(S)crypto$(S)openssl$(S)camellia
 BUILDTOP=$(REL)..$(S)..$(S)..$(S)..
-LOCALINCLUDES =
-DEFS=
-
-STLIBOBJS=
-
-OBJS=
-
-SRCS=
-
-
-all-unix:: all-libobjs 
-
-includes:: depend
-
-depend:: $(SRCS)
-
-clean-unix:: clean-libobjs
-
-@libobj_frag@
-
index ac113f7c87f99e239aab764ede38d6408f2a5532..6240a57ff2d8a510be78353d2eabccc9f8c90275 100644 (file)
@@ -1,11 +1,6 @@
 mydir=lib$(S)crypto$(S)openssl$(S)des
 BUILDTOP=$(REL)..$(S)..$(S)..$(S)..
 LOCALINCLUDES = -I$(srcdir)/../../krb -I$(srcdir)/..
-DEFS=
-
-RUN_SETUP = @KRB5_RUN_ENV@
-PROG_LIBPATH=-L$(TOPLIBD)
-PROG_RPATH=$(KRB5_LIBDIR)
 
 STLIBOBJS= des_keys.o
 
index fd0335f43622ff0028c4a89142c28ba318e7eca3..89a02af4c1dcc10e593f0ec981fea1246fe47ead 100644 (file)
@@ -1,10 +1,6 @@
 mydir=lib$(S)crypto$(S)openssl$(S)enc_provider
 BUILDTOP=$(REL)..$(S)..$(S)..$(S)..
 LOCALINCLUDES = -I$(srcdir)/../../krb -I$(srcdir)/..
-DEFS=
-
-PROG_LIBPATH=-L$(TOPLIBD)
-PROG_RPATH=$(KRB5_LIBDIR)
 
 STLIBOBJS= \
        des.o   \
index 47dfe72f3721713107aceec4f6d5b3cd39eb152f..647137143d7ba5afb83511aab00d44532f273f9e 100644 (file)
@@ -1,10 +1,6 @@
 mydir=lib$(S)crypto$(S)openssl$(S)hash_provider
 BUILDTOP=$(REL)..$(S)..$(S)..$(S)..
 LOCALINCLUDES = -I$(srcdir)/../../krb -I$(srcdir)/..
-DEFS=
-
-PROG_LIBPATH=-L$(TOPLIBD)
-PROG_RPATH=$(KRB5_LIBDIR)
 
 STLIBOBJS= \
        hash_crc32.o    \
index 0b9569000599b6b4343e5bb5b6e9e567f2ccd513..d2bde76cd13c75aab0e1a4914ec895cf9acc937c 100644 (file)
@@ -1,21 +1,2 @@
 mydir=lib$(S)crypto$(S)openssl$(S)md4
 BUILDTOP=$(REL)..$(S)..$(S)..$(S)..
-LOCALINCLUDES =
-DEFS=
-
-STLIBOBJS=
-
-OBJS=
-
-SRCS=
-
-all-unix:: all-libobjs
-
-includes:: depend
-
-depend:: $(SRCS)
-
-clean-unix:: clean-libobjs
-
-@libobj_frag@
-
index 4128e98c5b8a7080e3b6c9619036b5ccad7c6a61..94d10b9abcb8abecae7d60fa26cbe8b73083513a 100644 (file)
@@ -1,20 +1,2 @@
 mydir=lib$(S)crypto$(S)openssl$(S)md5
 BUILDTOP=$(REL)..$(S)..$(S)..$(S)..
-DEFS=
-
-STLIBOBJS=
-
-OBJS=
-
-SRCS=
-
-all-unix:: all-libobjs
-
-includes:: depend
-
-depend:: $(SRCS)
-
-clean-unix:: clean-libobjs
-
-@libobj_frag@
-
index 08fe83080eafa4c2f7c209e44191cac95b24ec60..536cc9b34e471fa13c0bb71743a3fe979ce68c31 100644 (file)
@@ -1,20 +1,2 @@
 mydir=lib$(S)crypto$(S)openssl$(S)sha1
 BUILDTOP=$(REL)..$(S)..$(S)..$(S)..
-DEFS=
-
-STLIBOBJS=
-
-OBJS=
-
-SRCS=
-
-all-unix:: all-libobjs
-
-includes:: depend
-
-depend:: $(SRCS)
-
-clean-unix:: clean-libobjs
-
-@libobj_frag@
-
index 6df0e0d44eb96fcdc5c841d3b46eabc2d545edb1..f68710e4f6eca38dc8fe2e9d0df85fdce44ec06a 100644 (file)
@@ -1,24 +1,2 @@
-# Nothing here!  But we can't remove this directory as the build
-# system currently assumes that all modules have the same directory
-# structure.
-
 mydir=lib$(S)crypto$(S)openssl$(S)aes
 BUILDTOP=$(REL)..$(S)..$(S)..$(S)..
-LOCALINCLUDES=
-DEFS=
-
-STLIBOBJS=
-
-OBJS=
-
-SRCS=
-
-all-unix:: all-libobjs 
-
-includes:: depend
-
-depend:: $(SRCS)
-
-clean-unix:: clean-libobjs
-
-@libobj_frag@
index 403834371e3840b1003ebe8c44530cf70481ef2c..8d204b5623545a85dad68e53e843c57e354b968d 100644 (file)
@@ -1,7 +1,7 @@
 mydir=lib$(S)gssapi
 BUILDTOP=$(REL)..$(S)..
 SUBDIRS= generic krb5 spnego mechglue
-DEFS=-D_GSS_STATIC_LINK=1
+DEFINES=-D_GSS_STATIC_LINK=1
 
 ##DOSLIBNAME=$(OUTPRE)gssapi.lib
 ##DOSOBJFILELIST=@$(OUTPRE)mechglue.lst @$(OUTPRE)spnego.lst @$(OUTPRE)generic.lst @$(OUTPRE)krb5.lst # @$(OUTPRE)gssapi.lst
@@ -28,8 +28,6 @@ SUBDIROBJLISTS=generic/OBJS.ST mechglue/OBJS.ST krb5/OBJS.ST spnego/OBJS.ST
 SHLIB_EXPDEPS=\
        $(KRB5_DEPLIB) $(CRYPTO_DEPLIB) $(SUPPORT_DEPLIB) $(COM_ERR_DEPLIB)
 SHLIB_EXPLIBS=-lkrb5 -lk5crypto -lcom_err $(SUPPORT_LIB) $(DL_LIB) $(LIBS)
-SHLIB_DIRS=-L$(TOPLIBD)
-SHLIB_RDIRS=$(KRB5_LIBDIR)
 RELDIR=gssapi
 
 all-unix:: all-liblinks @MAINT@ verify-calling-conventions-gssapi
index 39e51503634f9999c8b181317e3b4bb6c46a39d9..40c6772856842c9ae459d26114355324dff2e8c2 100644 (file)
@@ -1,7 +1,6 @@
 mydir=lib$(S)gssapi$(S)generic
 BUILDTOP=$(REL)..$(S)..$(S)..
 LOCALINCLUDES = -I. -I$(srcdir) -I$(srcdir)/..
-DEFS=
 
 ##DOS##BUILDTOP = ..\..\..
 ##DOS##PREFIXDIR=generic
index 3954e87f578ad3250419dc8b6f74fa7cea37f522..1e77ea85c6d5e1b8379783c5524945d1a333b257 100644 (file)
@@ -1,23 +1,18 @@
 mydir=lib$(S)gssapi$(S)krb5
 BUILDTOP=$(REL)..$(S)..$(S)..
 LOCALINCLUDES = -I. -I$(srcdir) -I$(srcdir)/.. -I../generic -I$(srcdir)/../generic -I../mechglue -I$(srcdir)/../mechglue
-DEFS=-D_GSS_STATIC_LINK=1
+DEFINES=-D_GSS_STATIC_LINK=1
 
-#PROG_LIBPATH=-L$(TOPLIBD)
-#PROG_RPATH=$(KRB5_LIBDIR)
 #MODULE_INSTALL_DIR = $(GSS_MODULE_DIR)
 #LIBBASE=mech_krb5
 #LIBMAJOR=0
 #LIBMINOR=0
-#SO_EXT=.so
 #LIBINITFUNC=gss_krb5int_init
 #LIBFINIFUNC=gss_krb5int_fini
 #STOBJLISTS=../generic/OBJS.ST OBJS.ST
 #SUBDIROBJLISTS=../generic/OBJS.ST
 #SHLIB_EXPDEPS=$(KRB5_DEPLIB) $(CRYPTO_DEPLIB) $(SUPPORT_DEPLIB) $(COM_ERR_DEPLIB)
 #SHLIB_EXPLIBS=-lkrb5 -lk5crypto -lcom_err $(SUPPORT_LIB) $(DL_LIB) $(LIBS)
-#SHLIB_DIRS=-L$(TOPLIBD)
-#SHLIB_RDIRS=$(KRB5_LIBDIR)
 #RELDIR=gssapi/krb5
 
 ##DOS##BUILDTOP = ..\..\..
index 9987d156bfee8bf2f91dc800556c8a2319bef837..b85b21ddb017775d8051fe1207c6e6052acb3758 100644 (file)
@@ -1,7 +1,7 @@
 mydir=lib$(S)gssapi$(S)mechglue
 BUILDTOP=$(REL)..$(S)..$(S)..
 LOCALINCLUDES = -I. -I$(srcdir) -I$(srcdir)/.. -I../generic -I$(srcdir)/../generic -I../krb5 -I$(srcdir)/../krb5 -I../spnego -I$(srcdir)/../spnego
-DEFS=-D_GSS_STATIC_LINK=1
+DEFINES=-D_GSS_STATIC_LINK=1
 
 ##DOSBUILDTOP = ..\..\..
 ##DOS##PREFIXDIR=mechglue
index 49f67abc5f0e8231bce7fcfd5ae16bcb445e1b45..f323d91add2510d2c63d9c85003d9e901b15a27d 100644 (file)
@@ -1,7 +1,7 @@
 mydir=lib$(S)gssapi$(S)spnego
 BUILDTOP=$(REL)..$(S)..$(S)..
 LOCALINCLUDES = -I. -I$(srcdir) -I$(srcdir)/.. -I../generic -I$(srcdir)/../generic -I../mechglue -I$(srcdir)/../mechglue
-DEFS=-D_GSS_STATIC_LINK=1
+DEFINES=-D_GSS_STATIC_LINK=1
 
 ##DOS##BUILDTOP = ..\..\..
 ##DOS##PREFIXDIR=spnego
index 92085175feef3a9c88e81e4d9537c2ebb97c4ea1..24e1381df4444585ba9519fab0b4791ccc741025 100644 (file)
@@ -1,7 +1,6 @@
 mydir=lib$(S)kadm5
 BUILDTOP=$(REL)..$(S)..
 SUBDIRS = clnt srv unit-test
-DEFS=
 
 ##DOSBUILDTOP = ..\..
 
index 3588a86b5da7ef1247bdd3b7c82fab6520d3e276..28d66aeac6aac9ff6b87c399017ff98e10402427 100644 (file)
@@ -1,7 +1,6 @@
 mydir=lib$(S)kadm5$(S)clnt
 BUILDTOP=$(REL)..$(S)..$(S)..
 LOCALINCLUDES = -I$(BUILDTOP)/include/kadm5
-DEFS=
 
 LIBBASE=kadm5clnt_mit
 LIBMAJOR=9
@@ -14,8 +13,6 @@ SHLIB_EXPDEPS=\
        $(TOPLIBD)/libk5crypto$(SHLIBEXT) \
        $(COM_ERR_DEPLIB) $(SUPPORT_LIBDEP)
 SHLIB_EXPLIBS=-lgssrpc -lgssapi_krb5 -lkrb5 -lk5crypto $(SUPPORT_LIB) -lcom_err $(LIBS)
-SHLIB_DIRS=-L$(TOPLIBD)
-SHLIB_RDIRS=$(KRB5_LIBDIR)
 RELDIR=kadm5/clnt
 
 ##DOSBUILDTOP = ..\..\..
index ccf9ec3449b746494a90b41b71e68b6e9d2ba499..26c52374868bd5243001eaf3b0b5292ec1d5cb33 100644 (file)
@@ -4,7 +4,6 @@ LOCALINCLUDES = -I$(BUILDTOP)/include/kadm5 \
        -I$(top_srcdir)/lib/gssapi/krb5 -I$(top_srcdir)/lib/gssapi/generic \
        -I$(BUILDTOP)/lib/gssapi/krb5 -I$(BUILDTOP)/lib/gssapi/generic
 DEFINES = @HESIOD_DEFS@
-DEFS=
 
 ##DOSBUILDTOP = ..\..\..
 ##DOSLIBNAME = libkadm5srv.lib
@@ -23,8 +22,6 @@ SHLIB_EXPDEPS=\
        $(COM_ERR_DEPLIB) $(SUPPORT_LIBDEP)
 SHLIB_EXPLIBS =        -lgssrpc -lgssapi_krb5 -lkdb5 $(KDB5_DB_LIB) \
                -lkrb5 -lk5crypto $(SUPPORT_LIB) -lcom_err @GEN_LIB@ $(LIBS)
-SHLIB_DIRS=-L$(TOPLIBD)
-SHLIB_RDIRS=$(KRB5_LIBDIR)
 RELDIR=kadm5/srv
 
 SRCS = $(srcdir)/pwqual.c \
index f8d7b78479354ccb1ad6622aa6bf323229dfb3f3..49fc3ae2d9593faf66ff006bbc5ceecd99ff78c2 100644 (file)
@@ -1,10 +1,6 @@
 mydir=lib$(S)kadm5$(S)unit-test
 BUILDTOP=$(REL)..$(S)..$(S)..
-DEFINES =
-PROG_LIBPATH=-L$(TOPLIBD)
-PROG_RPATH=$(KRB5_LIBDIR)
 KDB_DEP_LIB=$(DL_LIB) $(THREAD_LINKOPTS)
-DEFS=
 
 SRCS= init-test.c destroy-test.c handle-test.c iter-test.c setkey-test.c \
        randkey-test.c lock-test.c
index 42b6b85931e646ae77fbc0520f4a15a676905bbe..826b1de9fb6ec56ce2559489e623170da7ee3c03 100644 (file)
@@ -1,13 +1,7 @@
 mydir=lib$(S)kdb
 BUILDTOP=$(REL)..$(S)..
-RUN_SETUP = @KRB5_RUN_ENV@
-KRB5_RUN_ENV = @KRB5_RUN_ENV@
-KRB5_CONFIG_SETUP = KRB5_CONFIG=$(top_srcdir)/config-files/krb5.conf ; export KRB5_CONFIG ;
-PROG_LIBPATH=-L$(TOPLIBD)
-PROG_RPATH=$(KRB5_LIBDIR)
-CFLAGS=@CFLAGS@ -DKDB5_USE_LIB_KDB_DB2
+DEFINES= -DKDB5_USE_LIB_KDB_DB2
 LOCALINCLUDES= -I.
-DEFS=
 
 # Keep LIBMAJOR in sync with KRB5_KDB_API_VERSION in include/kdb.h.
 LIBBASE=kdb5
@@ -23,8 +17,6 @@ SHLIB_EXPDEPS = \
        $(TOPLIBD)/libgssrpc$(SHLIBEXT) \
        $(TOPLIBD)/libkrb5$(SHLIBEXT)
 SHLIB_EXPLIBS=-lgssrpc -lkrb5 -lk5crypto -lcom_err $(SUPPORT_LIB) $(DL_LIB) $(LIBS)
-SHLIB_DIRS=-L$(TOPLIBD)
-SHLIB_RDIRS=$(KRB5_LIBDIR)
 
 adb_err.$(OBJEXT): adb_err.c
 adb_err.c adb_err.h: $(srcdir)/adb_err.et
@@ -41,7 +33,6 @@ SRCS= \
        $(srcdir)/kdb_log.c \
        $(srcdir)/keytab.c
 
-STOBJLISTS=OBJS.ST
 STLIBOBJS= \
        kdb5.o \
        encrypt_key.o \
index a63270a212e578afc65341b5eb7dd34a45439e84..d9cddc1c6155e697b82ab07ac272bcf13a597049 100644 (file)
@@ -3,7 +3,7 @@ BUILDTOP=$(REL)..$(S)..
 LOCALINCLUDES = -I$(srcdir)/ccache -I$(srcdir)/keytab -I$(srcdir)/rcache -I$(srcdir)/os -I$(srcdir)/unicode
 SUBDIRS= error_tables asn.1 ccache keytab krb os rcache unicode
 WINSUBDIRS= $(SUBDIRS) posix
-DEFS=-DLOCALEDIR=\"$(KRB5_LOCALEDIR)\"
+DEFINES=-DLOCALEDIR=\"$(KRB5_LOCALEDIR)\"
 
 ##DOSBUILDTOP = ..\..
 ##DOSLIBNAME=$(OUTPRE)krb5.lib
@@ -57,8 +57,6 @@ SHLIB_EXPDEPS = \
        $(TOPLIBD)/libk5crypto$(SHLIBEXT) \
        $(COM_ERR_DEPLIB) $(SUPPORT_DEPLIB)
 SHLIB_EXPLIBS=-lk5crypto -lcom_err $(SUPPORT_LIB) @GEN_LIB@ $(LIBS)
-SHLIB_DIRS=-L$(TOPLIBD)
-SHLIB_RDIRS=$(KRB5_LIBDIR)
 
 all-unix:: all-liblinks
 
index cbef50e689b762ed7df4e5a47122b50a2f16b4f1..3028085275e1c3fab0b858de8d1b7887b52737bd 100644 (file)
@@ -1,6 +1,5 @@
 mydir=lib$(S)krb5$(S)asn.1
 BUILDTOP=$(REL)..$(S)..$(S)..
-DEFS=
 
 ##DOS##BUILDTOP = ..\..\..
 ##DOS##PREFIXDIR=asn.1
index f64226b1e70a1df7ad485ca5cf51ef85c2ea76d7..1b62e8125a423a3305c8c1a3c7cb31924884603d 100644 (file)
@@ -2,12 +2,7 @@ mydir=lib$(S)krb5$(S)ccache
 BUILDTOP=$(REL)..$(S)..$(S)..
 SUBDIRS = # ccapi
 WINSUBDIRS = ccapi
-DEFS=
-##WIN32##DEFS=$(DEFS) -DUSE_CCAPI -DUSE_CCAPI_V3
-
-RUN_SETUP = @KRB5_RUN_ENV@
-PROG_LIBPATH=-L$(TOPLIBD)
-PROG_RPATH=$(KRB5_LIBDIR)
+##WIN32##DEFINES = -DUSE_CCAPI -DUSE_CCAPI_V3
 
 LOCALINCLUDES = -I$(srcdir)$(S)ccapi $(WIN_INCLUDES)
 
index 29f3b9265360027446a92abd2ee7857362f4d9fe..cca858c919f5c45fc1ba79ee69bd7cc87b00a063 100644 (file)
@@ -1,7 +1,7 @@
 mydir=lib$(S)krb5$(S)ccache$(S)ccapi
 BUILDTOP=$(REL)..$(S)..$(S)..$(S)..
 LOCALINCLUDES = $(WIN_INCLUDES)
-DEFS= -DUSE_CCAPI -DUSE_CCAPI_V3
+DEFINES= -DUSE_CCAPI -DUSE_CCAPI_V3
 
 ##DOS##WIN_INCLUDES = -I$(top_srcdir)\windows\lib
 
index eb890d196ad4c341cccb11a2fa8e94117ae386f3..2f86dea24ba9f69ff2bcd99fa7864c645b193e90 100644 (file)
@@ -1,6 +1,5 @@
 mydir=lib$(S)krb5$(S)error_tables
 BUILDTOP=$(REL)..$(S)..$(S)..
-DEFS=
 
 ##DOS##BUILDTOP = ..\..\..
 ##DOS##PREFIXDIR=error_tables
index ccb4a6a2a6fae7ac5c79827ab3cfd5d9c144056a..d586ee09f6de84ac761f1ee5feaa5c649e65b746 100644 (file)
@@ -1,10 +1,5 @@
 mydir=lib$(S)krb5$(S)keytab
 BUILDTOP=$(REL)..$(S)..$(S)..
-DEFS=
-
-RUN_SETUP = @KRB5_RUN_ENV@
-PROG_LIBPATH=-L$(TOPLIBD)
-PROG_RPATH=$(KRB5_LIBDIR)
 
 ##DOS##BUILDTOP = ..\..\..
 ##DOS##PREFIXDIR=keytab
index 537d717777e0e55e15870ab02d8a43947195d42b..d5db2749ba903c98ded0a24f513e12ad95df36ee 100644 (file)
@@ -1,10 +1,7 @@
 mydir=lib$(S)krb5$(S)krb
 BUILDTOP=$(REL)..$(S)..$(S)..
-RUN_SETUP = @KRB5_RUN_ENV@
-PROG_LIBPATH=-L$(TOPLIBD)
-PROG_RPATH=$(KRB5_LIBDIR)
 LOCALINCLUDES = -I$(srcdir)/../os -I$(top_srcdir)
-DEFS=-DLIBDIR=\"$(KRB5_LIBDIR)\" -DDYNOBJEXT=\"$(DYNOBJEXT)\"
+DEFINES=-DLIBDIR=\"$(KRB5_LIBDIR)\" -DDYNOBJEXT=\"$(DYNOBJEXT)\"
 
 ##DOS##BUILDTOP = ..\..\..
 ##DOS##PREFIXDIR=krb
index 6a0961990cd1ade10fb34ff0ec12086f22a59cc8..0353a8476af63cc9af09f76f6ab0fc44b65e3111 100644 (file)
@@ -1,9 +1,5 @@
 mydir=lib$(S)krb5$(S)os
 BUILDTOP=$(REL)..$(S)..$(S)..
-KRB5_RUN_ENV = @KRB5_RUN_ENV@
-PROG_LIBPATH=-L$(TOPLIBD)
-PROG_RPATH=$(KRB5_LIBDIR)
-DEFS=
 DEFINES=-DLIBDIR=\"$(KRB5_LIBDIR)\" -DBINDIR=\"$(CLIENT_BINDIR)\" \
        -DSBINDIR=\"$(ADMIN_BINDIR)\"
 LOCALINCLUDES=-I$(top_srcdir)/util/profile
@@ -195,7 +191,7 @@ check-unix:: check-unix-stdconf check-unix-locate check-unix-trace \
 
 check-unix-stdconf:: t_std_conf
        KRB5_CONFIG=$(srcdir)/td_krb5.conf ; export KRB5_CONFIG ;\
-       $(KRB5_RUN_ENV) $(VALGRIND) ./t_std_conf  -d -s NEW.DEFAULT.REALM -d \
+       $(RUN_SETUP) $(VALGRIND) ./t_std_conf  -d -s NEW.DEFAULT.REALM -d \
                -D DEFAULT_REALM.TST -r bad.idea -r itar.bad.idea \
                -r really.BAD.IDEA. -r clipper.bad.idea -r KeYEsCrOW.BaD.IDea \
                -r pgp.good.idea -r no_domain > test.out
@@ -215,7 +211,7 @@ check-unix-locate:: t_locate_kdc
            if $(DIG) $(SRVNAME) srv | grep -i $(DIGPAT) || \
                $(NSLOOKUP) -q=srv $(SRVNAME) | grep -i $(NSPAT); then \
                KRB5_CONFIG=$(srcdir)/td_krb5.conf ; export KRB5_CONFIG ;\
-               $(KRB5_RUN_ENV) $(VALGRIND) ./t_locate_kdc $(LOCREALM); \
+               $(RUN_SETUP) $(VALGRIND) ./t_locate_kdc $(LOCREALM); \
            else \
                echo '*** WARNING: skipped t_locate_kdc test: known DNS name not found'; \
            fi; \
@@ -226,15 +222,15 @@ check-unix-locate:: t_locate_kdc
 check-unix-trace:: t_trace
        rm -f t_trace.out
        KRB5_TRACE=t_trace.out ; export KRB5_TRACE ; \
-       $(KRB5_RUN_ENV) $(VALGRIND) ./t_trace
+       $(RUN_SETUP) $(VALGRIND) ./t_trace
        sed -e 's/^[^:]*: //' t_trace.out | cmp - $(srcdir)/t_trace.ref
        rm -f t_trace.out
 
 check-unix-expand:: t_expand_path
-       $(KRB5_RUN_ENV) $(VALGRIND) ./t_expand_path '%{null}' ''
-       $(KRB5_RUN_ENV) $(VALGRIND) ./t_expand_path ' %{BINDIR}%{LIBDIR} ' \
+       $(RUN_SETUP) $(VALGRIND) ./t_expand_path '%{null}' ''
+       $(RUN_SETUP) $(VALGRIND) ./t_expand_path ' %{BINDIR}%{LIBDIR} ' \
                ' $(CLIENT_BINDIR)$(KRB5_LIBDIR) '
-       $(KRB5_RUN_ENV) $(VALGRIND) ./t_expand_path \
+       $(RUN_SETUP) $(VALGRIND) ./t_expand_path \
                'the %{animal}%{s} on the %{place}%{s}' \
                'the frogs on the pads'
 
index 0d835a949e0535d40900d271af7dc18f151d89d0..38b399a98a3b58230df39226b1199a7310a3e08e 100644 (file)
@@ -1,6 +1,5 @@
 mydir=posix
 BUILDTOP=$(REL)..$(S)..$(S)..
-DEFS=
 
 ##DOS##BUILDTOP = ..\..\..
 ##DOS##PREFIXDIR=posix
index 83e7096705d7232cfbfc570318c76c458d58866d..b6095cdf039d057353c36aedf14b41bd62f9f30c 100644 (file)
@@ -1,8 +1,5 @@
 mydir=lib$(S)krb5$(S)rcache
 BUILDTOP=$(REL)..$(S)..$(S)..
-PROG_LIBPATH=-L$(TOPLIBD)
-PROG_RPATH=$(KRB5_LIBDIR)
-DEFS=
 
 ##DOS##BUILDTOP = ..\..\..
 ##DOS##PREFIXDIR=rcache
index 63e08c9dfea4011e84c19705efabf413dd0d533e..9a4fb97d4e5114bc50b8cab3a79601485c04905e 100644 (file)
@@ -1,11 +1,5 @@
 mydir=lib$(S)krb5$(S)unicode
 BUILDTOP=$(REL)..$(S)..$(S)..
-KRB5_RUN_ENV = @KRB5_RUN_ENV@
-PROG_LIBPATH=-L$(TOPLIBD)
-PROG_RPATH=$(KRB5_LIBDIR)
-DEFS=
-DEFINES=-DLIBDIR=\"$(KRB5_LIBDIR)\"
-LOCALINCLUDES=
 
 ##DOS##BUILDTOP = ..\..\..
 ##DOS##PREFIXDIR=unicode
index dc142ba8615b70331492374dac19091b84804168..745d22d5054ce9d658c29d920ac00187a71c5723 100644 (file)
@@ -1,7 +1,6 @@
 mydir=lib$(S)rpc
 BUILDTOP=$(REL)..$(S)..
 DEFINES = -DGSSAPI_KRB5 -DDEBUG_GSSAPI=0 -DGSSRPC__IMPL
-DEFS=
 
 SUBDIRS=unit-test
 
@@ -11,15 +10,12 @@ SUBDIRS=unit-test
 LIBBASE=gssrpc
 LIBMAJOR=4
 LIBMINOR=1
-STOBJLISTS=OBJS.ST
 SHLIB_EXPDEPS= \
        $(TOPLIBD)/libgssapi_krb5$(SHLIBEXT) \
        $(TOPLIBD)/libkrb5$(SHLIBEXT) \
        $(TOPLIBD)/libk5crypto$(SHLIBEXT) \
        $(COM_ERR_DEPLIB)
 SHLIB_EXPLIBS=-lgssapi_krb5 -lkrb5 -lk5crypto -lcom_err $(LIBS)
-SHLIB_DIRS=-L$(TOPLIBD)
-SHLIB_RDIRS=$(KRB5_LIBDIR)
 RELDIR=rpc
 
 SRCS = $(srcdir)/auth_none.c \
index 0642e53def37c60e3b971f66f68e0af5965cf0a8..b72487c68711f9fb6c383c2a7e93cb243665e5b3 100644 (file)
@@ -1,9 +1,5 @@
 mydir=lib$(S)rpc$(S)unit-test
 BUILDTOP=$(REL)..$(S)..$(S)..
-LOCALINCLUDES = -I.
-PROG_LIBPATH=-L$(TOPLIBD)
-PROG_RPATH=$(KRB5_LIBDIR)
-DEFS=
 
 OBJS= client.o rpc_test_clnt.o rpc_test_svc.o server.o
 SRCS= client.c rpc_test_clnt.c rpc_test_svc.c server.c
index ce70925cf05762ccbba8bc180a79eafcd9a6030b..f204e2f3a97c13200a1f96098cd2ac20ba153c22 100644 (file)
@@ -1,26 +1,15 @@
 mydir=plugins$(S)authdata$(S)greet
 BUILDTOP=$(REL)..$(S)..$(S)..
-KRB5_RUN_ENV = @KRB5_RUN_ENV@
-KRB5_CONFIG_SETUP = KRB5_CONFIG=$(top_srcdir)/config-files/krb5.conf ; export KRB5_CONFIG ;
-PROG_LIBPATH=-L$(TOPLIBD)
-PROG_RPATH=$(KRB5_LIBDIR)
 MODULE_INSTALL_DIR = $(KRB5_AD_MODULE_DIR)
-DEFS=@DEFS@
-
-LOCALINCLUDES = -I../../../include/krb5
 
 LIBBASE=greet
 LIBMAJOR=0
 LIBMINOR=0
-SO_EXT=.so
 #RELDIR=../plugins/preauth/wpse
 # Depends on nothing
 SHLIB_EXPDEPS =
 SHLIB_EXPLIBS=
 
-SHLIB_DIRS=-L$(TOPLIBD)
-SHLIB_RDIRS=$(KRB5_LIBDIR)
-STOBJLISTS=OBJS.ST
 STLIBOBJS= greet_auth.o
 
 SRCS=  greet_auth.c
@@ -29,9 +18,6 @@ all-unix:: all-libs
 install-unix:: install-libs
 clean-unix:: clean-libs clean-libobjs
 
-clean::
-       $(RM) lib$(LIBBASE)$(SO_EXT)
-
 @libnover_frag@
 @libobj_frag@
 
index 74e4bf42a9a3db64c899dc485cc8fe9828eeb9da..7f7277b1012f42e9d67ea324512356ef5564d6dc 100644 (file)
@@ -1,25 +1,13 @@
 mydir=plugins$(S)authdata$(S)greet_client
 BUILDTOP=$(REL)..$(S)..$(S)..
-KRB5_RUN_ENV = @KRB5_RUN_ENV@
-KRB5_CONFIG_SETUP = KRB5_CONFIG=$(top_srcdir)/config-files/krb5.conf ; export KRB5_CONFIG ;
-PROG_LIBPATH=-L$(TOPLIBD)
-PROG_RPATH=$(KRB5_LIBDIR)
 MODULE_INSTALL_DIR = $(KRB5_AD_MODULE_DIR)
-DEFS=@DEFS@
-
-LOCALINCLUDES = -I../../../include/krb5
 
 LIBBASE=greet_client
 LIBMAJOR=0
 LIBMINOR=0
-SO_EXT=.so
 SHLIB_EXPDEPS = $(TOPLIBD)/libk5crypto$(SHLIBEXT) \
        $(TOPLIBD)/libkrb5$(SHLIBEXT)
 SHLIB_EXPLIBS= -lkrb5 -lcom_err -lk5crypto $(SUPPORT_LIB) $(LIBS)
-
-SHLIB_DIRS=-L$(TOPLIBD)
-SHLIB_RDIRS=$(KRB5_LIBDIR)
-STOBJLISTS=OBJS.ST
 STLIBOBJS= greet.o
 
 SRCS=  greet.c
@@ -28,9 +16,6 @@ all-unix:: all-libs
 install-unix:: install-libs
 clean-unix:: clean-libs clean-libobjs
 
-clean::
-       $(RM) lib$(LIBBASE)$(SO_EXT)
-
 @libnover_frag@
 @libobj_frag@
 
index 40b1856bb44fd7fa2a14a02120b24ac897a65e67..598ee1fa30b6c4246790fbe3f4cb1b8bc071460e 100644 (file)
@@ -1,25 +1,14 @@
 mydir=plugins$(S)authdata$(S)greet_server
 BUILDTOP=$(REL)..$(S)..$(S)..
-KRB5_RUN_ENV = @KRB5_RUN_ENV@
-KRB5_CONFIG_SETUP = KRB5_CONFIG=$(top_srcdir)/config-files/krb5.conf ; export KRB5_CONFIG ;
-PROG_LIBPATH=-L$(TOPLIBD)
-PROG_RPATH=$(KRB5_LIBDIR)
 MODULE_INSTALL_DIR = $(KRB5_AD_MODULE_DIR)
-DEFS=@DEFS@
-
-LOCALINCLUDES = -I../../../include/krb5
 
 LIBBASE=greet_server
 LIBMAJOR=1
 LIBMINOR=0
-SO_EXT=.so
 SHLIB_EXPDEPS = $(TOPLIBD)/libk5crypto$(SHLIBEXT) \
        $(TOPLIBD)/libkrb5$(SHLIBEXT)
 SHLIB_EXPLIBS= -lkrb5 -lcom_err -lk5crypto $(SUPPORT_LIB) $(LIBS)
 
-SHLIB_DIRS=-L$(TOPLIBD)
-SHLIB_RDIRS=$(KRB5_LIBDIR)
-STOBJLISTS=OBJS.ST
 STLIBOBJS= greet_auth.o
 
 SRCS=  greet_auth.c
@@ -28,9 +17,6 @@ all-unix:: all-libs
 install-unix:: install-libs
 clean-unix:: clean-libs clean-libobjs
 
-clean::
-       $(RM) lib$(LIBBASE)$(SO_EXT)
-
 @libnover_frag@
 @libobj_frag@
 
index 17ca2420428f5d8ec17f02a49f579f4a83326028..617371da34186b0f63e206836e27867329d19741 100644 (file)
@@ -1,17 +1,9 @@
 mydir=plugins$(S)kadm5_hook$(S)test
 BUILDTOP=$(REL)..$(S)..$(S)..
-KRB5_RUN_ENV = @KRB5_RUN_ENV@
-KRB5_CONFIG_SETUP = KRB5_CONFIG=$(top_srcdir)/config-files/krb5.conf ; export KRB5_CONFIG ;
-PROG_LIBPATH=-L$(TOPLIBD)
-PROG_RPATH=$(KRB5_LIBDIR)
-DEFS=@DEFS@
-
-LOCALINCLUDES = -I../../../include/krb5 -I.
 
 LIBBASE=kadm5_hook_test
 LIBMAJOR=0
 LIBMINOR=0
-SO_EXT=.so
 RELDIR=../plugins/kadm5_hook/test
 # Depends on libk5crypto and libkrb5
 SHLIB_EXPDEPS = \
@@ -19,9 +11,6 @@ SHLIB_EXPDEPS = \
        $(TOPLIBD)/libkrb5$(SHLIBEXT)
 SHLIB_EXPLIBS= -lkrb5 -lcom_err -lk5crypto $(SUPPORT_LIB) $(LIBS)
 
-SHLIB_DIRS=-L$(TOPLIBD)
-SHLIB_RDIRS=$(KRB5_LIBDIR)
-STOBJLISTS=OBJS.ST
 STLIBOBJS=main.o
 
 SRCS= $(srcdir)/main.c
@@ -30,8 +19,5 @@ all-unix:: all-libs
 install-unix::
 clean-unix:: clean-libs clean-libobjs
 
-clean::
-       $(RM) lib$(LIBBASE)$(SO_EXT)
-
 @libnover_frag@
 @libobj_frag@
index 6dd9e2ef5b3dec0391a62a6aba6f65fde401bb71..dac32752c0420590610a401b4dd74360d7a97e36 100644 (file)
@@ -1,11 +1,6 @@
 mydir=plugins$(S)kdb$(S)db2
 BUILDTOP=$(REL)..$(S)..$(S)..
-KRB5_RUN_ENV = @KRB5_RUN_ENV@
-KRB5_CONFIG_SETUP = KRB5_CONFIG=$(top_srcdir)/config-files/krb5.conf ; export KRB5_CONFIG ;
-PROG_LIBPATH=-L$(TOPLIBD)
-PROG_RPATH=$(KRB5_LIBDIR)
 MODULE_INSTALL_DIR = $(KRB5_DB_MODULE_DIR)
-DEFS=
 
 SUBDIRS= $(SUBDIRS-@DB_VERSION@)
 SUBDIRS-sys=
@@ -29,7 +24,6 @@ DB_DEPLIB-sys =
 LIBBASE=db2
 LIBMAJOR=0
 LIBMINOR=0
-SO_EXT=.so
 RELDIR=../plugins/kdb/db2
 # Depends on libk5crypto and libkrb5
 # Also on gssrpc, for xdr stuff.
@@ -39,9 +33,6 @@ SHLIB_EXPDEPS = \
        $(TOPLIBD)/libkrb5$(SHLIBEXT)
 SHLIB_EXPLIBS= $(GSSRPC_LIBS) -lkrb5 -lcom_err -lk5crypto $(KDB5_DB_LIB) $(KADMSRV_LIBS) $(SUPPORT_LIB) $(LIBS) @DB_EXTRA_LIBS@
 
-SHLIB_DIRS=-L$(TOPLIBD)
-SHLIB_RDIRS=$(KRB5_LIBDIR)
-
 DBDIR = libdb2
 DBOBJLISTS = $(DBOBJLISTS-@DB_VERSION@)
 DBOBJLISTS-sys =
@@ -74,11 +65,8 @@ clean-unix:: clean-liblinks clean-libs clean-libobjs
 
 $(DB_DEPS) $(DBOBJLISTS-k5) $(DBSHOBJLISTS): all-recurse
 
-#lib$(LIBBASE)$(SO_EXT): db2_exp.o
-#      $(CC) -shared -o $@ -L$(TOPLIBD) $^ -ldb $(SHLIB_EXPLIBS)
-
 clean::
-       $(RM) lib$(LIBBASE)$(SO_EXT) db2_exp.o .depend-verify-db
+       $(RM) .depend-verify-db
 
 @libnover_frag@
 @libobj_frag@
index d2df68c79cc8f0510f6c3d4928a0302a6ef8ecc2..0de98a9f4f438678d968950059ccaf9ee21da883 100644 (file)
@@ -15,8 +15,6 @@ HDRS =        $(HDRDIR)/db.h $(HDRDIR)/db-config.h
 
 SHLIB_EXPDEPS=$(SUPPORT_DEPLIB)
 SHLIB_EXPLIBS=$(SUPPORT_LIB) $(LIBS)
-SHLIB_DIRS=-L$(TOPLIBD)
-SHLIB_RDIRS=$(KRB5_LIBDIR)
 
 all-unix:: includes all-libs
 all-prerecurse depend-prerecurse: $(HDRS)
index 854d50d36a32298e91f3c03c97eecfbc9c0e0d59..24adcbe99616da3cfe81ed3523a6dab6aebe467e 100644 (file)
@@ -8,9 +8,6 @@ LOCALINCLUDES=  -I. -I$(srcdir)/../include -I../include -I$(srcdir)/../mpool \
                -I$(srcdir)/../btree -I$(srcdir)/../hash -I$(srcdir)/../db
 
 PROG_LIBPATH=-L.. -L$(TOPLIBD)
-PROG_RPATH=$(KRB5_LIBDIR)
-
-KRB5_RUN_ENV= @KRB5_RUN_ENV@
 
 DB_LIB         = -ldb
 DB_DEPLIB      = ../libdb$(DEPLIBEXT)
@@ -21,7 +18,7 @@ dbtest: dbtest.o $(DB_DEPLIB)
        $(CC_LINK) -o $@ dbtest.o $(STRERROR_OBJ) $(DB_LIB)
 
 check:: dbtest
-       $(KRB5_RUN_ENV) srcdir=$(srcdir) TMPDIR=$(TMPDIR) $(VALGRIND) $(FCTSH) $(srcdir)/run.test
+       $(RUN_SETUP) srcdir=$(srcdir) TMPDIR=$(TMPDIR) $(VALGRIND) $(FCTSH) $(srcdir)/run.test
 
 bttest.o: $(srcdir)/btree.tests/main.c
        $(CC) $(ALL_CFLAGS) -c $(srcdir)/btree.tests/main.c -o $@
index 12ec6fd6a355288c350a8bfadbfc6b41e8ff6391..bf52f10a7311227f74c171ce231c2004d5ca0482 100644 (file)
@@ -1,11 +1,6 @@
 mydir=plugins$(S)kdb$(S)hdb
 BUILDTOP=$(REL)..$(S)..$(S)..
-KRB5_RUN_ENV = @KRB5_RUN_ENV@
-KRB5_CONFIG_SETUP = KRB5_CONFIG=$(top_srcdir)/config-files/krb5.conf ; export KRB5_CONFIG ;
-PROG_LIBPATH=-L$(TOPLIBD)
-PROG_RPATH=$(KRB5_LIBDIR)
 MODULE_INSTALL_DIR = $(KRB5_DB_MODULE_DIR)
-DEFS=
 DB_VERSION = @DB_VERSION@
 
 LOCALINCLUDES = -I../../../lib/kdb -I$(srcdir)/../../../lib/kdb
@@ -14,7 +9,6 @@ DEFINES = -DPLUGIN -DSHLIBEXT=\"$(SHLIBEXT)\"
 LIBBASE=hdb
 LIBMAJOR=0
 LIBMINOR=0
-SO_EXT=.so
 RELDIR=../plugins/kdb/hdb
 # Depends on libk5crypto and libkrb5
 # Also on gssrpc, for xdr stuff.
@@ -25,15 +19,11 @@ SHLIB_EXPDEPS = \
        $(TOPLIBD)/libkrb5$(SHLIBEXT)
 SHLIB_EXPLIBS= $(GSSRPC_LIBS) -lkdb5 -lkrb5 -lcom_err -lk5crypto $(KDB5_DB_LIB) $(SUPPORT_LIB) $(LIBS) @DB_EXTRA_LIBS@
 
-SHLIB_DIRS=-L$(TOPLIBD)
-SHLIB_RDIRS=$(KRB5_LIBDIR)
-
 SRCS= \
        $(srcdir)/kdb_hdb.c \
        $(srcdir)/kdb_marshal.c \
        $(srcdir)/kdb_windc.c
 
-STOBJLISTS=OBJS.ST $(DBOBJLISTS)
 STLIBOBJS= \
        kdb_hdb.o \
        kdb_marshal.o \
@@ -43,11 +33,6 @@ all-unix:: all-liblinks
 install-unix:: install-libs
 clean-unix:: clean-liblinks clean-libs clean-libobjs
 
-$(DB_DEPS) $(DBOBJLISTS-k5) $(DBSHOBJLISTS): all-recurse
-
-clean::
-       $(RM) lib$(LIBBASE)$(SO_EXT)
-
 @libnover_frag@
 @libobj_frag@
 
index 36a03e2aa7a068dee46186c44b93c7d5c49c14ba..3dd4ba6bb7a75dbdc47720fd87dd29a2886cb6e3 100644 (file)
@@ -1,10 +1,5 @@
 mydir=plugins$(S)kdb$(S)ldap
 BUILDTOP=$(REL)..$(S)..$(S)..
-KRB5_RUN_ENV = @KRB5_RUN_ENV@
-KRB5_CONFIG_SETUP = KRB5_CONFIG=$(top_srcdir)/config-files/krb5.conf ; export KRB5_CONFIG ;
-PROG_LIBPATH=-L$(TOPLIBD)
-PROG_RPATH=$(KRB5_LIBDIR)
-DEFS =
 MODULE_INSTALL_DIR = $(KRB5_DB_MODULE_DIR)
 
 SUBDIRS= libkdb_ldap
@@ -15,7 +10,6 @@ LOCALINCLUDES = -I../../../lib/kdb -I$(srcdir)/../../../lib/kdb \
 LIBBASE=kldap
 LIBMAJOR=0
 LIBMINOR=0
-SO_EXT=.so
 RELDIR=../plugins/kdb/ldap
 # Depends on libk5crypto and libkrb5
 # Also on gssrpc, for xdr stuff.
@@ -26,15 +20,11 @@ SHLIB_EXPDEPS = \
        $(TOPLIBD)/libkrb5$(SHLIBEXT) \
        $(TOPLIBD)/lib$(SUPPORT_LIBNAME)$(SHLIBEXT)
 SHLIB_EXPLIBS= -lkdb_ldap $(GSSRPC_LIBS) -lkrb5 -lcom_err -lk5crypto -lkrb5support $(LIBS)
-SHLIB_DIRS=-L$(TOPLIBD)
-SHLIB_RDIRS=$(KRB5_LIBDIR)
 
 SRCS=  $(srcdir)/ldap_exp.c
 
 $(TOPLIBD)/libkdb_ldap$(SHLIBEXT) : all-recurse
 
-
-STOBJLISTS=OBJS.ST
 STLIBOBJS= ldap_exp.o
 
 all-unix:: all-liblinks
index 73a4c67866aa3ed45ed208737d1d1e20e41e2932..b9ea3390573e467ad6088653a1beba3bd21a2143 100644 (file)
@@ -1,10 +1,7 @@
 mydir=plugins$(S)kdb$(S)ldap$(S)ldap_util
 BUILDTOP=$(REL)..$(S)..$(S)..$(S)..
 DEFINES = -DKDB4_DISABLE
-DEFS=
 LOCALINCLUDES = -I. -I$(srcdir)/../libkdb_ldap -I$(top_srcdir)/lib/kdb
-PROG_LIBPATH=-L$(TOPLIBD) $(KRB4_LIBPATH)
-PROG_RPATH=$(KRB5_LIBDIR)
 #KDB_DEP_LIB=$(DL_LIB) $(THREAD_LINKOPTS)
 KDB_DEP_LIB=$(DL_LIB) -lkdb_ldap $(THREAD_LINKOPTS)
 
index fd65da8cc2c2706b1832969dbcbb67a320c68af2..d302cf2f9646ddc6446d75dfafcb23798195fa20 100644 (file)
@@ -1,9 +1,5 @@
 mydir=plugins$(S)kdb$(S)ldap$(S)libkdb_ldap
 BUILDTOP=$(REL)..$(S)..$(S)..$(S)..
-KRB5_RUN_ENV = @KRB5_RUN_ENV@
-KRB5_CONFIG_SETUP = KRB5_CONFIG=$(top_srcdir)/config-files/krb5.conf ; export KRB5_CONFIG ;
-PROG_LIBPATH=-L$(TOPLIBD)
-PROG_RPATH=$(KRB5_LIBDIR)
 # Lots of ugliness here because of duplicated symbol names.
 # Can I just punt the duplicates and import from libkdb5, or
 # is keeping them separate important?
@@ -12,7 +8,6 @@ DEFINES = \
        -Dkrb5_dbe_lookup_tl_data=kdb_ldap_dbe_lookup_tl_data \
        -Dkrb5_dbe_update_last_pwd_change=kdb_ldap_dbe_update_last_pwd_change \
        -Dkrb5_dbe_update_tl_data=kdb_ldap_dbe_update_tl_data
-DEFS=
 
 LOCALINCLUDES = -I$(top_srcdir)/lib/kdb -I$(top_srcdir)/lib/krb5/asn.1
 
@@ -28,8 +23,6 @@ SHLIB_EXPDEPS = \
        $(SUPPORT_DEPLIB) \
        $(TOPLIBD)/libkrb5$(SHLIBEXT)
 SHLIB_EXPLIBS= $(KADMSRV_LIBS) -lkrb5 -lk5crypto $(COM_ERR_LIB) $(SUPPORT_LIB) $(LDAP_LIBS) $(LIBS)
-SHLIB_DIRS=-L$(TOPLIBD)
-SHLIB_RDIRS=$(KRB5_LIBDIR)
 
 LIBINITFUNC= kldap_init_fn
 LIBFINIFUNC=
@@ -51,7 +44,6 @@ SRCS=         $(srcdir)/kdb_ldap.c \
        $(srcdir)/ldap_err.c \
        $(srcdir)/lockout.c \
 
-STOBJLISTS=OBJS.ST
 STLIBOBJS= kdb_ldap.o \
        kdb_ldap_conn.o \
        ldap_realm.o \
index fd1d6565321fedfa4fa1c84836265c7b9430fb58..c509f837bef892c1d2aa9069317eca5e2a035282 100644 (file)
@@ -1,19 +1,13 @@
 mydir=plugins$(S)localauth$(S)test
 BUILDTOP=$(REL)..$(S)..$(S)..
-PROG_LIBPATH=-L$(TOPLIBD)
-PROG_RPATH=$(KRB5_LIBDIR)
 
 LIBBASE=localauth_test
 LIBMAJOR=0
 LIBMINOR=0
-SO_EXT=.so
 RELDIR=../plugins/localauth/test
 SHLIB_EXPDEPS=$(SUPPORT_DEPLIB)
 SHLIB_EXPLIBS=$(SUPPORT_LIB) $(LIBS)
 
-SHLIB_DIRS=-L$(TOPLIBD)
-SHLIB_RDIRS=$(KRB5_LIBDIR)
-STOBJLISTS=OBJS.ST
 STLIBOBJS=main.o
 
 SRCS=$(srcdir)/main.c
@@ -22,8 +16,5 @@ all-unix:: all-libs
 install-unix::
 clean-unix:: clean-libs clean-libobjs
 
-clean::
-       $(RM) lib$(LIBBASE)$(SO_EXT)
-
 @libnover_frag@
 @libobj_frag@
index 5b5484026b08785838295d9ad7321930edddbc24..38bed860e92df375e792227375dda75c7ac96268 100644 (file)
@@ -4,19 +4,14 @@ BUILDTOP=$(REL)..$(S)..$(S)..
 LIBBASE=python
 LIBMAJOR=0
 LIBMINOR=0
-SO_EXT=.so
 RELDIR=../plugins/locate/python
 MODULE_INSTALL_DIR = $(KRB5_LIBKRB5_MODULE_DIR)
 
 SHLIB_EXPDEPS= $(KRB5_DEPLIB) $(SUPPORT_DEPLIB)
 SHLIB_EXPLIBS= @PYTHON_LIB@ $(KRB5_LIB) $(SUPPORT_LIB)
 
-SHLIB_DIRS=-L$(TOPLIBD)
-SHLIB_RDIRS=$(KRB5_LIBDIR)
-
 SRCS= \
        $(srcdir)/py-locate.c
-STOBJLISTS=OBJS.ST
 STLIBOBJS= py-locate.o
 
 all-unix:: all-liblinks
index 82c5a7b047c6da0e9f8642204f68de1cd17b7d3b..0db924e62736794cec43a0bba6bc317af683bc5b 100644 (file)
@@ -1,18 +1,10 @@
 mydir=plugins$(S)preauth$(S)cksum_body
 BUILDTOP=$(REL)..$(S)..$(S)..
-KRB5_RUN_ENV = @KRB5_RUN_ENV@
-KRB5_CONFIG_SETUP = KRB5_CONFIG=$(top_srcdir)/config-files/krb5.conf ; export KRB5_CONFIG ;
-PROG_LIBPATH=-L$(TOPLIBD)
-PROG_RPATH=$(KRB5_LIBDIR)
 MODULE_INSTALL_DIR = $(KRB5_PA_MODULE_DIR)
-DEFS=@DEFS@
-
-LOCALINCLUDES = -I../../../include/krb5 -I.
 
 LIBBASE=cksum_body
 LIBMAJOR=0
 LIBMINOR=0
-SO_EXT=.so
 RELDIR=../plugins/preauth/cksum_body
 # Depends on libk5crypto and libkrb5
 SHLIB_EXPDEPS = \
@@ -20,9 +12,6 @@ SHLIB_EXPDEPS = \
        $(TOPLIBD)/libkrb5$(SHLIBEXT)
 SHLIB_EXPLIBS= -lkrb5 -lcom_err -lk5crypto $(SUPPORT_LIB) $(LIBS)
 
-SHLIB_DIRS=-L$(TOPLIBD)
-SHLIB_RDIRS=$(KRB5_LIBDIR)
-STOBJLISTS=OBJS.ST
 STLIBOBJS=cksum_body_main.o
 
 SRCS= $(srcdir)/cksum_body_main.c
@@ -31,9 +20,6 @@ all-unix:: $(LIBBASE)$(SO_EXT)
 install-unix:: install-libs
 clean-unix:: clean-libs clean-libobjs
 
-clean::
-       $(RM) lib$(LIBBASE)$(SO_EXT)
-
 @libnover_frag@
 @libobj_frag@
 
index 1acb83e8917cdd283d46e24556771e3e459151eb..32d010f9996f1423ccb95c12cd0f478c0bd56d4a 100644 (file)
@@ -1,19 +1,11 @@
 mydir=plugins$(S)preauth$(S)pkinit
 BUILDTOP=$(REL)..$(S)..$(S)..
-KRB5_RUN_ENV = @KRB5_RUN_ENV@
-KRB5_CONFIG_SETUP = KRB5_CONFIG=$(top_srcdir)/config-files/krb5.conf ; export KRB5_CONFIG ;
-PROG_LIBPATH=-L$(TOPLIBD)
-PROG_RPATH=$(KRB5_LIBDIR)
 MODULE_INSTALL_DIR = $(KRB5_PA_MODULE_DIR)
-DEFS=@DEFS@
-
-LOCALINCLUDES = -I../../../include/krb5 -I. $(PKINIT_CRYPTO_IMPL_CFLAGS)
-RUN_SETUP = @KRB5_RUN_ENV@
+LOCALINCLUDES = $(PKINIT_CRYPTO_IMPL_CFLAGS)
 
 LIBBASE=pkinit
 LIBMAJOR=0
 LIBMINOR=0
-SO_EXT=.so
 RELDIR=../plugins/preauth/pkinit
 # Depends on libk5crypto and libkrb5
 SHLIB_EXPDEPS = \
@@ -22,9 +14,6 @@ SHLIB_EXPDEPS = \
 SHLIB_EXPLIBS= -lkrb5 -lcom_err -lk5crypto $(PKINIT_CRYPTO_IMPL_LIBS) $(DL_LIB) $(SUPPORT_LIB) $(LIBS)
 DEFINES=-DPKINIT_DYNOBJEXT=\""$(PKINIT_DYNOBJEXT)"\"
 
-SHLIB_DIRS=-L$(TOPLIBD)
-SHLIB_RDIRS=$(KRB5_LIBDIR)
-STOBJLISTS=OBJS.ST
 STLIBOBJS= \
        pkinit_accessor.o \
        pkinit_srv.o \
@@ -53,7 +42,6 @@ install-unix:: install-libs
 clean-unix:: clean-liblinks clean-libs clean-libobjs
 
 clean::
-       $(RM) lib$(LIBBASE)$(SO_EXT)
        $(RM) pkinit_kdf_test pkinit_kdf_test.o
 
 check-unix:: pkinit_kdf_test
index fff52c7291cd75acd783ab0fedffd583e610693f..4245f8a6a681fb08edea92b854cba0a9fbe49c81 100644 (file)
@@ -1,19 +1,11 @@
 mydir=plugins$(S)preauth$(S)securid_sam2
 BUILDTOP=$(REL)..$(S)..$(S)..
-KRB5_RUN_ENV = @KRB5_RUN_ENV@
-KRB5_CONFIG_SETUP = KRB5_CONFIG=$(top_srcdir)/config-files/krb5.conf ; export KRB5_CONFIG ;
-PROG_LIBPATH=-L$(TOPLIBD)
-PROG_RPATH=$(KRB5_LIBDIR)
 MODULE_INSTALL_DIR = $(KRB5_PA_MODULE_DIR)
-DEFS=@DEFS@
 DEFINES=-DARL_SECURID_PREAUTH
 
-LOCALINCLUDES = -I../../../include/krb5 -I.
-
 LIBBASE=securid_sam2
 LIBMAJOR=0
 LIBMINOR=0
-SO_EXT=.so
 RELDIR=../plugins/preauth/securid_sam2
 # Depends on libk5crypto and libkrb5
 SHLIB_EXPDEPS = \
@@ -23,9 +15,6 @@ ACELIB= -laceclnt
 SHLIB_EXPLIBS= -lkrb5 -lcom_err -lk5crypto $(SUPPORT_LIB) $(KADMSRV_LIBS) \
        $(LIBS) $(ACELIB)
 
-SHLIB_DIRS=-L$(TOPLIBD)
-SHLIB_RDIRS=$(KRB5_LIBDIR)
-STOBJLISTS=OBJS.ST
 STLIBOBJS=securid_sam2_main.o securid2.o grail.o
 
 SRCS= $(srcdir)/securid_sam2_main.c $(srcdir)/securid2.c $(srcdir)/grail.c
@@ -34,8 +23,5 @@ all-unix:: all-libs
 install-unix:: install-libs
 clean-unix:: clean-libs clean-libobjs
 
-clean::
-       $(RM) lib$(LIBBASE)$(SO_EXT)
-
 @libnover_frag@
 @libobj_frag@
index ca6e87d7152a61d99bca425cf9e8396fc3991ca6..297be13796995d354bd97a9d9eca60baf2ea49f3 100644 (file)
@@ -1,18 +1,10 @@
 mydir=plugins$(S)preauth$(S)wpse
 BUILDTOP=$(REL)..$(S)..$(S)..
-KRB5_RUN_ENV = @KRB5_RUN_ENV@
-KRB5_CONFIG_SETUP = KRB5_CONFIG=$(top_srcdir)/config-files/krb5.conf ; export KRB5_CONFIG ;
-PROG_LIBPATH=-L$(TOPLIBD)
-PROG_RPATH=$(KRB5_LIBDIR)
 MODULE_INSTALL_DIR = $(KRB5_PA_MODULE_DIR)
-DEFS=@DEFS@
-
-LOCALINCLUDES = -I../../../include/krb5 -I.
 
 LIBBASE=wpse
 LIBMAJOR=0
 LIBMINOR=0
-SO_EXT=.so
 RELDIR=../plugins/preauth/wpse
 # Depends on libk5crypto and libkrb5
 SHLIB_EXPDEPS = \
@@ -20,20 +12,14 @@ SHLIB_EXPDEPS = \
        $(TOPLIBD)/libkrb5$(SHLIBEXT)
 SHLIB_EXPLIBS= -lkrb5 -lcom_err -lk5crypto $(SUPPORT_LIB) $(LIBS)
 
-SHLIB_DIRS=-L$(TOPLIBD)
-SHLIB_RDIRS=$(KRB5_LIBDIR)
-STOBJLISTS=OBJS.ST
 STLIBOBJS=wpse_main.o
 
 SRCS=wpse_main.c
 
-all-unix:: $(LIBBASE)$(SO_EXT)
+all-unix:: all-libs
 install-unix:: install-libs
 clean-unix:: clean-libs clean-libobjs
 
-clean::
-       $(RM) lib$(LIBBASE)$(SO_EXT)
-
 @libnover_frag@
 @libobj_frag@
 
index c4098e672f851b00edae78af9755fc397db1fc10..61e32ec73e5e040fd7a6e551a1bd76ac69c6d638 100644 (file)
@@ -1,8 +1,5 @@
 mydir=slave
 BUILDTOP=$(REL)..
-PROG_LIBPATH=-L$(TOPLIBD)
-PROG_RPATH=$(KRB5_LIBDIR)
-DEFS=
 
 all::  kprop kpropd kproplog
 
index 23684c0106fc581441c09331dd997746c1c6bcbb..2358c898b450ac985f27b9f7db2a4f8b22597291 100644 (file)
@@ -4,9 +4,6 @@ SUBDIRS = resolve asn.1 create hammer verify gssapi dejagnu shlib \
        gss-threads misc mkeystash_compat
 
 RUN_SETUP = @KRB5_RUN_ENV@ KRB5_KDC_PROFILE=kdc.conf KRB5_CONFIG=krb5.conf
-KRB5_RUN_ENV= @KRB5_RUN_ENV@
-PROG_LIBPATH=-L$(TOPLIBD)
-PROG_RPATH=$(KRB5_LIBDIR)
 
 OBJS= gcred.o hist.o kdbtest.o t_localauth.o
 EXTRADEPSRCS= gcred.c hist.c kdbtest.c t_localauth.c
index 09d39a3e095582caa8c91510f902c84db756dc19..112a55e09da4506bcfc4c0668af25f5155102db5 100644 (file)
@@ -1,11 +1,7 @@
 mydir=tests$(S)asn.1
 BUILDTOP=$(REL)..$(S)..
-PROG_LIBPATH=-L$(TOPLIBD)
-PROG_RPATH=$(KRB5_LIBDIR)
 LDAP=@LDAP@
 
-RUN_SETUP = @KRB5_RUN_ENV@
-
 SRCS= $(srcdir)/krb5_encode_test.c $(srcdir)/krb5_decode_test.c \
        $(srcdir)/krb5_decode_leak.c $(srcdir)/ktest.c \
        $(srcdir)/ktest_equal.c $(srcdir)/utility.c \
index 24870e941a030523f8bd97f4411726c3cf6c63a3..a710bfbab26700226d709cc422fb709dcf490557 100644 (file)
@@ -1,7 +1,5 @@
 mydir=tests$(S)create
 BUILDTOP=$(REL)..$(S)..
-PROG_LIBPATH=-L$(TOPLIBD)
-PROG_RPATH=$(KRB5_LIBDIR)
 SRCS=$(srcdir)/kdb5_mkdums.c
 KDB5_DEP_LIBS=$(THREAD_LINKOPTS) $(DL_LIB)
 
index 6794a91d6e9b14328fa34b778d16d9c56ef521b1..2dd831d90096f761b546670e353f66096480ffe3 100644 (file)
@@ -2,9 +2,6 @@ mydir=tests$(S)dejagnu
 BUILDTOP=$(REL)..$(S)..
 RUNTEST = @RUNTEST@ $(DEJAFLAGS)
 RUNTESTFLAGS =
-KRB5_RUN_ENV= @KRB5_RUN_ENV@
-PROG_LIBPATH=-L$(TOPLIBD)
-PROG_RPATH=$(KRB5_LIBDIR)
 
 SRCS=$(srcdir)/t_inetd.c
 
@@ -34,7 +31,7 @@ clean-unix::
        $(RM) -rf tmpdir dbg.log krb.log krb.sum
 
 runenv.vals: Makefile
-       $(KRB5_RUN_ENV) for i in $(KRB5_RUN_VARS); do \
+       $(RUN_SETUP) for i in $(RUN_VARS); do \
                eval echo "{$$i=\$$$$i}"; done > runenv.vals
 
 site.exp: runenv.vals Makefile
index 598dcf409331996023d442e0b904c83aa5482d91..5ef52bf20482927528f5ad7e78d5da564f9cc480 100644 (file)
@@ -3,8 +3,6 @@
 mydir=tests$(S)gss-threads
 BUILDTOP=$(REL)..$(S)..
 DEFINES = -DUSE_AUTOCONF_H -DGSSAPI_V2
-PROG_LIBPATH=-L$(TOPLIBD)
-PROG_RPATH=$(KRB5_LIBDIR)
 PTHREAD_LIBS=@PTHREAD_LIBS@
 
 SRCS= $(srcdir)/gss-client.c $(srcdir)/gss-misc.c $(srcdir)/gss-server.c
index 6a5870b01a1b95ccc0bd9d604299e60010bb5758..c53bda5021c77838d73d4f11d5b9e2c59d695c1c 100644 (file)
@@ -1,8 +1,6 @@
 mydir=tests$(S)gssapi
 BUILDTOP=$(REL)..$(S)..
 DEFINES = -DUSE_AUTOCONF_H
-PROG_LIBPATH=-L$(TOPLIBD)
-PROG_RPATH=$(KRB5_LIBDIR)
 
 SRCS=  $(srcdir)/t_accname.c $(srcdir)/t_ccselect.c $(srcdir)/t_credstore.c \
        $(srcdir)/t_export_cred.c $(srcdir)/t_export_name.c \
@@ -26,7 +24,7 @@ all:: ccinit ccrefresh t_accname t_ccselect t_credstore t_export_cred \
        t_spnego t_oid
 
 check-unix:: t_oid
-       $(KRB5_RUN_ENV) $(VALGRIND) ./t_oid
+       $(RUN_SETUP) $(VALGRIND) ./t_oid
 
 check-pytests:: ccinit ccrefresh t_accname t_ccselect t_credstore \
        t_export_cred t_export_name t_imp_cred t_inq_cred t_inq_mechs_name \
index c9d551568d6521cd512b1bd8d7b29d3591ca6426..d498a574c07eaf87201f0cd9be2990e74cf6d927 100644 (file)
@@ -1,7 +1,5 @@
 mydir=tests$(S)hammer
 BUILDTOP=$(REL)..$(S)..
-PROG_LIBPATH=-L$(TOPLIBD)
-PROG_RPATH=$(KRB5_LIBDIR)
 
 SRCS=$(srcdir)/kdc5_hammer.c
 
index 8a601bf0dac32278f55e7dec026ef656cec364fd..ed37359551be904d71dc21f7967f071b7d5d2b9b 100644 (file)
@@ -1,8 +1,5 @@
 mydir=tests$(S)misc
 BUILDTOP=$(REL)..$(S)..
-RUN_SETUP = @KRB5_RUN_ENV@
-PROG_LIBPATH=-L$(TOPLIBD)
-PROG_RPATH=$(KRB5_LIBDIR)
 
 OBJS=\
        test_getpw.o \
index 30a8255a4a1619eca5c11fd2fdb0dcbcc65b6481..e858f0c5e27a8e83ba7e23a8d0fc583388eb6806 100644 (file)
@@ -2,9 +2,6 @@ mydir=tests$(S)mkeystash_compat
 BUILDTOP=$(REL)..$(S)..
 
 RUN_SETUP = @KRB5_RUN_ENV@ KRB5_KDC_PROFILE=kdc.conf KRB5_CONFIG=krb5.conf
-KRB5_RUN_ENV= @KRB5_RUN_ENV@
-PROG_LIBPATH=-L$(TOPLIBD)
-PROG_RPATH=$(KRB5_LIBDIR)
 
 OBJS = bigendian.o
 SRCS = $(srcdir)/bigendian.c
index be761c8d55e905e2829cdd677a85efcdc7e10a38..6d79dcbf37d50d33c7a1259c4030d8b9154a9105 100644 (file)
@@ -1,8 +1,5 @@
 mydir=tests$(S)resolve
 BUILDTOP=$(REL)..$(S)..
-RUN_SETUP = @KRB5_RUN_ENV@
-PROG_LIBPATH=-L$(TOPLIBD)
-PROG_RPATH=$(KRB5_LIBDIR)
 
 OBJS=resolve.o addrinfo-test.o fake-addrinfo-test.o
 SRCS=$(srcdir)/resolve.c $(srcdir)/addrinfo-test.c \
index d569cacd73e54d739386dc5b6116c403c904d5c0..0401143fc7cbee262e23fb41397302ebf89ca394 100644 (file)
@@ -1,9 +1,5 @@
 mydir=tests$(S)shlib
 BUILDTOP=$(REL)..$(S)..
-PROG_LIBPATH=-L$(TOPLIBD)
-PROG_RPATH=$(KRB5_LIBDIR)
-
-RUN_SETUP = @KRB5_RUN_ENV@
 
 #VALGRIND=valgrind
 #VALGRINDFLAGS=--tool=memcheck --leak-check=yes --show-reachable=yes
index 58adde7d7dafa1b0f1bda336b2d69b7f36012c83..311e2c04f3c11c28e9c18212a69bca7629fa2f63 100644 (file)
@@ -1,9 +1,5 @@
 mydir=tests$(S)threads
 BUILDTOP=$(REL)..$(S)..
-PROG_LIBPATH=-L$(TOPLIBD)
-PROG_RPATH=$(KRB5_LIBDIR)
-
-RUN_SETUP = @KRB5_RUN_ENV@
 
 SRCS=$(srcdir)/t_rcache.c \
        $(srcdir)/gss-perf.c \
index 0849418024bb74e07939007c508b2bf88c7f2460..1c31b25b49c2231c693050cb4d49d3947680148e 100644 (file)
@@ -1,7 +1,5 @@
 mydir=tests$(S)verify
 BUILDTOP=$(REL)..$(S)..
-PROG_LIBPATH=-L$(TOPLIBD)
-PROG_RPATH=$(KRB5_LIBDIR)
 KDB5_DEP_LIB=$(THREAD_LINKOPTS) $(DL_LIB)
 
 SRCS=$(srcdir)/kdb5_verify.c
index d814c549965e373de10c304927d6c07d9d521618..c233347aa07468b8415f1badee978806ecfa7da9 100644 (file)
@@ -1,7 +1,6 @@
 mydir=util$(S)collected-client-lib
 BUILDTOP=$(REL)..$(S)..
 RELDIR=../util/collected-client-lib
-DEFS=
 
 ##DOS##BUILDTOP = ..\..
 ##DOS##LIBNAME=$(OUTPRE)k5sprt32.lib
@@ -10,9 +9,6 @@ DEFS=
 ##DOS##OBJFILE=$(OUTPRE)k5sprt32.lst
 ##DOS##WIN64OBJFILE=$(OUTPRE)k5sprt64.lst
 
-PROG_LIBPATH=-L$(TOPLIBD)
-PROG_RPATH=$(KRB5_LIBDIR)
-
 LIBBASE=collected
 LIBMAJOR=1
 LIBMINOR=0
@@ -67,8 +63,6 @@ SHLIB_EXPDEPS =
 LIBS_UTILS=-lresolv
 # Add -lm if dumping thread stats, for sqrt.
 SHLIB_EXPLIBS= $(LIBS) $(DL_LIB) $(LIBS_UTILS)
-SHLIB_DIRS=
-SHLIB_RDIRS=
 
 DEPLIBS=
 
index 4c68b6090c6dddff0f70c6ab0cbcf66423e4a9a1..25edc280173681cfca0432c298eaf45773297bdf 100644 (file)
@@ -6,7 +6,6 @@ mydir=util$(S)et
 BUILDTOP=$(REL)..$(S)..
 RELDIR=../util/et
 SED = sed
-DEFS=
 
 ##DOS##BUILDTOP = ..\..
 ##DOS##LIBNAME=$(OUTPRE)comerr.lib
@@ -14,7 +13,6 @@ DEFS=
 ##DOS##OBJFILE=$(OUTPRE)comerr.lst
 
 STLIBOBJS=error_message.o et_name.o com_err.o
-STOBJLISTS=OBJS.ST
 LIBBASE=com_err
 LIBMAJOR=3
 LIBMINOR=0
@@ -54,9 +52,6 @@ SHLIB_LIBS=
 SHLIB_EXPDEPS = $(SUPPORT_DEPLIB)
 SHLIB_EXPLIBS=-l$(SUPPORT_LIBNAME) $(LIBS)
 SHLIB_LDFLAGS= $(LDFLAGS) @SHLIB_RPATH_DIRS@   
-SHLIB_LIBDIRS= @SHLIB_LIBDIRS@
-SHLIB_RDIRS=$(KRB5_LIBDIR)
-SHLIB_DIRS=-L$(TOPLIBD)
 
 COM_ERR_HDR=$(BUILDTOP)$(S)include$(S)com_err.h
 
@@ -120,8 +115,6 @@ do-its4: error_table.y et_lex.lex.c
 #t_com_err: t_com_err.o et1.o et2.o $(LIBOBJS)
 #      $(CC) -o t_com_err t_com_err.o et1.o et2.o $(LIBOBJS)
 
-PROG_RPATH=$(KRB5_LIBDIR)
-PROG_LIBPATH=-L$(TOPLIBD)
 test_et: test_et.o test1.o test2.o $(COM_ERR_DEPLIB) $(SUPPORT_DEPLIB)
        $(CC_LINK) -o test_et test_et.o test1.o test2.o -lcom_err $(SUPPORT_LIB)
 t_com_err: t_com_err.o et1.o et2.o $(COM_ERR_DEPLIB) $(SUPPORT_DEPLIB)
@@ -145,7 +138,6 @@ includes:: com_err.h
 clean-unix::
        $(RM) $(BUILDTOP)/include/com_err.h
 
-RUN_SETUP = @KRB5_RUN_ENV@
 # test_et doesn't have an interesting exit status, but it'll exercise
 # some cases that t_com_err doesn't, so let's see if it crashes.
 check-unix:: t_com_err test_et
index 0c57976469cf42a52bf7248fb5f2b5444c1a68ad..c502494a96dcf01d8504a7c3ab8af29509797f2b 100644 (file)
@@ -1,19 +1,14 @@
 mydir=util/gss-kernel-lib
 BUILDTOP=$(REL)..$(S)..
 
-KRB5_RUN_ENV=@KRB5_RUN_ENV@
-
 DEFINES=-DKRB5_KERNEL
 ALL_CFLAGS=$(CPPFLAGS) $(CFLAGS) $(WARN_CFLAGS) $(DEFS) $(DEFINES) -I. -Igssapi
-PROG_LIBPATH=-L$(TOPLIBD)
 
 SHLIB_EXPDEPS = \
        $(TOPLIBD)/libk5crypto$(SHLIBEXT) \
        $(TOPLIBD)/libkrb5$(SHLIBEXT)
 SHLIB_EXPLIBS=-lgssrpc -lkrb5 -lk5crypto -lcom_err $(SUPPORT_LIB) $(LIBS)
 
-STOBJLISTS=OBJS.ST
-
 SRCS= \
        k5seal.c \
        k5sealiov.c \
index e88094ecce85f9759bdfc440d8ff4039eb21543d..f1418fb7fe8bf58d91d0a7a1971f9e01169c29c6 100644 (file)
@@ -3,8 +3,6 @@ BUILDTOP=$(REL)..$(S)..
 SUBDIRS=testmod
 PROG_LIBPATH=-L$(TOPLIBD) $(TCL_LIBPATH) -L.
 PROG_RPATH=$(KRB5_LIBDIR)$(TCL_RPATH)
-KRB5_RUN_ENV=@KRB5_RUN_ENV@
-DEFS=
 ##DOS##BUILDTOP = ..\..
 ##DOS##OBJFILE=$(OUTPRE)profile.lst
 ##DOS##LIBNAME=$(OUTPRE)profile.lib
@@ -50,10 +48,6 @@ LIBMAJOR=1
 LIBMINOR=1
 SHLIB_EXPDEPS = $(COM_ERR_DEPLIB) $(SUPPORT_DEPLIB)
 SHLIB_EXPLIBS = -lcom_err $(SUPPORT_LIB) $(LIBS)
-SHLIB_DIRS = -L$(TOPLIBD)
-SHLIB_RDIRS=$(KRB5_LIBDIR)
-
-STOBJLISTS=OBJS.ST
 
 PROFILE_HDR=$(BUILDTOP)$(S)include$(S)profile.h
 
@@ -148,8 +142,8 @@ clean-windows::
        $(RM) $(PROFILE_HDR)
 
 check-unix:: test_parse test_profile test_vtable test_load modtest.conf
-       $(KRB5_RUN_ENV) $(VALGRIND) ./test_vtable
-       $(KRB5_RUN_ENV) $(VALGRIND) ./test_load
+       $(RUN_SETUP) $(VALGRIND) ./test_vtable
+       $(RUN_SETUP) $(VALGRIND) ./test_load
 
 DO_TCL=@DO_TCL@
 check-unix:: check-unix-tcl-$(DO_TCL)
@@ -161,7 +155,7 @@ check-unix-tcl-:
 
 check-unix-tcl-ok: profile_tcl
        cp $(srcdir)/test.ini test2.ini
-       $(KRB5_RUN_ENV) $(VALGRIND) ./profile_tcl $(srcdir)/prof_test1
+       $(RUN_SETUP) $(VALGRIND) ./profile_tcl $(srcdir)/prof_test1
 
 check-windows:: $(OUTPRE)test_profile.exe $(OUTPRE)test_parse.exe
        $(RM) $(OUTPRE)*.obj
index bc2dbc5db9281c0ee1e0f5d9d99c1abfac02ee8a..b4e63ff493359f513654593e3016de1802b2cdb5 100644 (file)
@@ -1,21 +1,15 @@
 mydir=util$(S)profile$(S)testmod
 BUILDTOP=$(REL)..$(S)..$(S)..
-KRB5_RUN_ENV = @KRB5_RUN_ENV@
-DEFS=@DEFS@
 
 LOCALINCLUDES = -I.. -I$(srcdir)/..
 
 LIBBASE=proftest
 LIBMAJOR=0
 LIBMINOR=0
-SO_EXT=.so
 
-SHLIB_DIRS=-L$(TOPLIBD)
-SHLIB_RDIRS=$(KRB5_LIBDIR)
 SHLIB_EXPLIBS=$(SUPPORT_LIB) $(LIBS)
 SHLIB_EXPDEPS=$(SUPPORT_DEPLIB)
 
-STOBJLISTS=OBJS.ST
 STLIBOBJS=testmod_main.o
 
 SRCS=$(srcdir)/testmod_main.c
index 07b36cb69582f5167d45aacb9ab258b7c9fd8c0c..0e2e47d431bfbef52ad0a5f922e9a40bceb2ad99 100644 (file)
@@ -1,7 +1,6 @@
 mydir=util$(S)ss
 BUILDTOP=$(REL)..$(S)..
 SED = sed
-DEFS=
 
 INSTALLLIB=cp
 INSTALLFILE=cp
@@ -15,8 +14,6 @@ LIBMAJOR=1
 LIBMINOR=0
 RELDIR=../util/ss
 
-STOBJLISTS=OBJS.ST
-
 clean-unix:: clean-liblinks clean-libs clean-libobjs
 install-unix:: install-libs
 
index 197d5aa7f93a4494bc62ae9dddd2db096534351e..01be06d2172d955f18b21d273eb3473699147149 100644 (file)
@@ -1,7 +1,6 @@
 mydir=util$(S)support
 BUILDTOP=$(REL)..$(S)..
 RELDIR=../util/support
-DEFS=
 
 ##DOS##BUILDTOP = ..\..
 ##DOS##LIBNAME=$(OUTPRE)k5sprt32.lib
@@ -12,10 +11,6 @@ DEFS=
 
 SED = sed
 
-KRB5_RUN_ENV= @KRB5_RUN_ENV@
-PROG_LIBPATH=-L$(TOPLIBD)
-PROG_RPATH=$(KRB5_LIBDIR)
-
 LIBBASE=krb5support
 LIBMAJOR=@SUPPORTLIB_MAJOR@
 LIBMINOR=1
@@ -104,12 +99,6 @@ LIBOBJS= \
        $(PRINTF_OBJ) \
        $(MKSTEMP_OBJ)
 
-STOBJLISTS=OBJS.ST
-
-INSTALLFILE = cp
-
-LOCALINCLUDES=-I. -I$(srcdir)
-
 SRCS=\
        $(srcdir)/threads.c \
        $(srcdir)/init-addrinfo.c \
@@ -137,8 +126,6 @@ SRCS=\
 SHLIB_EXPDEPS =
 # Add -lm if dumping thread stats, for sqrt.
 SHLIB_EXPLIBS= $(LIBS) $(DL_LIB)
-SHLIB_DIRS=
-SHLIB_RDIRS=$(KRB5_LIBDIR)
 
 DEPLIBS=
 
index 466044e2df6f8778f7062c05c85a0babaebefacd..0d51cb84cd658be51b61fa999ad228acc943e1e6 100644 (file)
@@ -19,10 +19,7 @@ LIBOBJS=$(OUTPRE)verto.$(OBJEXT) \
        $(OUTPRE)verto-k5ev.$(OBJEXT)
 SRCS=verto.c module.c verto-k5ev.c
 
-STOBJLISTS=OBJS.ST
 SHLIB_EXPLIBS= $(LIBS) -lm    # libm needed for ceil() currently.
-SHLIB_DIRS=
-SHLIB_RDIRS=$(KRB5_LIBDIR)
 
 VERTO_HDR=$(BUILDTOP)$(S)include$(S)verto.h