[29528] in CVS-changelog-for-Kerberos-V5
krb5 commit: Fix build system hygiene issues
daemon@ATHENA.MIT.EDU (Greg Hudson)
Sat Jul 30 13:45:42 2016
Date: Sat, 30 Jul 2016 13:45:35 -0400
From: Greg Hudson <ghudson@mit.edu>
Message-Id: <201607301745.u6UHjZ5J004822@drugstore.mit.edu>
To: cvs-krb5@mit.edu
Reply-To: krbdev@mit.edu
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Errors-To: cvs-krb5-bounces@mit.edu
https://github.com/krb5/krb5/commit/daac2f9ee86e6a1e58a2171f6009f1ab96e15cb7
commit daac2f9ee86e6a1e58a2171f6009f1ab96e15cb7
Author: Greg Hudson <ghudson@mit.edu>
Date: Thu Jul 28 13:37:53 2016 -0400
Fix build system hygiene issues
Add some missing files to .gitignore, EXTRADEPSRCS, and clean rules.
.gitignore | 18 ++++++++++++++++++
src/Makefile.in | 4 ++--
src/build-tools/Makefile.in | 3 +++
src/include/Makefile.in | 2 +-
src/kadmin/dbutil/Makefile.in | 2 ++
src/lib/kadm5/Makefile.in | 2 +-
src/lib/krb5/ccache/Makefile.in | 2 +-
src/plugins/preauth/test/Makefile.in | 2 +-
src/plugins/pwqual/test/Makefile.in | 2 +-
src/plugins/tls/k5tls/Makefile.in | 2 +-
src/tests/Makefile.in | 9 ++++++---
src/util/Makefile.in | 3 +++
12 files changed, 40 insertions(+), 11 deletions(-)
diff --git a/.gitignore b/.gitignore
index 19e1004..36117a2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,6 +12,7 @@ lib*.so.*
Makefile
OBJS.*
obj/
+skiptests
testdir/
testlog
@@ -182,6 +183,7 @@ local.properties
/src/include/db.h
/src/include/gssapi/
/src/include/kadm5/
+/src/include/kdc_j_encode.h
/src/include/krb5.stamp
/src/include/osconf.h
/src/include/private-and-public-decls
@@ -202,6 +204,7 @@ local.properties
/src/kadmin/dbutil/import_err.c
/src/kadmin/dbutil/import_err.h
/src/kadmin/dbutil/kdb5_util
+/src/kadmin/dbutil/t_tdumputil
/src/kadmin/ktutil/ktutil
/src/kadmin/ktutil/ktutil_ct.c
@@ -296,7 +299,17 @@ local.properties
/src/lib/kdb/t_ulog
/src/lib/kdb/test.ulog
+/src/lib/krad/t_attr
+/src/lib/krad/t_attrset
+/src/lib/krad/t_client
+/src/lib/krad/t_code
+/src/lib/krad/t_packet
+/src/lib/krad/t_remote
+
+/src/lib/krb5/ccache/kcmrpc.c
+/src/lib/krb5/ccache/kcmrpc.h
/src/lib/krb5/ccache/t_cc
+/src/lib/krb5/ccache/t_cccol
/src/lib/krb5/ccache/t_cccursor
/src/lib/krb5/ccache/t_marshal
/src/lib/krb5/ccache/testcache
@@ -359,6 +372,7 @@ local.properties
/src/slave/kproplog
/src/tests/adata
+/src/tests/au.log
/src/tests/etinfo
/src/tests/gcred
/src/tests/hist
@@ -374,6 +388,7 @@ local.properties
/src/tests/responder
/src/tests/s2p
/src/tests/s4u2proxy
+/src/tests/unlockiter
/src/tests/asn.1/expected_encode.out
/src/tests/asn.1/expected_trval.out
@@ -403,6 +418,8 @@ local.properties
/src/tests/gssapi/t_ccselect
/src/tests/gssapi/t_ciflags
/src/tests/gssapi/t_credstore
+/src/tests/gssapi/t_enctypes
+/src/tests/gssapi/t_err
/src/tests/gssapi/t_export_cred
/src/tests/gssapi/t_export_name
/src/tests/gssapi/t_gssexts
@@ -411,6 +428,7 @@ local.properties
/src/tests/gssapi/t_invalid
/src/tests/gssapi/t_inq_cred
/src/tests/gssapi/t_inq_mechs_name
+/src/tests/gssapi/t_iov
/src/tests/gssapi/t_namingexts
/src/tests/gssapi/t_oid
/src/tests/gssapi/t_pcontok
diff --git a/src/Makefile.in b/src/Makefile.in
index b5622e1..15b9cbb 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -96,7 +96,7 @@ TAGS: $(SRCS)
clean-: clean-windows
clean-unix::
- $(RM) *.o core
+ $(RM) *.o core skiptests
mostlyclean: clean
@@ -463,7 +463,7 @@ awk-windows-mac: $(ETOUT) $(HOUT)
clean-windows-mac:
rm -f $(CLEANUP)
-distclean-windows::
+distclean-windows:
config\rm.bat $(CLEANUP:^/=^\)
config\rm.bat $(WINMAKEFILES)
config\rm.bat $(KBINDIR)\*.dll $(KBINDIR)\*.exe
diff --git a/src/build-tools/Makefile.in b/src/build-tools/Makefile.in
index 61d4a8e..729d115 100644
--- a/src/build-tools/Makefile.in
+++ b/src/build-tools/Makefile.in
@@ -45,3 +45,6 @@ install-unix:
# $(PURE) or $(LDFLAGS) in case someone changes config/shlib.conf
check-unix: krb5-config
$(SHELL) $(srcdir)/t_krbconf
+
+distclean-unix:
+ $(RM) $(PKGCONFIG_FILES) krb5-config
diff --git a/src/include/Makefile.in b/src/include/Makefile.in
index 95f0bca..d981102 100644
--- a/src/include/Makefile.in
+++ b/src/include/Makefile.in
@@ -134,7 +134,7 @@ clean:
$(RM) osconf.new $(BUILT_HEADERS)
distclean:
- $(RM) autoconf.h
+ $(RM) autoconf.h $(srcdir)/autoconf.stmp
install-headers-unix install: krb5/krb5.h profile.h
$(INSTALL_DATA) $(srcdir)/krb5.h $(DESTDIR)$(KRB5_INCDIR)$(S)krb5.h
diff --git a/src/kadmin/dbutil/Makefile.in b/src/kadmin/dbutil/Makefile.in
index 7a2bbc3..1fa25d2 100644
--- a/src/kadmin/dbutil/Makefile.in
+++ b/src/kadmin/dbutil/Makefile.in
@@ -8,6 +8,7 @@ PROG = kdb5_util
SRCS = kdb5_util.c kdb5_create.c kadm5_create.c kdb5_destroy.c \
kdb5_stash.c import_err.c strtok.c dump.c ovload.c kdb5_mkey.c \
tabdump.c tdumputil.c
+EXTRADEPSRCS = t_tdumputil.c
OBJS = kdb5_util.o kdb5_create.o kadm5_create.o kdb5_destroy.o \
kdb5_stash.o import_err.o strtok.o dump.o ovload.o kdb5_mkey.o \
@@ -29,6 +30,7 @@ install:
clean:
$(RM) $(PROG) $(OBJS) import_err.c import_err.h
+ $(RM) t_tdumputil.o t_tdumputil
T_TDUMPUTIL_OBJS = t_tdumputil.o tdumputil.o
diff --git a/src/lib/kadm5/Makefile.in b/src/lib/kadm5/Makefile.in
index a2694bb..c4eaad3 100644
--- a/src/lib/kadm5/Makefile.in
+++ b/src/lib/kadm5/Makefile.in
@@ -77,7 +77,7 @@ includes: $(SRC_HDRS) $(BUILD_HDRS)
done
clean-unix::
- $(RM) $(HDRS)
+ $(RM) -r $(HDRDIR)
all-prerecurse: includes
all-prerecurse: all-libobjs
diff --git a/src/lib/krb5/ccache/Makefile.in b/src/lib/krb5/ccache/Makefile.in
index 625b0d1..5ac8707 100644
--- a/src/lib/krb5/ccache/Makefile.in
+++ b/src/lib/krb5/ccache/Makefile.in
@@ -146,7 +146,7 @@ check-pytests: t_cccursor t_cccol
clean-unix::
$(RM) t_cc t_cc.o t_cccursor t_cccursor.o t_cccol t_cccol.o
- $(RM) t_marshal t_marshal.o testcache
+ $(RM) t_marshal t_marshal.o testcache kcmrpc.c kcmrpc.h
depend: $(KCMRPC_DEPS)
diff --git a/src/plugins/preauth/test/Makefile.in b/src/plugins/preauth/test/Makefile.in
index 3da5ca8..ac3cb81 100644
--- a/src/plugins/preauth/test/Makefile.in
+++ b/src/plugins/preauth/test/Makefile.in
@@ -15,7 +15,7 @@ SRCS= $(srcdir)/cltest.c $(srcdir)/kdctest.c
all-unix: all-liblinks
install-unix: install-libs
-clean-unix:: clean-libs clean-libobjs
+clean-unix:: clean-liblinks clean-libs clean-libobjs
@libnover_frag@
@libobj_frag@
diff --git a/src/plugins/pwqual/test/Makefile.in b/src/plugins/pwqual/test/Makefile.in
index 278981d..1272503 100644
--- a/src/plugins/pwqual/test/Makefile.in
+++ b/src/plugins/pwqual/test/Makefile.in
@@ -15,7 +15,7 @@ SRCS= $(srcdir)/main.c
all-unix: all-libs
install-unix:
-clean-unix:: clean-libs clean-libobjs
+clean-unix:: clean-liblinks clean-libs clean-libobjs
@libnover_frag@
@libobj_frag@
diff --git a/src/plugins/tls/k5tls/Makefile.in b/src/plugins/tls/k5tls/Makefile.in
index 48b7a8f..9f2de7d 100644
--- a/src/plugins/tls/k5tls/Makefile.in
+++ b/src/plugins/tls/k5tls/Makefile.in
@@ -16,7 +16,7 @@ SRCS=$(srcdir)/openssl.c $(srcdir)/notls.c
all-unix: all-liblinks
install-unix: install-libs
-clean-unix:: clean-libs clean-libobjs
+clean-unix:: clean-liblinks clean-libs clean-libobjs
@libnover_frag@
@libobj_frag@
diff --git a/src/tests/Makefile.in b/src/tests/Makefile.in
index 47ca322..49e69e1 100644
--- a/src/tests/Makefile.in
+++ b/src/tests/Makefile.in
@@ -7,9 +7,11 @@ RUN_DB_TEST = $(RUN_SETUP) KRB5_KDC_PROFILE=kdc.conf KRB5_CONFIG=krb5.conf \
LC_ALL=C $(VALGRIND)
OBJS= adata.o etinfo.o gcred.o hist.o hooks.o hrealm.o icred.o kdbtest.o \
- localauth.o plugorder.o rdreq.o responder.o s2p.o s4u2proxy.o
+ localauth.o plugorder.o rdreq.o responder.o s2p.o s4u2proxy.o \
+ unlockiter.o
EXTRADEPSRCS= adata.c etinfo.c gcred.c hist.c hooks.c hrealm.c icred.c \
- kdbtest.c localauth.c plugorder.c rdreq.o responder.c s2p.c s4u2proxy.c
+ kdbtest.c localauth.c plugorder.c rdreq.o responder.c s2p.c \
+ s4u2proxy.c unlockiter.c
TEST_DB = ./testdb
TEST_REALM = FOO.TEST.REALM
@@ -165,6 +167,7 @@ check-pytests: plugorder rdreq responder s2p s4u2proxy unlockiter
clean:
$(RM) adata etinfo gcred hist hooks hrealm icred kdbtest localauth
- $(RM) plugorder rdreq responder s2p s4u2proxy krb5.conf kdc.conf
+ $(RM) plugorder rdreq responder s2p s4u2proxy unlockiter
+ $(RM) krb5.conf kdc.conf
$(RM) -rf kdc_realm/sandbox ldap
$(RM) au.log
diff --git a/src/util/Makefile.in b/src/util/Makefile.in
index 20f4dfc..9d909f6 100644
--- a/src/util/Makefile.in
+++ b/src/util/Makefile.in
@@ -23,3 +23,6 @@ NO_OUTDIR=1
install:
$(INSTALL_SCRIPT) $(srcdir)/krb5-send-pr.sh $(DESTDIR)$(ADMIN_BINDIR)/krb5-send-pr
+
+clean-unix::
+ $(RM) *.pyc
_______________________________________________
cvs-krb5 mailing list
cvs-krb5@mit.edu
https://mailman.mit.edu/mailman/listinfo/cvs-krb5
