From 25be08520935bc4b0604bff0a476ee53e1a511d5 Mon Sep 17 00:00:00 2001 From: Michael Meffie Date: Wed, 10 Sep 2014 09:00:11 -0400 Subject: [PATCH] build: remove trailing whitespace from makefiles Remove trailing whitespace from the makefiles, except for trailing whitespace in the boilerplate comment headers. Change-Id: Ib8ee87a51f00633ba15e1974ac0b311969bef1bf Reviewed-on: http://gerrit.openafs.org/11456 Reviewed-by: Benjamin Kaduk Reviewed-by: Chas Williams - CONTRACTOR Reviewed-by: D Brashear Tested-by: D Brashear --- Makefile.in | 12 ++++++------ NTMakefile | 10 +++++----- src/afsweb/Makefile.in | 22 +++++++++++----------- src/audit/Makefile.in | 2 +- src/audit/NTMakefile | 4 ++-- src/auth/Makefile.in | 2 +- src/auth/NTMakefile | 16 ++++++++-------- src/auth/test/Makefile.in | 4 ++-- src/auth/test/NTMakefile | 6 +++--- src/bozo/Makefile.in | 6 +++--- src/bozo/test/Makefile.in | 6 +++--- src/bu_utils/NTMakefile | 4 ++-- src/bubasics/NTMakefile | 10 +++++----- src/bucoord/NTMakefile | 4 ++-- src/budb/NTMakefile | 10 +++++----- src/butm/NTMakefile | 8 ++++---- src/cmd/Makefile.in | 6 +++--- src/cmd/NTMakefile | 8 ++++---- src/cmd/test/Makefile.in | 4 ++-- src/cmd/test/NTMakefile | 20 ++++++++++---------- src/comerr/NTMakefile | 18 +++++++++--------- src/comerr/test/Makefile.in | 6 +++--- src/comerr/test/NTMakefile | 12 ++++++------ src/config/Makefile.in | 8 ++++---- src/config/NTMakefile | 4 ++-- src/crypto/hcrypto/Makefile.in | 8 ++++---- src/crypto/hcrypto/NTMakefile | 2 +- src/dir/Makefile.in | 4 ++-- src/dir/NTMakefile | 6 +++--- src/dir/test/Makefile.in | 4 ++-- src/dir/test/NTMakefile | 2 +- src/dviced/NTMakefile | 4 ++-- src/dvolser/Makefile.in | 2 +- src/dvolser/NTMakefile | 6 +++--- src/export/Makefile.in | 2 +- src/finale/NTMakefile | 2 +- src/fsint/Makefile.in | 2 +- src/fsint/NTMakefile | 22 +++++++++++----------- src/fsprobe/Makefile.in | 4 ++-- src/kauth/Makefile.in | 2 +- src/kauth/NTMakefile | 26 +++++++++++++------------- src/kauth/test/Makefile.in | 6 +++--- src/kauth/test/NTMakefile | 4 ++-- src/kopenafs/Makefile.in | 2 +- src/libacl/Makefile.in | 4 ++-- src/libacl/NTMakefile | 8 ++++---- src/libacl/test/Makefile.in | 6 +++--- src/libadmin/NTMakefile | 2 +- src/libadmin/adminutil/NTMakefile | 6 +++--- src/libadmin/bos/NTMakefile | 2 +- src/libadmin/cfg/NTMakefile | 2 +- src/libadmin/cfg/test/NTMakefile | 2 +- src/libadmin/client/NTMakefile | 2 +- src/libadmin/kas/NTMakefile | 2 +- src/libadmin/pts/NTMakefile | 2 +- src/libadmin/test/NTMakefile | 2 +- src/libadmin/vos/NTMakefile | 2 +- src/libafsrpc/NTMakefile | 2 +- src/log/Makefile.in | 2 +- src/log/test/Makefile.in | 12 ++++++------ src/lwp/NTMakefile | 6 +++--- src/lwp/test/Makefile.in | 2 +- src/lwp/test/NTMakefile | 2 +- src/platform/DARWIN/Makefile.in | 4 ++-- src/procmgmt/test/NTMakefile | 2 +- src/ptserver/Makefile.in | 2 +- src/ptserver/NTMakefile | 16 ++++++++-------- src/rx/Makefile.in | 2 +- src/rx/NTMakefile | 4 ++-- src/rx/test/NTMakefile | 2 +- src/rxdebug/NTMakefile | 4 ++-- src/rxgen/NTMakefile | 8 ++++---- src/rxkad/Makefile.in | 4 ++-- src/rxkad/NTMakefile | 8 ++++---- src/rxkad/test/Makefile.in | 4 ++-- src/rxkad/test/NTMakefile | 8 ++++---- src/rxosd/Makefile.in | 8 ++++---- src/scout/Makefile.in | 2 +- src/sgistuff/Makefile.in | 4 ++-- src/sys/Makefile.in | 2 +- src/tests/Makefile.in | 4 ++-- src/tools/rxperf/NTMakefile | 2 +- src/tptserver/Makefile.in | 2 +- src/tsm41/Makefile.in | 6 +++--- src/tvlserver/Makefile.in | 8 ++++---- src/tvolser/NTMakefile | 8 ++++---- src/ubik/Makefile.in | 8 ++++---- src/ubik/NTMakefile | 30 +++++++++++++++--------------- src/update/Makefile.in | 4 ++-- src/update/NTMakefile | 4 ++-- src/usd/NTMakefile | 10 +++++----- src/usd/test/NTMakefile | 2 +- src/uss/Makefile.in | 2 +- src/util/Makefile.in | 2 +- src/util/NTMakefile | 2 +- src/util/test/Makefile.in | 2 +- src/util/test/NTMakefile | 2 +- src/venus/Makefile.in | 4 ++-- src/vfsck/Makefile.in | 2 +- src/viced/NTMakefile | 2 +- src/vlserver/Makefile.in | 2 +- src/vlserver/NTMakefile | 12 ++++++------ src/vol/Makefile.in | 2 +- src/vol/NTMakefile | 2 +- src/vol/test/Makefile.in | 16 ++++++++-------- src/vol/test/NTMakefile | 2 +- src/volser/Makefile.in | 2 +- src/volser/NTMakefile | 6 +++--- src/xstat/NTMakefile | 2 +- 109 files changed, 313 insertions(+), 313 deletions(-) diff --git a/Makefile.in b/Makefile.in index 8866385756..f3169ef073 100644 --- a/Makefile.in +++ b/Makefile.in @@ -16,7 +16,7 @@ DOXYGEN=@DOXYGEN@ # To compile AFS from scratch in the src tree run "make". # This recursively calls "make install ..." and does not depend on the # existence of any non-standard programs. -# To compile for the kernel type "make blibafs". This assumes install, +# To compile for the kernel type "make blibafs". This assumes install, # rxgen, compile_et and others already exist and runs it with # "-argument kinstall". @@ -139,9 +139,9 @@ dest_dirs: force prelude: ${TOP_INCDIR}/afs ${TOP_INCDIR}/rx ${TOP_INCDIR}/hcrypto ${TOP_INCDIR}/opr ${TOP_LIBDIR} -project: cmd comerr +project: cmd comerr -tests: all +tests: all +${COMPILE_PART1} tests ${COMPILE_PART2} config: prelude @@ -201,9 +201,9 @@ rxdebug: rx sys fsint: cmd comerr rxgen rx lwp fsint_depinstall +${COMPILE_PART1} fsint ${COMPILE_PART2} -export2: project +export2: project -export: +export: @case ${SYS_NAME} in \ rs_aix*) \ ${MAKE} export_build ; \ @@ -605,7 +605,7 @@ libafsauthent: audit auth kauth ubik util sys ptserver volser vlserver libafsrpc kopenafs: config sys +${COMPILE_PART1} kopenafs ${COMPILE_PART2} -libadmin_real: +libadmin_real: +${COMPILE_PART1} libadmin ${COMPILE_PART2} +${COMPILE_PART1} libadmin/adminutil ${COMPILE_PART2} +${COMPILE_PART1} libadmin/vos ${COMPILE_PART2} diff --git a/NTMakefile b/NTMakefile index 8865f72248..4b28fda3fb 100644 --- a/NTMakefile +++ b/NTMakefile @@ -318,14 +318,14 @@ auth: sys $(DOCD) $(SRC)\$@ $(CD) $(SRC)\$@ $(NTMAKE) - $(CD) ..\.. + $(CD) ..\.. ubik: auth @echo ***** $@ $(DOCD) $(SRC)\$@ $(CD) $(SRC)\$@ $(NTMAKE) - $(CD) ..\.. + $(CD) ..\.. ptserver: ubik @echo ***** $@ @@ -738,7 +738,7 @@ finale: netidmgr_plugin install: finale afsrdr tools rpctestlib extra @echo Build Finished Successfully - + # Clean target for obj tree clean: @@ -759,8 +759,8 @@ mkdir: -mkdir $(DESTDIR) -mkdir $(AFS_OBJDIR)\checked -mkdir $(AFS_OBJDIR)\free - -xcopy /q /t /e $(SRC)\*.* $(AFS_OBJDIR)\checked\ - -xcopy /q /t /e $(SRC)\*.* $(AFS_OBJDIR)\free\ + -xcopy /q /t /e $(SRC)\*.* $(AFS_OBJDIR)\checked\ + -xcopy /q /t /e $(SRC)\*.* $(AFS_OBJDIR)\free\ -mkdir $(DESTDIR)\checked -mkdir $(DESTDIR)\free -mkdir $(DESTDIR)\checked\bin diff --git a/src/afsweb/Makefile.in b/src/afsweb/Makefile.in index 39182a17a6..d04c62d3e3 100644 --- a/src/afsweb/Makefile.in +++ b/src/afsweb/Makefile.in @@ -25,11 +25,11 @@ SRC_MODULE=afs_module.c ## This module is made compatible with Apache 1.3.1 by including a file called ## ap_compat.h provided by Apache (basically all they do is #define all the old API calls ## as the new ones with ap_ prepended to the old API calls. The makefile takes care of this -## while building afs_module.c and adding the AFS_component_version_number.c file's contents -## in comments. +## while building afs_module.c and adding the AFS_component_version_number.c file's contents +## in comments. APACHEAFS_DOC=README -APACHE_INSTALL_SCRIPT=afswsApache_config.sh +APACHE_INSTALL_SCRIPT=afswsApache_config.sh NETSCAPE_INSTALL_SCRIPT=afswsNetscape_config.sh system apache_afs_web_secure: @@ -133,13 +133,13 @@ netscape_afs_web_secure: ${INSTALL} -d ${DEST}/root.afsweb/install ${INSTALL} -m 755 ${NETSCAPE_INSTALL_SCRIPT} ${DEST}/root.afsweb/install -all: +all: -install: +install: ## ## For Apache Afs Web Secure libraries and binaries -## NOTE: APACHE_INCLUDES should point to the Apache src directory where +## NOTE: APACHE_INCLUDES should point to the Apache src directory where ## httpd.h and all it's included files reside which right now is src/afsweb/include ## and we have Apache versions as subdirectories but these are taken care of by the ## code. Be sure to compile with the VERSION_CFLAG=-DAPACHE_1_3 option for Apache 1.3 @@ -191,8 +191,8 @@ OBJS=$(LIBOBJS) apache_afs_weblog.o weblog.o weblog: weblog.o $(APACHE_AFS_COMMON_LIB) $(CC) -o $@ weblog.o $(APACHE_AFS_COMMON_LIB) $(LIBS) $(XLIBS) -weblog_starter: apache_afs_weblog.o weblog_errors.h - $(CC) -o $@ apache_afs_weblog.o +weblog_starter: apache_afs_weblog.o weblog_errors.h + $(CC) -o $@ apache_afs_weblog.o $(APACHE_AFS_COMMON_LIB):$(LIBCOMMON_OBJS) - /bin/rm -f $@ @@ -200,9 +200,9 @@ $(APACHE_AFS_COMMON_LIB):$(LIBCOMMON_OBJS) $(APACHE_AFS_LIB): $(LIBOBJS) AFS_component_version_number.o - /bin/rm -f $@ - $(AR) $(ARFLAGS) $@ $(LIBOBJS) + $(AR) $(ARFLAGS) $@ $(LIBOBJS) -afs_module.c: apache_afs_module.c +afs_module.c: apache_afs_module.c -/bin/rm -f afs_module.c \ ; echo "/*" > afs_module.c \ ; cat AFS_component_version_number.c >> afs_module.c \ @@ -236,5 +236,5 @@ libclean: include ../config/Makefile.version -dest: +dest: diff --git a/src/audit/Makefile.in b/src/audit/Makefile.in index 8ac4e0fc1b..24f8f0da81 100644 --- a/src/audit/Makefile.in +++ b/src/audit/Makefile.in @@ -6,7 +6,7 @@ # directory or online at http://www.openafs.org/dl/license10.html # # Auditing is currently only supported for AIX32 machines. It is -# # integrated with the AIX auditing facility. The objects, events, +# # integrated with the AIX auditing facility. The objects, events, # # and config files are AIX specific. The Audit file is not but is # # included in the rs_aix32 case since other platforms are not # # supported (if not supported, don't show it). diff --git a/src/audit/NTMakefile b/src/audit/NTMakefile index 9aa8a40cdc..e63cacca45 100644 --- a/src/audit/NTMakefile +++ b/src/audit/NTMakefile @@ -23,8 +23,8 @@ LIBOBJS =\ $(OUT)\audit.obj \ $(OUT)\audit-file.obj -$(LIBFILE): $(LIBOBJS) - $(LIBARCH) +$(LIBFILE): $(LIBOBJS) + $(LIBARCH) install: $(INCFILES) $(LIBFILE) diff --git a/src/auth/Makefile.in b/src/auth/Makefile.in index 593e94893d..3ed23c6100 100644 --- a/src/auth/Makefile.in +++ b/src/auth/Makefile.in @@ -174,7 +174,7 @@ dest: libauth.a libauth.krb.a auth.h cellconfig.h # # Misc. targets # -test: +test: cd test; $(MAKE) clean: diff --git a/src/auth/NTMakefile b/src/auth/NTMakefile index b0f36eb79a..1c306b8e34 100644 --- a/src/auth/NTMakefile +++ b/src/auth/NTMakefile @@ -56,7 +56,7 @@ AFSDOBJS =\ $(AFSDOBJS): $(AFSD)\$$(@B).c $(C2OBJ) -I$*(*D) $** -$(AFSAUTH_LIBFILE): $(AFSAUTH_LIBOBJS) $(AFSDOBJS) +$(AFSAUTH_LIBFILE): $(AFSAUTH_LIBOBJS) $(AFSDOBJS) $(LIBARCH) rpcrt4.lib ############################################################################ @@ -74,8 +74,8 @@ AFSAUTH_KRB_LIBOBJS =\ $(OUT)\ktc_errors.obj \ $(OUT)\ktc_nt.obj \ $(OUT)\AFS_component_version_number.obj - -$(AFSAUTH_KRB_LIBFILE): $(AFSAUTH_KRB_LIBOBJS) + +$(AFSAUTH_KRB_LIBFILE): $(AFSAUTH_KRB_LIBOBJS) $(LIBARCH) rpcrt4.lib ############################################################################ @@ -84,7 +84,7 @@ $(AFSAUTH_KRB_LIBFILE): $(AFSAUTH_KRB_LIBOBJS) SETKEY_EXEFILE = $(OUT)\setkey.exe SETKEY_EXEOBJS =\ - $(OUT)\setkey.obj + $(OUT)\setkey.obj EXELIBDIR = $(DESTDIR)\lib @@ -105,7 +105,7 @@ EXELIBS =\ $(SETKEY_EXEFILE): $(SETKEY_EXEOBJS) $(EXELIBS) $(EXECONLINK) dnsapi.lib shell32.lib $(_VC_MANIFEST_EMBED_EXE) - $(EXEPREP) + $(EXEPREP) $(CODESIGN_USERLAND) $(SYMSTORE_IMPORT) @@ -115,10 +115,10 @@ COPYAUTH_EXEFILE = $(DESTDIR)\etc\copyauth.exe COPYAUTH_EXEOBJS =\ $(OUT)\copyauth.obj -$(COPYAUTH_EXEFILE): $(COPYAUTH_EXEOBJS) $(EXELIBS) +$(COPYAUTH_EXEFILE): $(COPYAUTH_EXEOBJS) $(EXELIBS) $(EXECONLINK) $(_VC_MANIFEST_EMBED_EXE) - $(EXEPREP) + $(EXEPREP) $(CODESIGN_USERLAND) $(SYMSTORE_IMPORT) @@ -146,4 +146,4 @@ clean:: setkey: $(SETKEY_EXEFILE) mkdir: - + diff --git a/src/auth/test/Makefile.in b/src/auth/test/Makefile.in index 8bf4ccee8c..4b24146e22 100644 --- a/src/auth/test/Makefile.in +++ b/src/auth/test/Makefile.in @@ -16,10 +16,10 @@ LIBS= ../libauth.a ${TOP_LIBDIR}/libsys.a ${TOP_LIBDIR}/librx.a \ tests all: testcellconf ktctest -testcellconf: testcellconf.o +testcellconf: testcellconf.o $(AFS_LDRULE) testcellconf.o ${LIBS} -ktctest: ktctest.o +ktctest: ktctest.o $(AFS_LDRULE) ktctest.o ${LIBS} clean: diff --git a/src/auth/test/NTMakefile b/src/auth/test/NTMakefile index 8891d61de7..ef04156731 100644 --- a/src/auth/test/NTMakefile +++ b/src/auth/test/NTMakefile @@ -28,7 +28,7 @@ CELL_EXELIBS =\ $(CELL_EXEFILE): $(CELL_EXEOBJS) $(CELL_EXELIBS) $(EXECONLINK) dnsapi.lib shell32.lib $(_VC_MANIFEST_EMBED_EXE) - $(EXEPREP) + $(EXEPREP) $(CODESIGN_USERLAND) $(SYMSTORE_IMPORT) @@ -52,7 +52,7 @@ KTC_EXELIBS =\ $(KTC_EXEFILE): $(KTC_EXEOBJS) $(KTC_EXELIBS) $(EXECONLINK) dnsapi.lib shell32.lib mpr.lib $(_VC_MANIFEST_EMBED_EXE) - $(EXEPREP) + $(EXEPREP) $(CODESIGN_USERLAND) $(SYMSTORE_IMPORT) @@ -60,4 +60,4 @@ test tests: $(CELL_EXEFILE) $(KTC_EXEFILE) clean:: -mkdir: +mkdir: diff --git a/src/bozo/Makefile.in b/src/bozo/Makefile.in index 510bafb09d..6b24f055d7 100644 --- a/src/bozo/Makefile.in +++ b/src/bozo/Makefile.in @@ -167,10 +167,10 @@ dest: bosserver bos bos_util libbos.a bosint.h bnode.h clean: $(RM) -f *.a *.o bos bosserver smail-notifier bos_util \ bosint.cs.c bosint.ss.c bosint.xdr.c bosint.h \ - core boserr.c bnode.h AFS_component_version_number.c + core boserr.c bnode.h AFS_component_version_number.c -test: - cd test; $(MAKE) +test: + cd test; $(MAKE) include ../config/Makefile.version diff --git a/src/bozo/test/Makefile.in b/src/bozo/test/Makefile.in index f813ccd493..a985eadbeb 100644 --- a/src/bozo/test/Makefile.in +++ b/src/bozo/test/Makefile.in @@ -12,12 +12,12 @@ MODULE_CFLAGS=$(LDIRS) $(LIBS) all: testproc -install: +install: # # Build targets # -testproc: testproc.c +testproc: testproc.c $(CC) $(AFS_LDFLAGS) $(AFS_CFLAGS) -o testproc testproc.c # @@ -26,5 +26,5 @@ testproc: testproc.c clean: $(RM) -f *.a *.o testproc core -dest: +dest: diff --git a/src/bu_utils/NTMakefile b/src/bu_utils/NTMakefile index e4b35260e4..5611a7989f 100644 --- a/src/bu_utils/NTMakefile +++ b/src/bu_utils/NTMakefile @@ -24,7 +24,7 @@ EXELIBS =\ $(DESTDIR)\lib\afs\afsutil.lib \ $(DESTDIR)\lib\afs\afsprocmgmt.lib \ $(DESTDIR)\lib\afsroken.lib - + $(EXEFILE): $(EXEOBJS) $(EXELIBS) $(EXECONLINK) @@ -50,4 +50,4 @@ install: $(LIBFILE) $(DLLFILE) $(EXEFILE) $(INCFILES) clean:: mkdir: - + diff --git a/src/bubasics/NTMakefile b/src/bubasics/NTMakefile index 4569b50003..ec8d7b73b2 100644 --- a/src/bubasics/NTMakefile +++ b/src/bubasics/NTMakefile @@ -40,8 +40,8 @@ LIBOBJS =\ $(OUT)\butx_errs.obj \ $(OUT)\AFS_component_version_number.obj -$(LIBFILE): $(LIBOBJS) - $(LIBARCH) +$(LIBFILE): $(LIBOBJS) + $(LIBARCH) ############################################################################ # rxgen on butc.xg and bumon.xg @@ -71,12 +71,12 @@ bumon.h: bumon.xg $(RXGEN) -A -h -o $@ bumon.xg ############################################################################ -# compile_et on butm_errs.et and butc_errs.et +# compile_et on butm_errs.et and butc_errs.et butm.h butm_errs.c: butm_errs.et butm.p.h $(DEL) butm.h butm_errs.c $(COMPILE_ET) butm_errs -h butm - + tcdata.h butc_errs.c: butc_errs.et tcdata.p.h butm.h $(DEL) tcdata.h butc_errs.c $(COMPILE_ET) butc_errs -h tcdata @@ -99,4 +99,4 @@ clean:: butc_errs.c butm_errs.c butx_errs.c mkdir: - + diff --git a/src/bucoord/NTMakefile b/src/bucoord/NTMakefile index 05db66cfc9..947df1b1e2 100644 --- a/src/bucoord/NTMakefile +++ b/src/bucoord/NTMakefile @@ -95,7 +95,7 @@ EXELIBS =\ $(DESTDIR)\lib\afshcrypto.lib \ $(DESTDIR)\lib\afsroken.lib \ $(DESTDIR)\lib\afsrfc3961.lib - + $(EXEFILE): $(EXEOBJS) $(EXERES) $(EXELIBS) $(EXECONLINK) dnsapi.lib mpr.lib iphlpapi.lib shell32.lib @@ -118,7 +118,7 @@ bucoord_errs.c bc.h: bucoord_errs.et bc.p.h $(OUT)/backup.res: AFS_component_version_number.h ############################################################################ -# Install +# Install install: $(INCFILES) $(LIBFILE) $(EXEFILE) diff --git a/src/budb/NTMakefile b/src/budb/NTMakefile index 1d9ecb9c3e..708c3eea8f 100644 --- a/src/budb/NTMakefile +++ b/src/budb/NTMakefile @@ -34,8 +34,8 @@ LIBOBJS =\ $(OUT)\struct_ops.obj \ $(OUT)\AFS_component_version_number.obj -$(LIBFILE): $(LIBOBJS) - $(LIBARCH) +$(LIBFILE): $(LIBOBJS) + $(LIBARCH) ############################################################################ @@ -87,7 +87,7 @@ EXELIBS =\ $(EXEFILE): $(EXEOBJS) $(EXELIBS) $(EXECONLINK) dnsapi.lib mpr.lib iphlpapi.lib shell32.lib $(_VC_MANIFEST_EMBED_EXE) - $(EXEPREP) + $(EXEPREP) $(CODESIGN_USERLAND) $(SYMSTORE_IMPORT) @@ -112,7 +112,7 @@ budb.h: budb.rg $(RXGEN) -A -u -h -o budb.h budb.rg $(INCFILEDIR)\budb.h: budb.h - $(COPY) budb.h $(INCFILEDIR)\budb.h + $(COPY) budb.h $(INCFILEDIR)\budb.h ############################################################################ # compile_et on budb_errs.et @@ -125,7 +125,7 @@ budb_errs.c: budb_errs.et $(COMPILE_ET) budb_errs ############################################################################ -# install +# install install: $(INCFILES) $(LIBFILE) $(EXEFILE) diff --git a/src/butm/NTMakefile b/src/butm/NTMakefile index 1012849a3c..fc86dd7c73 100644 --- a/src/butm/NTMakefile +++ b/src/butm/NTMakefile @@ -23,8 +23,8 @@ LIBOBJS =\ $(OUT)\file_tm.obj \ $(OUT)\AFS_component_version_number.obj -$(LIBFILE): $(LIBOBJS) - $(LIBARCH) +$(LIBFILE): $(LIBOBJS) + $(LIBARCH) ############################################################################ # Install target; primary makefile target @@ -36,7 +36,7 @@ install: $(INCFILES) $(LIBFILE) $(OUT)\test_ftm.exe # Local clean target; augments predefined clean target clean:: - $(DEL) test_ftm.exe + $(DEL) test_ftm.exe ############################################################################ # Auxiliary build targets not built by default; e.g. test programs @@ -56,4 +56,4 @@ $(OUT)\test_ftm.exe: $(OUT)\test_ftm.obj $(LIBFILE) $(TESTLIBS) $(SYMSTORE_IMPORT) mkdir: - + diff --git a/src/cmd/Makefile.in b/src/cmd/Makefile.in index efbffa3d09..5cfd3a6849 100644 --- a/src/cmd/Makefile.in +++ b/src/cmd/Makefile.in @@ -14,7 +14,7 @@ LT_objs=cmd_errors.lo cmd.lo config_file.lo AFS_component_version_number.lo LT_deps=$(top_builddir)/src/comerr/liboafs_comerr.la LT_libs= -LIB64OBJS=cmd_errors64.o cmd64.o +LIB64OBJS=cmd_errors64.o cmd64.o all: ${TOP_LIBDIR}/libcmd.a ${TOP_LIBDIR}/libcmd_pic.a \ ${TOP_INCDIR}/afs/cmd.h liboafs_cmd.la @@ -86,7 +86,7 @@ install: libcmd.a cmd.h install64: install libcmd64.a ${INSTALL_DATA} libcmd64.a ${DESTDIR}${libdir}/afs/libcmd64.a -dest: libcmd.a cmd.h +dest: libcmd.a cmd.h ${INSTALL} -d ${DEST}/lib/afs ${INSTALL} -d ${DEST}/include/afs ${INSTALL_DATA} libcmd.a ${DEST}/lib/afs/libcmd.a @@ -98,7 +98,7 @@ dest64: dest libcmd64.a # # Misc targets # -test tests: +test tests: (cd test; $(MAKE) ) clean: diff --git a/src/cmd/NTMakefile b/src/cmd/NTMakefile index 9033e9b8a6..46822f36ba 100644 --- a/src/cmd/NTMakefile +++ b/src/cmd/NTMakefile @@ -9,8 +9,8 @@ RELDIR=cmd !INCLUDE ..\config\NTMakefile.$(SYS_NAME) !INCLUDE ..\config\NTMakefile.version -# install include files -INCFILEDIR = $(DESTDIR)\include\afs +# install include files +INCFILEDIR = $(DESTDIR)\include\afs INCFILES =\ $(INCFILEDIR)\cmd.h @@ -40,7 +40,7 @@ $(OUT)\config_file.obj: $(HEIMDAL)\$$(@B).c $(C2OBJ) -I$(HEIMDAL) -DKRB5_USE_PATH_TOKENS $** $(LIBFILE): $(LIBOBJS) $(HEIMOBJS) - $(LIBARCH) + $(LIBARCH) $(INCFILES):$$(@F) $(COPY) $** $(INCFILEDIR)\. @@ -59,4 +59,4 @@ clean:: test tests: mkdir: - + diff --git a/src/cmd/test/Makefile.in b/src/cmd/test/Makefile.in index 706de0e555..2481607d10 100644 --- a/src/cmd/test/Makefile.in +++ b/src/cmd/test/Makefile.in @@ -15,8 +15,8 @@ LIBS=-lcmd $(TOP_LIBDIR)/libafscom_err.a -lafsutil $(LIB_roken) $(XLIBS) all: test test tests: ctest dtest itest -itest: itest.o - $(AFS_LDRULE) itest.o $(LDIRS) $(LIBS) +itest: itest.o + $(AFS_LDRULE) itest.o $(LDIRS) $(LIBS) ctest: ctest.o $(AFS_LDRULE) ctest.o $(LDIRS) $(LIBS) diff --git a/src/cmd/test/NTMakefile b/src/cmd/test/NTMakefile index 75f15d6747..95193a1a18 100644 --- a/src/cmd/test/NTMakefile +++ b/src/cmd/test/NTMakefile @@ -21,10 +21,10 @@ ITEST_EXEOBJS =\ ITEST_EXEFILE = $(OUT)\itest.exe -$(ITEST_EXEFILE): $(ITEST_EXEOBJS) - $(EXECONLINK) $(EXELIBS) +$(ITEST_EXEFILE): $(ITEST_EXEOBJS) + $(EXECONLINK) $(EXELIBS) $(_VC_MANIFEST_EMBED_EXE) - $(EXEPREP) + $(EXEPREP) $(CODESIGN_USERLAND) $(SYMSTORE_IMPORT) @@ -34,10 +34,10 @@ CTEST_EXEOBJS =\ CTEST_EXEFILE = $(OUT)\ctest.exe -$(CTEST_EXEFILE): $(CTEST_EXEOBJS) - $(EXECONLINK) $(EXELIBS) +$(CTEST_EXEFILE): $(CTEST_EXEOBJS) + $(EXECONLINK) $(EXELIBS) $(_VC_MANIFEST_EMBED_EXE) - $(EXEPREP) + $(EXEPREP) $(CODESIGN_USERLAND) $(SYMSTORE_IMPORT) @@ -47,10 +47,10 @@ DTEST_EXEOBJS =\ DTEST_EXEFILE = $(OUT)\dtest.exe -$(DTEST_EXEFILE): $(DTEST_EXEOBJS) - $(EXECONLINK) $(EXELIBS) +$(DTEST_EXEFILE): $(DTEST_EXEOBJS) + $(EXECONLINK) $(EXELIBS) $(_VC_MANIFEST_EMBED_EXE) - $(EXEPREP) + $(EXEPREP) $(CODESIGN_USERLAND) $(SYMSTORE_IMPORT) @@ -62,4 +62,4 @@ clean:: $(DEL) $(OUT)\ctest.exe $(OUT)\dtest.exe $(OUT)\itest.exe mkdir: - + diff --git a/src/comerr/NTMakefile b/src/comerr/NTMakefile index 4255991dcd..26b6e21dfb 100644 --- a/src/comerr/NTMakefile +++ b/src/comerr/NTMakefile @@ -10,12 +10,12 @@ RELDIR=comerr !INCLUDE ..\config\NTMakefile.version #################################################################### -# install comerr header files +# install comerr header files INCFILEDIR = $(DESTDIR)\include\afs INCFILES =\ $(INCFILEDIR)\com_err.h \ $(INCFILEDIR)\error_table.h \ - $(INCFILEDIR)\mit-sipb-cr.h + $(INCFILEDIR)\mit-sipb-cr.h #################################################################### # build and install afscom_err.lib static lib @@ -26,12 +26,12 @@ COMERR_LIBOBJS =\ $(OUT)\et_name.obj \ $(OUT)\com_err.obj \ $(OUT)\AFS_component_version_number.obj - + $(COMERR_LIBOBJS): $$(@B).c $(C2OBJ) $** $(COMERR_LIBFILE): $(COMERR_LIBOBJS) - $(LIBARCH) + $(LIBARCH) #################################################################### # build and install the compile_et executable @@ -42,10 +42,10 @@ COMPILE_ET_EXERES = $(OUT)\compile_et.res prep: $(DESTDIR)\bin\touch et_lex.lex_nt.c $(DESTDIR)\bin\touch error_table_nt.c - @echo If you update et_lex.lex.l, to build correctly, you should delete error_table_nt.c + @echo If you update et_lex.lex.l, to build correctly, you should delete error_table_nt.c et_lex.lex_nt.c: et_lex.lex.l - $(LEX) -t et_lex.lex.l > $@ + $(LEX) -t et_lex.lex.l > $@ error_table_nt.c: et_lex.lex_nt.c error_table.y $(YACC) -d -o $@ error_table.y @@ -64,15 +64,15 @@ COMPILE_ET_EXELIBS =\ $(DESTDIR)\lib\opr.lib \ $(DESTDIR)\lib\afsroken.lib -$(COMPILE_ET_EXEFILE): $(COMPILE_ET_EXEOBJS) $(COMPILE_ET_EXERES) $(COMPILE_ET_EXELIBS) +$(COMPILE_ET_EXEFILE): $(COMPILE_ET_EXEOBJS) $(COMPILE_ET_EXERES) $(COMPILE_ET_EXELIBS) $(EXECONLINK) $(_VC_MANIFEST_EMBED_EXE) - $(EXEPREP) + $(EXEPREP) $(CODESIGN_USERLAND) $(SYMSTORE_IMPORT) #################################################################### -install: prep $(INCFILES) $(COMERR_LIBFILE) $(COMPILE_ET_EXEFILE) +install: prep $(INCFILES) $(COMERR_LIBFILE) $(COMPILE_ET_EXEFILE) clean:: $(DEL) $(COMERR_LIBFILE) $(OUT)\AFS_component_version_number.obj diff --git a/src/comerr/test/Makefile.in b/src/comerr/test/Makefile.in index f19cc5ad71..4c5e59ff1a 100644 --- a/src/comerr/test/Makefile.in +++ b/src/comerr/test/Makefile.in @@ -5,12 +5,12 @@ LDIRS=-L${TOP_LIBDIR} -L${DESTDIR}/lib/afs -L.. all: test -install: +install: # # Build targets # -test: test.o test1.o test2.o +test: test.o test1.o test2.o $(AFS_LDRULE) ${LDIRS} -lafscom_err test.o test1.o test2.o test.o: test1.h test2.h @@ -33,5 +33,5 @@ clean: test1.h test1.c test2.h test2.c test \ eddep makedep core -dest: +dest: diff --git a/src/comerr/test/NTMakefile b/src/comerr/test/NTMakefile index 7c68e4a486..08a75fa663 100644 --- a/src/comerr/test/NTMakefile +++ b/src/comerr/test/NTMakefile @@ -17,19 +17,19 @@ EXELIBS =\ $(DESTDIR)\lib\afs\afscom_err.lib $(EXEFILE): $(EXEOBJS) # dependents built from predefined inference rules - $(EXECONLINK) $(EXELIBS) + $(EXECONLINK) $(EXELIBS) $(_VC_MANIFEST_EMBED_EXE) - $(EXEPREP) + $(EXEPREP) $(CODESIGN_USERLAND) $(SYMSTORE_IMPORT) -test1.c test1.h: test1.et +test1.c test1.h: test1.et $(DEL) test1.c test1.h $(COMPILE_ET) test1 -test2.c test2.h: test2.et +test2.c test2.h: test2.et $(DEL) test2.c test2.h - $(COMPILE_ET) test2 + $(COMPILE_ET) test2 tests: $(EXEFILE) @@ -38,4 +38,4 @@ clean:: mkdir: - + diff --git a/src/config/Makefile.in b/src/config/Makefile.in index 75d64e3ca6..31eadd5968 100644 --- a/src/config/Makefile.in +++ b/src/config/Makefile.in @@ -74,16 +74,16 @@ ${DEST}/include/afs/afs_sysnames.h ${DESTDIR}${includedir}/afs/afs_sysnames.h ${ ${DEST}/include/afs/stds.h ${DESTDIR}${includedir}/afs/stds.h ${TOP_INCDIR}/afs/stds.h: ${srcdir}/stds.h ${INSTALL_DATA} $? $@ -${DEST}/include/afs/icl.h ${DESTDIR}${includedir}/afs/icl.h ${TOP_INCDIR}/afs/icl.h: ${srcdir}/icl.h +${DEST}/include/afs/icl.h ${DESTDIR}${includedir}/afs/icl.h ${TOP_INCDIR}/afs/icl.h: ${srcdir}/icl.h ${INSTALL_DATA} $? $@ -${DEST}/include/afs/afs_args.h ${DESTDIR}${includedir}/afs/afs_args.h ${TOP_INCDIR}/afs/afs_args.h: ${srcdir}/afs_args.h +${DEST}/include/afs/afs_args.h ${DESTDIR}${includedir}/afs/afs_args.h ${TOP_INCDIR}/afs/afs_args.h: ${srcdir}/afs_args.h ${INSTALL_DATA} $? $@ -${DEST}/include/afs/venus.h ${DESTDIR}${includedir}/afs/venus.h ${TOP_INCDIR}/afs/venus.h: ${srcdir}/venus.h +${DEST}/include/afs/venus.h ${DESTDIR}${includedir}/afs/venus.h ${TOP_INCDIR}/afs/venus.h: ${srcdir}/venus.h ${INSTALL_DATA} $? $@ -${DEST}/include/afs/vioc.h ${DESTDIR}${includedir}/afs/vioc.h ${TOP_INCDIR}/afs/vioc.h: ${srcdir}/vioc.h +${DEST}/include/afs/vioc.h ${DESTDIR}${includedir}/afs/vioc.h ${TOP_INCDIR}/afs/vioc.h: ${srcdir}/vioc.h ${INSTALL_DATA} $? $@ # these are needed to compile the kernel. Config is necessary to diff --git a/src/config/NTMakefile b/src/config/NTMakefile index b2e7c9a44a..8ae12145d1 100644 --- a/src/config/NTMakefile +++ b/src/config/NTMakefile @@ -535,7 +535,7 @@ $(DESTDIR)\bin\NTBUILD.bat:..\NTBUILD.bat $(COPY) $? $@ $(UTIL_CR) + $@ -$(DESTDIR)\bin\NTLang.bat: NTLang.bat $(DESTDIR)\bin\util_cr.exe +$(DESTDIR)\bin\NTLang.bat: NTLang.bat $(DESTDIR)\bin\util_cr.exe $(COPY) NTLang.bat $(DESTDIR)\bin $(UTIL_CR) + $(DESTDIR)\bin\NTLang.bat @@ -552,7 +552,7 @@ doclink: - symlink make $(DESTDIR)\doc doc-pathname -version: $(DESTDIR)\bin\mkvers.exe NTMakefile.version +version: $(DESTDIR)\bin\mkvers.exe NTMakefile.version NTMakefile.version: NTMakefile.version-CML NTMakefile.version-NOCML $(DEL) NTMakefile.version diff --git a/src/crypto/hcrypto/Makefile.in b/src/crypto/hcrypto/Makefile.in index 1607333c6f..6a0eb44e4c 100644 --- a/src/crypto/hcrypto/Makefile.in +++ b/src/crypto/hcrypto/Makefile.in @@ -31,7 +31,7 @@ HEADERS= ${TOP_INCDIR}/hcrypto/aes.h \ UPSTREAM= ${TOP_SRCDIR}/external/heimdal -MODULE_INCLUDE=-I${srcdir} -I${TOP_INCDIR}/hcrypto -I$(UPSTREAM)/hcrypto +MODULE_INCLUDE=-I${srcdir} -I${TOP_INCDIR}/hcrypto -I$(UPSTREAM)/hcrypto SHLIBOBJ= libafshcrypto.${SHLIB_SUFFIX}.${LIBMAJOR}.${LIBMINOR} @@ -175,13 +175,13 @@ camellia-ntt.o: ${UPSTREAM}/hcrypto/camellia-ntt.c ${HEADERS} des.o: ${UPSTREAM}/hcrypto/des.c ${HEADERS} $(AFS_CCRULE) $(UPSTREAM)/hcrypto/des.c - + evp.o: ${UPSTREAM}/hcrypto/evp.c ${HEADERS} $(AFS_CCRULE) $(UPSTREAM)/hcrypto/evp.c - + evp-hcrypto.o: ${UPSTREAM}/hcrypto/evp-hcrypto.c ${HEADERS} $(AFS_CCRULE) $(UPSTREAM)/hcrypto/evp-hcrypto.c - + evp-cc.o: ${UPSTREAM}/hcrypto/evp-cc.c ${HEADERS} $(AFS_CCRULE) $(UPSTREAM)/hcrypto/evp-cc.c diff --git a/src/crypto/hcrypto/NTMakefile b/src/crypto/hcrypto/NTMakefile index 1ad0955f9d..2ba62e7aeb 100644 --- a/src/crypto/hcrypto/NTMakefile +++ b/src/crypto/hcrypto/NTMakefile @@ -71,7 +71,7 @@ des.h: $(HCRYPTO)\des.h $(COPY) $** $@ $(HCRYPTO_OBJS):$(HCRYPTO)\$$(@B).c - $(C2OBJ) $** -I$(HCRYPTO) + $(C2OBJ) $** -I$(HCRYPTO) $(HCRYPTO_INCFILES):$(HCRYPTO)\$$(@B).h $(COPY) $** $(INCFILEDIR) diff --git a/src/dir/Makefile.in b/src/dir/Makefile.in index 476a29fda1..978ddc118f 100644 --- a/src/dir/Makefile.in +++ b/src/dir/Makefile.in @@ -15,7 +15,7 @@ all: \ depinstall depinstall: \ - ${TOP_INCDIR}/afs/dir.h + ${TOP_INCDIR}/afs/dir.h ${TOP_INCDIR}/afs/dir.h: dir.h ${INSTALL_DATA} $? $@ @@ -28,7 +28,7 @@ libdir.a: buffer.o dir.o salvage.o AFS_component_version_number.o $(AR) crv $@ buffer.o dir.o salvage.o AFS_component_version_number.o $(RANLIB) $@ -test: +test: cd test; $(MAKE) buffer.o: buffer.c dir.h diff --git a/src/dir/NTMakefile b/src/dir/NTMakefile index 7e1079f140..e64db9f8d2 100644 --- a/src/dir/NTMakefile +++ b/src/dir/NTMakefile @@ -29,8 +29,8 @@ DIR_LIBOBJS =\ $(OUT)\salvage.obj \ $(OUT)\AFS_component_version_number.obj -$(DIR_LIBFILE): $(DIR_LIBOBJS) - $(LIBARCH) +$(DIR_LIBFILE): $(DIR_LIBOBJS) + $(LIBARCH) ############################################################################ @@ -68,4 +68,4 @@ install: $(DIR_LIBFILE) $(MT_DIR_LIBFILE) $(INCFILES) clean:: mkdir: - + diff --git a/src/dir/test/Makefile.in b/src/dir/test/Makefile.in index b5ce6daa6b..bf47fd1855 100644 --- a/src/dir/test/Makefile.in +++ b/src/dir/test/Makefile.in @@ -16,11 +16,11 @@ OBJS=test-salvage.o physio.o dtest.o all: dtest -install: dtest +install: dtest clean: $(RM) -f *.o *.a test dtest core -dtest: dtest.o +dtest: dtest.o $(AFS_LDRULE) dtest.o $(LIBS) diff --git a/src/dir/test/NTMakefile b/src/dir/test/NTMakefile index bdb344a289..c2119629c6 100644 --- a/src/dir/test/NTMakefile +++ b/src/dir/test/NTMakefile @@ -17,4 +17,4 @@ $(OUT)\dtest.exe: $(OUT)\dtest.obj $(DESTDIR)\lib\afs\afsdir.lib $(SYMSTORE_IMPORT) mkdir: - + diff --git a/src/dviced/NTMakefile b/src/dviced/NTMakefile index a73975f04f..0c6e0ad30c 100644 --- a/src/dviced/NTMakefile +++ b/src/dviced/NTMakefile @@ -80,14 +80,14 @@ EXELIBS = \ $(EXEFILE): $(EXEOBJS) $(EXELIBS) $(EXECONLINK) $(_VC_MANIFEST_EMBED_EXE) - $(EXEPREP) + $(EXEPREP) $(CODESIGN_USERLAND) $(SYMSTORE_IMPORT) install: $(EXEFILE) mkdir: - + clean:: -$(DEL) $(EXEFILE) -$(DEL) $(DAFS_VICEDRES) diff --git a/src/dvolser/Makefile.in b/src/dvolser/Makefile.in index b9d03cf989..41bec98856 100644 --- a/src/dvolser/Makefile.in +++ b/src/dvolser/Makefile.in @@ -37,7 +37,7 @@ LIBS= $(top_builddir)/src/cmd/liboafs_cmd.la \ $(top_builddir)/src/opr/liboafs_opr.la \ $(top_builddir)/src/usd/liboafs_usd.la -all: davolserver +all: davolserver volmain.o: ${VOLSER}/volmain.c $(AFS_CCRULE) -I../volser $(VOLSER)/volmain.c diff --git a/src/dvolser/NTMakefile b/src/dvolser/NTMakefile index f4e194bc96..f858fbb253 100644 --- a/src/dvolser/NTMakefile +++ b/src/dvolser/NTMakefile @@ -44,7 +44,7 @@ LIBOBJS = $(OUT)\volint.cs.obj \ $(OUT)\volint.xdr.obj \ $(OUT)\volerr.obj \ $(OUT)\volint.ss.obj \ - $(OUT)\AFS_component_version_number.obj + $(OUT)\AFS_component_version_number.obj LIBOBJS2 = $(OUT)\vsprocs.obj \ $(OUT)\vsutils.obj \ @@ -98,7 +98,7 @@ VOLSERVER_EXELIBS = \ $(VOLSERVER_EXEFILE): $(VOLSERVER_EXEOBJS) $(VOLSERVER_EXELIBS) $(EXECONLINK) dnsapi.lib mpr.lib iphlpapi.lib shell32.lib $(_VC_MANIFEST_EMBED_EXE) - $(EXEPREP) + $(EXEPREP) $(CODESIGN_USERLAND) $(SYMSTORE_IMPORT) @@ -145,7 +145,7 @@ volser.h volerr.c: $(VOLSER)\volerr.et $(VOLSER)\volser.p.h ############################################################################ # Install target; primary makefile target -install_lib: $(LIBFILE) +install_lib: $(LIBFILE) install: install_lib $(VOLSERVER_EXEFILE) $(CL_VOS_EXEFILE) \ $(INCFILES) diff --git a/src/export/Makefile.in b/src/export/Makefile.in index ba5446e0c6..58649e170b 100644 --- a/src/export/Makefile.in +++ b/src/export/Makefile.in @@ -162,7 +162,7 @@ cfgafs64: cfgafs64.o $(CC) $(LDFLAGS) -g ${INCS} -q64 -o cfgafs64 cfgafs64.o ; \ fi -CFLAGS_cfgexport64.o = -g -q64 -D__XCOFF64__ +CFLAGS_cfgexport64.o = -g -q64 -D__XCOFF64__ cfgexport64.o: ${srcdir}/cfgexport.c AFS_component_version_number.c $(Q)if [ "x$(AIX64)" = "xyes" ]; then \ $(AFS_CCRULE_NOQ) $(srcdir)/cfgexport.c ; \ diff --git a/src/finale/NTMakefile b/src/finale/NTMakefile index 77f121f514..320787c21b 100644 --- a/src/finale/NTMakefile +++ b/src/finale/NTMakefile @@ -47,4 +47,4 @@ install: $(TRANSLATE_ET_EXEFILE) clean:: mkdir: - + diff --git a/src/fsint/Makefile.in b/src/fsint/Makefile.in index 925e50e4b9..3532e76ebb 100644 --- a/src/fsint/Makefile.in +++ b/src/fsint/Makefile.in @@ -104,7 +104,7 @@ pagcb.h: pagcb.xg Kcallback.h: common.xg afscbint.xg ${RXGEN} -A -x -k -h -o Kcallback.h ${srcdir}/afscbint.xg -afscbint.cs.c: common.xg afscbint.xg afsint.h afscbint.h +afscbint.cs.c: common.xg afscbint.xg afsint.h afscbint.h ${RXGEN} -A -x -C -o afscbint.cs.c ${srcdir}/afscbint.xg afscbint.ss.c: common.xg afscbint.xg afsint.h afscbint.h diff --git a/src/fsint/NTMakefile b/src/fsint/NTMakefile index 3f29e8d6ca..72d0c644ff 100644 --- a/src/fsint/NTMakefile +++ b/src/fsint/NTMakefile @@ -34,10 +34,10 @@ LIBOBJS =\ $(OUT)\AFS_component_version_number.obj $(LIBFILE): $(LIBOBJS) - $(LIBARCH) + $(LIBARCH) # use rxgen on afscbint.xg and afsint.xg -afscbint.cs.c: common.xg afscbint.xg afsint.h afscbint.h +afscbint.cs.c: common.xg afscbint.xg afsint.h afscbint.h $(RXGEN) -x -C -o afscbint.cs.c afscbint.xg afscbint.ss.c: common.xg afscbint.xg afsint.h afscbint.h @@ -78,28 +78,28 @@ MT_LIBOBJS =\ $(OUT)\afscbint.cs_mt.obj:afscbint.cs.c - $(C2OBJ) $** -DAFS_PTHREAD_ENV + $(C2OBJ) $** -DAFS_PTHREAD_ENV $(OUT)\afscbint.ss_mt.obj:afscbint.ss.c - $(C2OBJ) $** -DAFS_PTHREAD_ENV + $(C2OBJ) $** -DAFS_PTHREAD_ENV $(OUT)\afscbint.xdr_mt.obj:afscbint.xdr.c - $(C2OBJ) $** -DAFS_PTHREAD_ENV + $(C2OBJ) $** -DAFS_PTHREAD_ENV $(OUT)\afsint.cs_mt.obj:afsint.cs.c - $(C2OBJ) $** -DAFS_PTHREAD_ENV + $(C2OBJ) $** -DAFS_PTHREAD_ENV $(OUT)\afsint.ss_mt.obj:afsint.ss.c - $(C2OBJ) $** -DAFS_PTHREAD_ENV + $(C2OBJ) $** -DAFS_PTHREAD_ENV $(OUT)\afsint.xdr_mt.obj:afsint.xdr.c - $(C2OBJ) $** -DAFS_PTHREAD_ENV + $(C2OBJ) $** -DAFS_PTHREAD_ENV $(OUT)\afsaux_mt.obj:afsaux.c - $(C2OBJ) $** -DAFS_PTHREAD_ENV + $(C2OBJ) $** -DAFS_PTHREAD_ENV $(MT_LIBFILE): $(MT_LIBOBJS) - $(LIBARCH) + $(LIBARCH) install: $(LIBFILE) $(INCFILES) $(MT_LIBFILE) @@ -107,4 +107,4 @@ clean:: $(DEL) *.cs.c *.ss.c *.xdr.c afsint.h afscbint.h $(DEL) $(LIBFILE) $(MT_LIBFILE) mkdir: - + diff --git a/src/fsprobe/Makefile.in b/src/fsprobe/Makefile.in index c26d3f2b9a..3056500e78 100644 --- a/src/fsprobe/Makefile.in +++ b/src/fsprobe/Makefile.in @@ -60,13 +60,13 @@ install: fsprobe.h libfsprobe.a ${INSTALL} -d ${DESTDIR}${includedir}/afs ${INSTALL} -d ${DESTDIR}${libdir}/afs ${INSTALL_DATA} ${srcdir}/fsprobe.h ${DESTDIR}${includedir}/afs/fsprobe.h - ${INSTALL_DATA} libfsprobe.a ${DESTDIR}${libdir}/afs/libfsprobe.a + ${INSTALL_DATA} libfsprobe.a ${DESTDIR}${libdir}/afs/libfsprobe.a dest: fsprobe.h libfsprobe.a ${INSTALL} -d ${DEST}/include/afs ${INSTALL} -d ${DEST}/lib/afs ${INSTALL_DATA} ${srcdir}/fsprobe.h ${DEST}/include/afs/fsprobe.h - ${INSTALL_DATA} libfsprobe.a ${DEST}/lib/afs/libfsprobe.a + ${INSTALL_DATA} libfsprobe.a ${DEST}/lib/afs/libfsprobe.a # # Misc others diff --git a/src/kauth/Makefile.in b/src/kauth/Makefile.in index 9df89e8d5e..f0b5b6d65f 100644 --- a/src/kauth/Makefile.in +++ b/src/kauth/Makefile.in @@ -79,7 +79,7 @@ depinstall: \ kaerrors.c kauth.cs.c kauth.xdr.c \ ${TOP_INCDIR}/afs/kautils.h \ ${TOP_INCDIR}/afs/kauth.h \ - ${TOP_INCDIR}/afs/kaport.h + ${TOP_INCDIR}/afs/kaport.h generated: \ kaerrors.c kautils.h \ diff --git a/src/kauth/NTMakefile b/src/kauth/NTMakefile index 7e3897a535..d888d948e0 100644 --- a/src/kauth/NTMakefile +++ b/src/kauth/NTMakefile @@ -43,8 +43,8 @@ KAUTH_LIBOBJS =\ $(OUT)\krb_tf.obj \ $(OUT)\AFS_component_version_number.obj -$(KAUTH_LIBFILE): $(KAUTH_LIBOBJS) - $(LIBARCH) +$(KAUTH_LIBFILE): $(KAUTH_LIBOBJS) + $(LIBARCH) ############################################################################ # build afskauth.krb.lib @@ -65,8 +65,8 @@ KAUTH_KRB_LIBOBJS =\ $(OUT)\krb_tf.obj \ $(OUT)\AFS_component_version_number.obj -$(KAUTH_KRB_LIBFILE): $(KAUTH_KRB_LIBOBJS) - $(LIBARCH) +$(KAUTH_KRB_LIBFILE): $(KAUTH_KRB_LIBOBJS) + $(LIBARCH) #make user.krb.obj @@ -126,13 +126,13 @@ KASERVER_EXELIBS =\ $(KASERVER): $(KASERVER_OBJS) $(AFSLIBS) $(KASERVER_EXELIBS) $(EXECONLINK) dnsapi.lib mpr.lib iphlpapi.lib shell32.lib $(_VC_MANIFEST_EMBED_EXE) - $(EXEPREP) + $(EXEPREP) $(CODESIGN_USERLAND) $(SYMSTORE_IMPORT) #build $(OUT)\kadatabase.obj -$(OUT)\kadatabase.obj: kadatabase.c +$(OUT)\kadatabase.obj: kadatabase.c $(C2OBJ) $** /DSPECIAL=1 #build $(OUT)\kaprocs.obj @@ -153,7 +153,7 @@ KAS_OBJS =\ $(KAS): $(KAS_OBJS) $(AFSLIBS) $(KAUTH_LIBFILE) $(TOKENLIB) $(EXECONLINK) dnsapi.lib mpr.lib iphlpapi.lib shell32.lib $(_VC_MANIFEST_EMBED_EXE) - $(EXEPREP) + $(EXEPREP) $(CODESIGN_USERLAND) $(SYMSTORE_IMPORT) @@ -181,14 +181,14 @@ $(OUT)\kpwvalid.exe: $(OUT)\kpwvalid.obj $(AFSLIBS) $(KAUTH_LIBFILE) $(SYMSTORE_IMPORT) #kdb.exe - Not implemented for NT - because dbm not available on NT -#kdb.exe: $(OUT)\kdb.obj $(AFSLIBS) $(KAUTH_LIBFILE) +#kdb.exe: $(OUT)\kdb.obj $(AFSLIBS) $(KAUTH_LIBFILE) # $(EXECONLINK) dnsapi.lib mpr.lib iphlpapi.lib shell32.lib # $(_VC_MANIFEST_EMBED_EXE) # $(CODESIGN_USERLAND) # $(SYMSTORE_IMPORT) -#rebuild.exe -$(OUT)\rebuild.exe: $(OUT)\rebuild.obj $(OUT)\kautils.obj $(AFSLIBS) +#rebuild.exe +$(OUT)\rebuild.exe: $(OUT)\rebuild.obj $(OUT)\kautils.obj $(AFSLIBS) $(EXECONLINK) dnsapi.lib mpr.lib iphlpapi.lib shell32.lib $(_VC_MANIFEST_EMBED_EXE) $(CODESIGN_USERLAND) @@ -222,14 +222,14 @@ kauth.h: kauth.rg $(RXGEN) -u -x -h -o $@ kauth.rg ############################################################################ -# compile_et on kaerrors.c +# compile_et on kaerrors.c kaerrors.c kautils.h: kaerrors.et kautils.p.h $(DEL) kautils.h kaerrors.c $(COMPILE_ET) kaerrors -h kautils ############################################################################ -# install +# install install: $(INCFILES) $(KAUTH_LIBFILE) $(KAUTH_KRB_LIBFILE) $(KASERVER) $(KAS) \ $(KPASSWD_EXEFILE) \ @@ -237,7 +237,7 @@ install: $(INCFILES) $(KAUTH_LIBFILE) $(KAUTH_KRB_LIBFILE) $(KASERVER) $(KAS) \ $(DESTDIR)\etc\kas.exe install9X: $(INCFILES) $(KAUTH_LIBFILE) $(KAUTH_KRB_LIBFILE) \ - $(KPASSWD_EXEFILE) + $(KPASSWD_EXEFILE) # installation targets that depend on local targets $(DESTDIR)\etc\kas.exe: $(DESTDIR)\root.server\usr\afs\bin\kas.exe diff --git a/src/kauth/test/Makefile.in b/src/kauth/test/Makefile.in index 7be1b31640..c98de4cf99 100644 --- a/src/kauth/test/Makefile.in +++ b/src/kauth/test/Makefile.in @@ -14,7 +14,7 @@ LIBS= -llwp -ldes -lrxkad -lauth -lcmd -lubik -lprot -lsys -lrx -lafscom_err -lk # the only tests _known_ to work are multiklog and the tcl scripts. -all test tests: multiklog +all test tests: multiklog install: dest: @@ -37,10 +37,10 @@ decode_ticket: decode_ticket.o test_interim_ktc: test_interim_ktc.o $(AFS_LDRULE) test_interim_ktc.o ${LDIRS} ${LIBS} -test_rxkad_free: test_rxkad_free.o +test_rxkad_free: test_rxkad_free.o $(AFS_LDRULE) test_rxkad_free.o ${LDIRS} ${LIBS} -test_getticket: test_getticket.o +test_getticket: test_getticket.o $(AFS_LDRULE) test_getticket.o ${LDIRS} ${LIBS} background: background.c diff --git a/src/kauth/test/NTMakefile b/src/kauth/test/NTMakefile index a5eebca939..bb62579fcc 100644 --- a/src/kauth/test/NTMakefile +++ b/src/kauth/test/NTMakefile @@ -53,7 +53,7 @@ $(OUT)\test_interim_ktc.exe: $(OUT)\test_interim_ktc.obj $(CODESIGN_USERLAND) $(SYMSTORE_IMPORT) -$(OUT)\test_rxkad_free: test_rxkad_free.o +$(OUT)\test_rxkad_free: test_rxkad_free.o $(EXECONLINK) $(EXELIBS) $(_VC_MANIFEST_EMBED_EXE) $(CODESIGN_USERLAND) @@ -116,4 +116,4 @@ runtest: background multiklog test_badtix test_interim_ktc test_rxkad_free clean:: mkdir: - + diff --git a/src/kopenafs/Makefile.in b/src/kopenafs/Makefile.in index f8b28b6fdd..4274cce379 100644 --- a/src/kopenafs/Makefile.in +++ b/src/kopenafs/Makefile.in @@ -12,7 +12,7 @@ include @TOP_OBJDIR@/src/config/Makefile.config include @TOP_OBJDIR@/src/config/Makefile.shared -# API version. When something changes, increment as appropriate. +# API version. When something changes, increment as appropriate. # Ignore at your own risk. MAJOR = 1 MINOR = 1 diff --git a/src/libacl/Makefile.in b/src/libacl/Makefile.in index a8a795e057..f2c90f539a 100644 --- a/src/libacl/Makefile.in +++ b/src/libacl/Makefile.in @@ -24,7 +24,7 @@ all: \ depinstall: \ ${TOP_INCDIR}/afs/acl.h \ - ${TOP_INCDIR}/afs/prs_fs.h + ${TOP_INCDIR}/afs/prs_fs.h ${TOP_LIBDIR}/libacl.a: libacl.a ${INSTALL_DATA} $? $@ @@ -67,7 +67,7 @@ dest: libacl.a acl.h prs_fs.h test: cd test; $(MAKE) -clean: +clean: $(LT_CLEAN) $(RM) -f acltest *.o *.a core AFS_component_version_number.c diff --git a/src/libacl/NTMakefile b/src/libacl/NTMakefile index e63ce6c641..076fd47fdf 100644 --- a/src/libacl/NTMakefile +++ b/src/libacl/NTMakefile @@ -22,15 +22,15 @@ INCFILES =\ ############################################################################ # build afsacl.lib -LIBFILE = $(DESTDIR)\lib\afs\afsacl.lib +LIBFILE = $(DESTDIR)\lib\afs\afsacl.lib LIBOBJS =\ $(OUT)\aclprocs.obj \ $(OUT)\netprocs.obj \ $(OUT)\AFS_component_version_number.obj -$(LIBFILE): $(LIBOBJS) - $(LIBARCH) +$(LIBFILE): $(LIBOBJS) + $(LIBARCH) ############################################################################ @@ -52,4 +52,4 @@ test: mkdir: - + diff --git a/src/libacl/test/Makefile.in b/src/libacl/test/Makefile.in index c8dff6d45b..ef3446a002 100644 --- a/src/libacl/test/Makefile.in +++ b/src/libacl/test/Makefile.in @@ -15,7 +15,7 @@ LIBS= -lacl -lprot -lubik -lrx -llwp -lauth -lrxkad -lsys ${XLIBS} all: acltest -install: +install: # # Build targets @@ -23,7 +23,7 @@ install: acltest: acltest.o $(AFS_LDRULE) $(LDIRS) $(LIBS) acltest.o -acltest.o: acltest.c +acltest.o: acltest.c # # Misc. targets @@ -31,5 +31,5 @@ acltest.o: acltest.c clean: $(RM) -f *.o *.a acltest core -dest: +dest: diff --git a/src/libadmin/NTMakefile b/src/libadmin/NTMakefile index 836b838f2c..4625f0e672 100644 --- a/src/libadmin/NTMakefile +++ b/src/libadmin/NTMakefile @@ -21,4 +21,4 @@ clean:: $(DEL) $(INCFILES) mkdir: - + diff --git a/src/libadmin/adminutil/NTMakefile b/src/libadmin/adminutil/NTMakefile index 3e37919f9c..7588dfa0dc 100644 --- a/src/libadmin/adminutil/NTMakefile +++ b/src/libadmin/adminutil/NTMakefile @@ -91,13 +91,13 @@ BOZOOBJS=\ $(OUT)\boserr.obj KAUTHOBJS=\ - $(OUT)\kaerrors.obj + $(OUT)\kaerrors.obj CMDOBJS=\ - $(OUT)\cmd_errors.obj + $(OUT)\cmd_errors.obj PTSERVEROBJS=\ - $(OUT)\pterror.obj + $(OUT)\pterror.obj UBIKOBJS=\ $(OUT)\uerrors.obj diff --git a/src/libadmin/bos/NTMakefile b/src/libadmin/bos/NTMakefile index 31dcb86fba..40e1ee5791 100644 --- a/src/libadmin/bos/NTMakefile +++ b/src/libadmin/bos/NTMakefile @@ -66,4 +66,4 @@ $(BOZOOBJS): $(BOZO)\$$(@B).c $(OUT)\afsbosadmin.res: AFS_component_version_number.h mkdir: - + diff --git a/src/libadmin/cfg/NTMakefile b/src/libadmin/cfg/NTMakefile index 860c421255..2c5669618a 100644 --- a/src/libadmin/cfg/NTMakefile +++ b/src/libadmin/cfg/NTMakefile @@ -104,4 +104,4 @@ install: $(DLLFILE) $(INCFILES) clean:: mkdir: - + diff --git a/src/libadmin/cfg/test/NTMakefile b/src/libadmin/cfg/test/NTMakefile index c161129eab..7bbf28c1af 100644 --- a/src/libadmin/cfg/test/NTMakefile +++ b/src/libadmin/cfg/test/NTMakefile @@ -27,4 +27,4 @@ $(OUT)\cfgtest.exe: $(OUT)\cfgtest.obj $(CFGTEST_EXELIBS) $(SYMSTORE_IMPORT) mkdir: - + diff --git a/src/libadmin/client/NTMakefile b/src/libadmin/client/NTMakefile index 26cf5f768e..c7acec01d4 100644 --- a/src/libadmin/client/NTMakefile +++ b/src/libadmin/client/NTMakefile @@ -48,4 +48,4 @@ install: $(DLLFILE) $(LIBINCLUDES) $(OUT)\afsclientadmin.res: AFS_component_version_number.h mkdir: - + diff --git a/src/libadmin/kas/NTMakefile b/src/libadmin/kas/NTMakefile index db1d627b47..affc879042 100644 --- a/src/libadmin/kas/NTMakefile +++ b/src/libadmin/kas/NTMakefile @@ -63,4 +63,4 @@ $(RXOBJS): $(RX)\$$(@B).c $(OUT)\afskasadmin.res: AFS_component_version_number.h mkdir: - + diff --git a/src/libadmin/pts/NTMakefile b/src/libadmin/pts/NTMakefile index 640246f49b..4a1e163d45 100644 --- a/src/libadmin/pts/NTMakefile +++ b/src/libadmin/pts/NTMakefile @@ -68,4 +68,4 @@ $(PTSERVEROBJS): $(PTSERVER)\$$(@B).c $(OUT)\afsptsadmin.res: AFS_component_version_number.h mkdir: - + diff --git a/src/libadmin/test/NTMakefile b/src/libadmin/test/NTMakefile index 3b86ef902e..638e43a3f0 100644 --- a/src/libadmin/test/NTMakefile +++ b/src/libadmin/test/NTMakefile @@ -41,4 +41,4 @@ $(OUT)\afscp.exe: $(OUT)\afscp.obj $(AFSCP_EXEOBJS) $(AFSCP_EXELIBS) $(SYMSTORE_IMPORT) mkdir: - + diff --git a/src/libadmin/vos/NTMakefile b/src/libadmin/vos/NTMakefile index d87fdf4da5..5ba1afcf2b 100644 --- a/src/libadmin/vos/NTMakefile +++ b/src/libadmin/vos/NTMakefile @@ -92,4 +92,4 @@ $(FSINTOBJS):$(FSINT)\$$(@B).c $(OUT)\afsvosadmin.res: AFS_component_version_number.h mkdir: - + diff --git a/src/libafsrpc/NTMakefile b/src/libafsrpc/NTMakefile index c5fece3649..f2a5b3821f 100644 --- a/src/libafsrpc/NTMakefile +++ b/src/libafsrpc/NTMakefile @@ -65,7 +65,7 @@ DLLOBJS = $(MULTIOBJS) $(RXOBJS) $(XDROBJS) $(RXSTATBJS) $(LIBRXKAD_OBJS) \ $(LWPOBJS) $(OUT)\afsrpc.res $(MULTIOBJS) $(RXOBJS) $(XDROBJS):$(RX)\$$(@B).c - $(C2OBJ) $** -I$(RX) + $(C2OBJ) $** -I$(RX) $(RXSTATBJS):$(RXSTAT)\$$(@B).c $(C2OBJ) $** -I$(RXSTAT) diff --git a/src/log/Makefile.in b/src/log/Makefile.in index cdc63977e0..e067d3ab93 100644 --- a/src/log/Makefile.in +++ b/src/log/Makefile.in @@ -98,7 +98,7 @@ dest: unlog tokens tokens.krb pagsh pagsh.krb # # Misc. targets # -clean: +clean: $(RM) -f *.o unlog tokens kseal pagsh pagsh.krb \ core AFS_component_version_number.c tokens.krb diff --git a/src/log/test/Makefile.in b/src/log/test/Makefile.in index 0e5da26118..a951a914cd 100644 --- a/src/log/test/Makefile.in +++ b/src/log/test/Makefile.in @@ -15,22 +15,22 @@ LIBS= -lauth -lrxkad -ldes -lsys -lrx -llwp -lcmd -lafsutil ${XLIBS} all: testlog gettoktest -install: +install: # # Build targets # -testlog: testlog.o +testlog: testlog.o $(AFS_LDRULE) testlog.o ${LDIRS} ${LIBS} -gettoktest: gettoktest.o +gettoktest: gettoktest.o $(AFS_LDRULE) gettoktest.o ${LDIRS} ${LIBS} # # Misc. targets -# -clean: +# +clean: $(RM) -f *.o testlog gettoktest core -dest: +dest: diff --git a/src/lwp/NTMakefile b/src/lwp/NTMakefile index ad12586fa6..ab6ddf61e2 100644 --- a/src/lwp/NTMakefile +++ b/src/lwp/NTMakefile @@ -5,7 +5,7 @@ # License. For details, see the LICENSE file in the top-level source # directory or online at http://www.openafs.org/dl/license10.html -# nmake Makefile for NT build of LWP. +# nmake Makefile for NT build of LWP. RELDIR=lwp !include ..\config\NTMakefile.$(SYS_NAME) @@ -33,7 +33,7 @@ INCFILES = \ install_headers: $(INCFILES) -install: install_headers $(LIBFILE) +install: install_headers $(LIBFILE) $(LIBFILE): $(LIBOBJS) $(LIBARCH) @@ -50,4 +50,4 @@ clean:: $(DEL) $(LIBFILE) mkdir: - + diff --git a/src/lwp/test/Makefile.in b/src/lwp/test/Makefile.in index 2cfb2f4d0f..2cda5f8b31 100644 --- a/src/lwp/test/Makefile.in +++ b/src/lwp/test/Makefile.in @@ -10,7 +10,7 @@ include @TOP_OBJDIR@/src/config/Makefile.config include @TOP_OBJDIR@/src/config/Makefile.lwp -INCDIRS= -I.. -I${DESTDIR}/include +INCDIRS= -I.. -I${DESTDIR}/include LIBS= ../liblwp.a system noversion: test diff --git a/src/lwp/test/NTMakefile b/src/lwp/test/NTMakefile index 08486e5a68..0d1e040574 100644 --- a/src/lwp/test/NTMakefile +++ b/src/lwp/test/NTMakefile @@ -31,4 +31,4 @@ clean:: mkdir: - + diff --git a/src/platform/DARWIN/Makefile.in b/src/platform/DARWIN/Makefile.in index ca229cd6d1..39af83b384 100644 --- a/src/platform/DARWIN/Makefile.in +++ b/src/platform/DARWIN/Makefile.in @@ -18,7 +18,7 @@ all: OpenAFS.prefPane afssettings afscell growlagent aklog.bundle AFSPreference/build/Release/OpenAFS.prefPane: OpenAFS.prefPane afscell/build/Release/afscell.bundle: afscell -afscell/InstallerSections.plist: afscell +afscell/InstallerSections.plist: afscell OpenAFS.prefPane: @case ${OSXSDK} in \ @@ -47,7 +47,7 @@ afscell: echo Not building afscell.bundle for ${OSXSDK} ;; \ esac -afssettings: afssettings.m +afssettings: afssettings.m ${CC} ${AFS_CFLAGS} -o afssettings $? -framework Foundation install: \ diff --git a/src/procmgmt/test/NTMakefile b/src/procmgmt/test/NTMakefile index 73e1a430e2..186a122e3e 100644 --- a/src/procmgmt/test/NTMakefile +++ b/src/procmgmt/test/NTMakefile @@ -22,4 +22,4 @@ $(OUT)\pmgttest.exe: $(OUT)\pmgttest.obj $(PMGTTEST_EXELIBS) $(SYMSTORE_IMPORT) mkdir: - + diff --git a/src/ptserver/Makefile.in b/src/ptserver/Makefile.in index b2b1829cc9..86835ed449 100644 --- a/src/ptserver/Makefile.in +++ b/src/ptserver/Makefile.in @@ -117,7 +117,7 @@ CFLAGS_ptprocs.o = @CFLAGS_NOSTRICT@ ptutils.o: ptutils.c ${INCLS} ptprocs.o: ptprocs.c ${INCLS} -utils.o: utils.c ${INCLS} +utils.o: utils.c ${INCLS} map.o: map.c ${INCLS} ptint.ss.o: ptint.ss.c ptint.xdr.c ptint.xg ptint.cs.lo: ptint.cs.c ptint.xdr.c ptint.xg diff --git a/src/ptserver/NTMakefile b/src/ptserver/NTMakefile index 709bd44013..d895db8f35 100644 --- a/src/ptserver/NTMakefile +++ b/src/ptserver/NTMakefile @@ -15,7 +15,7 @@ AFSDEV_AUXCDEFINES = -DAFS_USE_GETTIMEOFDAY -DSUPERGROUPS ############################################################################ # Definitions for installing header files -INCFILEDIR = $(DESTDIR)\include +INCFILEDIR = $(DESTDIR)\include INCFILES =\ $(INCFILEDIR)\afs\ptserver.h \ @@ -38,7 +38,7 @@ LIBOBJS =\ $(OUT)\AFS_component_version_number.obj $(LIBFILE): $(LIBOBJS) - $(LIBARCH) + $(LIBARCH) ############################################################################ # build ptserver.exe @@ -83,7 +83,7 @@ PTSERVER_EXELIBS =$(PTSERVER_EXELIBS) $(DESTDIR)\lib\afs\afsprocmgmt.lib $(PTSERVER): $(PTSERVER_EXEOBJS) $(RXKADOBJS) $(PTSERVER_EXELIBS) $(EXECONLINK) dnsapi.lib mpr.lib iphlpapi.lib shell32.lib $(_VC_MANIFEST_EMBED_EXE) - $(EXEPREP) + $(EXEPREP) $(CODESIGN_USERLAND) $(SYMSTORE_IMPORT) @@ -133,21 +133,21 @@ PTS_EXELIBS =\ $(PTS): $(PTS_EXEOBJS) $(PTS_EXELIBS) $(EXECONLINK) dnsapi.lib mpr.lib iphlpapi.lib shell32.lib $(_VC_MANIFEST_EMBED_EXE) - $(EXEPREP) + $(EXEPREP) $(CODESIGN_USERLAND) $(SYMSTORE_IMPORT) $(PTCLIENT): $(PTCLIENT_EXEOBJS) $(PTS_EXELIBS) $(EXECONLINK) dnsapi.lib mpr.lib iphlpapi.lib shell32.lib $(_VC_MANIFEST_EMBED_EXE) - $(EXEPREP) + $(EXEPREP) $(CODESIGN_USERLAND) $(SYMSTORE_IMPORT) $(PT_UTIL): $(PT_UTIL_EXEOBJS) $(PTS_EXELIBS) $(EXECONLINK) dnsapi.lib mpr.lib iphlpapi.lib shell32.lib $(_VC_MANIFEST_EMBED_EXE) - $(EXEPREP) + $(EXEPREP) $(CODESIGN_USERLAND) $(SYMSTORE_IMPORT) @@ -220,7 +220,7 @@ $(DESTDIR)\root.server\usr\afs\bin\pt_util.exe: $(PT_UTIL) $(INCFILEDIR)\afs\prserver.h: $(INCFILEDIR)\afs\ptserver.h $(COPY) $(INCFILEDIR)\afs\ptserver.h $(INCFILEDIR)\afs\prserver.h -$(INCFILEDIR)\afs\print.h: $(INCFILEDIR)\afs\ptint.h +$(INCFILEDIR)\afs\print.h: $(INCFILEDIR)\afs\ptint.h $(COPY) $(INCFILEDIR)\afs\ptint.h $(INCFILEDIR)\afs\print.h $(INCFILEDIR)\afs\prerror.h: $(INCFILEDIR)\afs\pterror.h @@ -235,7 +235,7 @@ $(INCFILEDIR)\afs\prclient.h: $(INCFILEDIR)\afs\ptclient.h clean:: $(DEL) ptint.cs.c ptint.ss.c ptint.xdr.c ptint.h - $(DEL) $(OUT)\readgroup.exe $(OUT)\readpwd.exe $(OUT)\db_verify.exe $(OUT)\testpt.exe + $(DEL) $(OUT)\readgroup.exe $(OUT)\readpwd.exe $(OUT)\db_verify.exe $(OUT)\testpt.exe $(DEL) pterror.h pterror.c $(DEL) $(PTS) $(PTCLIENT) $(PT_UTIL) diff --git a/src/rx/Makefile.in b/src/rx/Makefile.in index 131861834d..13be450bdb 100644 --- a/src/rx/Makefile.in +++ b/src/rx/Makefile.in @@ -131,7 +131,7 @@ ${TOP_INCDIR}/rx/xdr.h: xdr.h ${TOP_INCDIR}/rx/xdr_prototypes.h: xdr_prototypes.h ${INSTALL_DATA} $? $@ -${TOP_INCDIR}/rx/rx_xmit_nt.h: rx_xmit_nt.h +${TOP_INCDIR}/rx/rx_xmit_nt.h: rx_xmit_nt.h ${INSTALL_DATA} $? $@ install: librx.a diff --git a/src/rx/NTMakefile b/src/rx/NTMakefile index b386e319ae..9b4a27aac3 100644 --- a/src/rx/NTMakefile +++ b/src/rx/NTMakefile @@ -67,7 +67,7 @@ INCFILES = \ $(LIBOBJS): $(INCFILES) -$(MULTIOBJS): rx_multi.h +$(MULTIOBJS): rx_multi.h $(XDROBJS): xdr.h @@ -85,4 +85,4 @@ clean:: $(DEL) $(LIBFILE) $(INCFILES) mkdir: - + diff --git a/src/rx/test/NTMakefile b/src/rx/test/NTMakefile index 38fa7df2e0..2c90d1faa6 100644 --- a/src/rx/test/NTMakefile +++ b/src/rx/test/NTMakefile @@ -54,7 +54,7 @@ $(OUT)\generator.exe: $(OUT)\generator.obj $(LIBS) $(RXTESTOBJS): ..\rx_clock.h ..\rx_queue.h ..\rx_event.h ..\rx.h mkdir: - + install: tests clean:: diff --git a/src/rxdebug/NTMakefile b/src/rxdebug/NTMakefile index 17bc0e408a..9ee4884ddc 100644 --- a/src/rxdebug/NTMakefile +++ b/src/rxdebug/NTMakefile @@ -30,7 +30,7 @@ RXDLIBS = $(LIBDIR)\afs\afscmd.lib \ $(LIBDIR)\opr.lib $(OUT)\rxdebug.res: rxdebug.rc $(VERSFILE).h - $(RC) /Fo$*.RES $(*F).rc + $(RC) /Fo$*.RES $(*F).rc $(OUT)\rxdebug.obj: rxdebug.c @@ -47,4 +47,4 @@ clean:: $(DEL) $(RXDOBJS) $(RXDEBUG) mkdir: - + diff --git a/src/rxgen/NTMakefile b/src/rxgen/NTMakefile index e2fbcfb53c..046077d21d 100644 --- a/src/rxgen/NTMakefile +++ b/src/rxgen/NTMakefile @@ -9,7 +9,7 @@ RELDIR=rxgen !INCLUDE ..\config\NTMakefile.$(SYS_NAME) !INCLUDE ..\config\NTMakefile.version -INCFILEDIR = $(DESTDIR)\include\afs +INCFILEDIR = $(DESTDIR)\include\afs INCFILES =\ $(INCFILEDIR)\rxgen_consts.h @@ -31,7 +31,7 @@ EXEOBJS =\ $(OUT)\rpc_util.obj \ $(OUT)\rpc_svcout.obj \ $(OUT)\rpc_clntout.obj - + $(EXEOBJS): $$(@B).c $(C2OBJ) $** @@ -40,7 +40,7 @@ $(EXERES): rxgen.rc AFS_component_version_number.h $(EXEFILE): $(EXEOBJS) $(EXERES) $(EXELIBS) $(EXECONLINK) $(_VC_MANIFEST_EMBED_EXE) - $(EXEPREP) + $(EXEPREP) $(CODESIGN_USERLAND) $(SYMSTORE_IMPORT) @@ -51,4 +51,4 @@ clean:: $(DEL) $(EXERES) mkdir: - + diff --git a/src/rxkad/Makefile.in b/src/rxkad/Makefile.in index fe04178ced..af85a1e3ef 100644 --- a/src/rxkad/Makefile.in +++ b/src/rxkad/Makefile.in @@ -112,7 +112,7 @@ ticket.o ticket.lo: rxkad.h tcrypt.o: tcrypt.c AFS_component_version_number.o -tcrypt: tcrypt.o librxkad.a +tcrypt: tcrypt.o librxkad.a $(AFS_LDRULE) tcrypt.o librxkad.a fc_test: ${fc_test_OBJS} ${fc_test_LIBS} @@ -144,7 +144,7 @@ dest: librxkad.a fcrypt.h rxkad.h rxkad_prototypes.h # # Misc. targets # -clean: +clean: $(LT_CLEAN) $(RM) -f *.o *.a tcrypt core rxkad_errs.c rxkad.h \ AFS_component_version_number.c fc_test diff --git a/src/rxkad/NTMakefile b/src/rxkad/NTMakefile index 9b1f0b0f1a..ff84450563 100644 --- a/src/rxkad/NTMakefile +++ b/src/rxkad/NTMakefile @@ -29,7 +29,7 @@ LIBOBJS =\ $(OUT)\bg-fcrypt.obj \ $(OUT)\ticket5.obj \ $(OUT)\crc.obj \ - $(OUT)\crypt_conn.obj + $(OUT)\crypt_conn.obj $(LIBOBJS): @@ -37,7 +37,7 @@ $(LIBOBJS): LIBFILE = $(DESTDIR)\lib\afsrxkad.lib $(LIBFILE): $(LIBOBJS) - $(LIBARCH) + $(LIBARCH) # generate rxkad.h and rxkad_errs.c from rxkad_errs.et @@ -47,7 +47,7 @@ $(INCFILES):$$(@F) $(COPY) stats.h $(INCFILEDIR)\rxkad_stats.h rxkad.h rxkad_errs.c : rxkad_errs.et rxkad.p.h - $(DEL) rxkad_errs.c + $(DEL) rxkad_errs.c $(COMPILE_ET) rxkad_errs -h rxkad $(OUT)\fcrypt.obj: fcrypt.c fcrypt.h sboxes.h rxkad.h rxkad_prototypes.h @@ -63,4 +63,4 @@ clean:: $(DEL) $(LIBFILE) mkdir: - + diff --git a/src/rxkad/test/Makefile.in b/src/rxkad/test/Makefile.in index 1775eadb72..c37360c23a 100644 --- a/src/rxkad/test/Makefile.in +++ b/src/rxkad/test/Makefile.in @@ -49,7 +49,7 @@ th_stress.ss.o: stress.ss.c th_stress.cs.o: stress.cs.c ${THRULE} -c stress.cs.c -o th_stress.cs.o - + th_stress.xdr.o: stress.xdr.c stress.h ${THRULE} -c stress.xdr.c -o th_stress.xdr.o @@ -94,7 +94,7 @@ th_stress_s.o: stress_s.c ${HEADERS} ${THRULE} -c $(srcdir)/stress_s.c -o th_stress_s.o stress: stress.o stress.xdr.o stress_c.o stress_s.o stress.cs.o \ - stress.ss.o stress_errs.o + stress.ss.o stress_errs.o $(AFS_LDRULE) stress.o stress.xdr.o stress_c.o \ stress_s.o stress.cs.o stress.ss.o stress_errs.o \ ${LIBS} ${XLIBS} diff --git a/src/rxkad/test/NTMakefile b/src/rxkad/test/NTMakefile index 03ddb38882..558ab3817a 100644 --- a/src/rxkad/test/NTMakefile +++ b/src/rxkad/test/NTMakefile @@ -34,8 +34,8 @@ EXELIBS =\ $(DESTDIR)\lib\afs\afsutil.lib \ $(DESTDIR)\lib\afs\afsreg.lib -$(EXEFILE): $(EXEOBJS) - $(EXECONLINK) $(EXELIBS) +$(EXEFILE): $(EXEOBJS) + $(EXECONLINK) $(EXELIBS) $(_VC_MANIFEST_EMBED_EXE) $(EXEPREP) $(CODESIGN_USERLAND) @@ -62,7 +62,7 @@ test tests: $(EXEFILE) clean:: $(DEL) stress.cs.c stress.ss.c stress.xdr.c stress.h \ - stress_errs.c stress_errs.h stress.EXE th_* + stress_errs.c stress_errs.h stress.EXE th_* mkdir: - + diff --git a/src/rxosd/Makefile.in b/src/rxosd/Makefile.in index 0b6b86489c..5017076b2a 100644 --- a/src/rxosd/Makefile.in +++ b/src/rxosd/Makefile.in @@ -24,7 +24,7 @@ FSINT=../fsint CLIENTOBJS=osd.o -RXOSDOBJS=rxosd.o rxosd.ss.o rxosd.cs.o rxosd.xdr.o rxosd_hpss.o rxosd_dcache.o +RXOSDOBJS=rxosd.o rxosd.ss.o rxosd.cs.o rxosd.xdr.o rxosd_hpss.o rxosd_dcache.o LWPOBJS=lock.o threadname.o @@ -52,7 +52,7 @@ ${TOP_INCDIR}/afs/rxosd.h: rxosd.h osd: osd.o rxosd.cs.o osddbuser.o policy_parser.o ${AFS_LDRULE} osd.o rxosd.cs.o rxosd.xdr.o policy_parser.o \ ${OSDDBOBJS} ${LIBS} ${MT_LIBS} ${XLIBS} - + CFLAGS_rxosd.o = ${HSM_INC} ${PNFS_OPT} -DBUILDING_RXOSD CFLAGS_hpss.o = ${HSM_INC} ${PNFS_OPT} -DBUILDING_RXOSD @@ -172,7 +172,7 @@ librxosd.a: rxosd.xdr.o rxosd.cs.o ${TOP_LIBDIR}/librxosd.a: librxosd.a ${INSTALL} $? $@ -install: +install: ${INSTALL} -d ${DESTDIR}${afssrvlibexecdir} ${INSTALL} -d ${DESTDIR}${bindir} ${INSTALL_PROGRAM} rxosd ${DESTDIR}}${afssrvlibexecdir}/rxosd @@ -185,7 +185,7 @@ dest: ${INSTALL_PROGRAM} rxosd ${DEST}/root.server/usr/afs/bin/rxosd ${INSTALL_PROGRAM} readabyte ${DEST}/root.server/usr/afs/bin/readabyte ${INSTALL_PROGRAM} osd ${DEST}/bin/osd - + clean: $(RM) -f *.o rxosd.*.* rxosd.[oh] Krxo* osd core AFS_component_version_number.c osddb* policy_parser.c diff --git a/src/scout/Makefile.in b/src/scout/Makefile.in index d7708cdcd5..db0f1613a1 100644 --- a/src/scout/Makefile.in +++ b/src/scout/Makefile.in @@ -22,7 +22,7 @@ INCLS=${TOP_INCDIR}/afs/gtxobjects.h \ ${TOP_INCDIR}/afs/keys.h \ ${TOP_INCDIR}/afs/cellconfig.h \ ${TOP_INCDIR}/afs/cmd.h - + LIBS=${TOP_LIBDIR}/libgtx.a \ ${TOP_LIBDIR}/libfsprobe.a \ ${TOP_LIBDIR}/libvolser.a \ diff --git a/src/sgistuff/Makefile.in b/src/sgistuff/Makefile.in index 5d36ea1a3f..a60b268316 100644 --- a/src/sgistuff/Makefile.in +++ b/src/sgistuff/Makefile.in @@ -48,7 +48,7 @@ KAFSLIBS=${TOP_LIBDIR}/libkauth.krb.a \ AUTHFILES=ta-rauth.o rcmd.o herror.o AUTHLIBS=afsauthlib.so afskauthlib.so -TARGETS=$(AUTHLIBS) +TARGETS=$(AUTHLIBS) all: ${TOP_LIBDIR}/afsauthlib.so ${TOP_LIBDIR}/afskauthlib.so @@ -71,7 +71,7 @@ dest: afsauthlib.so afskauthlib.so ${DEST}/root.client/usr/vice/etc/afskauthlib.so clean: - $(RM) -f $(AUTHLIBS) $(AUTHFILES) + $(RM) -f $(AUTHLIBS) $(AUTHFILES) afsauthlib.so: sgi_auth.o ${AFSLIBS} ${AUTHFILES} $(LD) ${AFS_LDFLAGS} -shared -all -o afsauthlib.so sgi_auth.o $(AFSLIBS) ${AUTHFILES} diff --git a/src/sys/Makefile.in b/src/sys/Makefile.in index 6ffc2eea4c..4eeb6c7917 100644 --- a/src/sys/Makefile.in +++ b/src/sys/Makefile.in @@ -179,7 +179,7 @@ rmtsysd: rmtsysd.o libsys.a # Test programs. # -iinc: iinc.c +iinc: iinc.c $(CC) -o iinc $(AFS_CFLAGS) ${srcdir}/iinc.c ${LIBS} idec: idec.c AFS_component_version_number.c diff --git a/src/tests/Makefile.in b/src/tests/Makefile.in index c7d3e0c8a8..5d0feca898 100644 --- a/src/tests/Makefile.in +++ b/src/tests/Makefile.in @@ -64,7 +64,7 @@ TEST_SRCS = write-ro-file.c read-vs-mmap.c read-vs-mmap2.c \ blocks-new-file.c fsx.c afscp.c afscp_callback.c \ write-rand.c -EXTRA_OBJS = err.o errx.o warn.o warnx.o vwarn.o vwarnx.o verr.o verrx.o warnerr.o snprintf.o +EXTRA_OBJS = err.o errx.o warn.o warnx.o vwarn.o vwarnx.o verr.o verrx.o warnerr.o snprintf.o fsx: fsx.o $(EXTRA_OBJS) $(AFS_LDRULE) fsx.o $(EXTRA_OBJS) $(LIBS) @@ -320,7 +320,7 @@ OpenAFS/Dirpath.pm: Makefile @echo "1;" >>$@ OpenAFS/Dirpath.sh: Makefile - @echo "Creating OpenAFS/Dirpath.sh" + @echo "Creating OpenAFS/Dirpath.sh" @echo "# auto-generated by src/tests/Makefile" >$@ @echo "# source or '.' in this file in shell" >>$@ @echo "# DO NOT EDIT" >>$@ diff --git a/src/tools/rxperf/NTMakefile b/src/tools/rxperf/NTMakefile index 3f79180b44..8e4d14ecf4 100644 --- a/src/tools/rxperf/NTMakefile +++ b/src/tools/rxperf/NTMakefile @@ -34,7 +34,7 @@ $(OUT)\rxperf.exe: $(OUT)\rxperf.obj $(OUT)\rxperf.res $(LIBS) $(SYMSTORE_IMPORT) mkdir: - + install: all clean:: diff --git a/src/tptserver/Makefile.in b/src/tptserver/Makefile.in index f03b1c5e03..fd6a96ad6f 100644 --- a/src/tptserver/Makefile.in +++ b/src/tptserver/Makefile.in @@ -48,7 +48,7 @@ all: ptserver pts pt_util db_verify \ generated: \ pterror.h pterror.c -depinstall: +depinstall: # When supergroups is enabled, some parts of ptserver cast between # incompatible structs. diff --git a/src/tsm41/Makefile.in b/src/tsm41/Makefile.in index 14d1b300b7..bbe9dcf27c 100644 --- a/src/tsm41/Makefile.in +++ b/src/tsm41/Makefile.in @@ -52,7 +52,7 @@ AUTH_OBJS = \ aix_ktc_null.o AUTH_KRB5_OBJS = \ - aix_aklog.o + aix_aklog.o AUTH_KRB_OBJS = \ aix_auth.o \ @@ -63,7 +63,7 @@ AUTH_KRB_OBJS = \ AUTHLIBS= \ afs_dynamic_auth afs_dynamic_kerbauth @MAKE_KRB5@ aklog_dynamic_auth -IMPORTS = -bI:/lib/aio.exp -bI:/lib/netinet.exp -bI:/lib/sockets.exp -bI:/lib/statcmd.exp +IMPORTS = -bI:/lib/aio.exp -bI:/lib/netinet.exp -bI:/lib/sockets.exp -bI:/lib/statcmd.exp LDFLAGS = -eafs_initialize ${IMPORTS} -lsys -lcsys -lc AKLDFLAGS = -eaklog_initialize ${IMPORTS} -lsys -lcsys -lc @@ -116,7 +116,7 @@ aix_ident.o: ${srcdir}/aix41_ident.c $(AFS_CCRULE) ${srcdir}/aix41_ident.c dest: afs_dynamic_auth afs_dynamic_kerbauth @MAKE_KRB5@ aklog_dynamic_auth - ${INSTALL} -d ${DEST}/root.client/usr/vice/etc + ${INSTALL} -d ${DEST}/root.client/usr/vice/etc ${INSTALL_PROGRAM} afs_dynamic_auth \ ${DEST}/root.client/usr/vice/etc/afs_dynamic_auth ${INSTALL_PROGRAM} afs_dynamic_kerbauth \ diff --git a/src/tvlserver/Makefile.in b/src/tvlserver/Makefile.in index 495e38a2c0..bf5737c45a 100644 --- a/src/tvlserver/Makefile.in +++ b/src/tvlserver/Makefile.in @@ -56,7 +56,7 @@ vldb_check: vldb_check.o AFS_component_version_number.o $(LIBS_client) $(LT_LDRULE_static) vldb_check.o AFS_component_version_number.o \ $(LIBS_client) $(LIB_hcrypto) $(LIB_roken) ${MT_LIBS} ${XLIBS} -vldb_check.o: ${VLSERVER}/vldb_check.c +vldb_check.o: ${VLSERVER}/vldb_check.c $(AFS_CCRULE) $(VLSERVER)/vldb_check.c cnvldb: cnvldb.o $(LIBS_client) @@ -87,8 +87,8 @@ vlutils.o: ${VLSERVER}/vlutils.c ${INCLS} vlprocs.o: ${VLSERVER}/vlprocs.c ${INCLS} $(AFS_CCRULE) $(VLSERVER)/vlprocs.c -vldbint.ss.o: vldbint.ss.c -vldbint.xdr.o: vldbint.xdr.c +vldbint.ss.o: vldbint.ss.c +vldbint.xdr.o: vldbint.xdr.c vldbint.ss.c: ${VLSERVER}/vldbint.xg @@ -106,7 +106,7 @@ vldbint.xdr.c: vldbint.h vlclient: vlclient.o $(LIBS_client) $(LT_LDRULE_static) vlclient.o $(LIBS_client) \ $(LIB_roken) ${MT_LIBS} ${XLIBS} - + vlclient.o: ${VLSERVER}/vlclient.c $(AFS_CCRULE) $(VLSERVER)/vlclient.c diff --git a/src/tvolser/NTMakefile b/src/tvolser/NTMakefile index 6a0262d5c3..ee092b0403 100644 --- a/src/tvolser/NTMakefile +++ b/src/tvolser/NTMakefile @@ -50,7 +50,7 @@ LIBOBJS = $(OUT)\volint.cs.obj \ $(OUT)\volint.xdr.obj \ $(OUT)\volerr.obj \ $(OUT)\volint.ss.obj \ - $(OUT)\AFS_component_version_number.obj + $(OUT)\AFS_component_version_number.obj $(LIBOBJS): $(VOLSER)\$$(@B).c $(C2OBJ) -I$(TVOLSER) -I$(UTIL) $** @@ -98,10 +98,10 @@ VOLSERVER_EXELIBS = \ $(DESTDIR)\lib\afshcrypto.lib \ $(DESTDIR)\lib\afsroken.lib -$(VOLSERVER_EXEFILE): $(VOLSERVER_EXEOBJS) $(VOLSERVER_EXELIBS) +$(VOLSERVER_EXEFILE): $(VOLSERVER_EXEOBJS) $(VOLSERVER_EXELIBS) $(EXECONLINK) dnsapi.lib mpr.lib iphlpapi.lib shell32.lib $(_VC_MANIFEST_EMBED_EXE) - $(EXEPREP) + $(EXEPREP) $(CODESIGN_USERLAND) $(SYMSTORE_IMPORT) @@ -151,7 +151,7 @@ volser.h volerr.c: $(VOLSER)\volerr.et $(VOLSER)\volser.p.h ############################################################################ # Install target; primary makefile target -install_lib: $(LIBFILE) +install_lib: $(LIBFILE) install: install_lib $(VOLSERVER_EXEFILE) $(CL_VOS_EXEFILE) \ $(INCFILES) diff --git a/src/ubik/Makefile.in b/src/ubik/Makefile.in index a380cfe655..4beac5067c 100644 --- a/src/ubik/Makefile.in +++ b/src/ubik/Makefile.in @@ -58,15 +58,15 @@ ${TOP_INCDIR}/ubik.h: ubik.h ${TOP_INCDIR}/ubik_int.h: ubik_int.h ${INSTALL_DATA} $? $@ -utst_server: utst_server.o utst_int.ss.o utst_int.xdr.o libubik.a +utst_server: utst_server.o utst_int.ss.o utst_int.xdr.o libubik.a $(AFS_LDRULE) utst_server.o utst_int.ss.o utst_int.xdr.o \ libubik.a $(LIBS) $(LIB_roken) -utst_client: utst_client.o utst_int.cs.o utst_int.xdr.o libubik.a +utst_client: utst_client.o utst_int.cs.o utst_int.xdr.o libubik.a $(AFS_LDRULE) utst_client.o utst_int.cs.o utst_int.xdr.o \ libubik.a $(LIBS) $(LIB_roken) -udebug: udebug.o libubik.a +udebug: udebug.o libubik.a $(AFS_LDRULE) udebug.o libubik.a $(LIBS) $(LIB_roken) ubik_int.cs.c: ubik_int.xg @@ -148,7 +148,7 @@ $(LT_objs): $(INCLS) utst_int.ss.o: utst_int.ss.c ${INCLS} utst_int.h utst_int.cs.o: utst_int.cs.c ${INCLS} utst_int.h -utst_int.xdr.o: utst_int.xdr.c ${INCLS} utst_int.h +utst_int.xdr.o: utst_int.xdr.c ${INCLS} utst_int.h liboafs_ubik.la: liboafs_ubik.la.sym $(LT_objs) $(LT_deps) $(LT_LDLIB_shlib) $(LT_objs) $(LT_deps) $(LT_libs) diff --git a/src/ubik/NTMakefile b/src/ubik/NTMakefile index 4a1b14282c..a9701baf4c 100644 --- a/src/ubik/NTMakefile +++ b/src/ubik/NTMakefile @@ -12,11 +12,11 @@ RELDIR=ubik ############################################################################ # Install header files -INCFILEDIR = $(DESTDIR)\include +INCFILEDIR = $(DESTDIR)\include INCFILES =\ $(INCFILEDIR)\ubik.h \ - $(INCFILEDIR)\ubik_int.h + $(INCFILEDIR)\ubik_int.h install_headers: $(INCFILES) @@ -45,7 +45,7 @@ LIBOBJS =\ $(LIBFILE): $(LIBOBJS) - $(LIBARCH) + $(LIBARCH) ############################################################################ # build mtafsubik.lib @@ -115,8 +115,8 @@ $(OUT)\ubikcmd_mt.obj:ubikcmd.c $(OUT)\ubikclient_mt.obj:ubikclient.c $(C2OBJ) $** -DAFS_PTHREAD_ENV -$(MT_LIBFILE): $(MT_LIBOBJS) - $(LIBARCH) +$(MT_LIBFILE): $(MT_LIBOBJS) + $(LIBARCH) ############################################################################ # Definitions for building a EXE. @@ -141,10 +141,10 @@ UDBG_EXELIBS =\ $(DESTDIR)\lib\afsroken.lib -$(RS_UDBG_EXEFILE): $(UDBG_EXEOBJS) $(UDBG_EXELIBS) +$(RS_UDBG_EXEFILE): $(UDBG_EXEOBJS) $(UDBG_EXELIBS) $(EXECONLINK) iphlpapi.lib shell32.lib $(_VC_MANIFEST_EMBED_EXE) - $(EXEPREP) + $(EXEPREP) $(CODESIGN_USERLAND) $(SYMSTORE_IMPORT) @@ -188,32 +188,32 @@ uerrors.c ubik.h: uerrors.et ubik.p.h install: $(INCFILES) $(LIBFILE) $(MT_LIBFILE) $(CL_UDBG_EXEFILE) clean:: - $(DEL) ubik_int.ss.c ubik_int.cs.c ubik_int.xdr.c + $(DEL) ubik_int.ss.c ubik_int.cs.c ubik_int.xdr.c $(DEL) uerrors.c $(INCFILES) $(DEL) ubik_int.h ubik.h ############################################################################ # test ubik -test tests: utst_server utst_client $(EXEFILE) +test tests: utst_server utst_client $(EXEFILE) utst_server: $(OUT)\utst_server.obj $(OUT)\utst_int.ss.obj $(OUT)\utst_int.xdr.obj $(EXELIBS) - $(EXECONLINK) + $(EXECONLINK) $(_VC_MANIFEST_EMBED_EXE) $(CODESIGN_USERLAND) $(SYMSTORE_IMPORT) - + utst_client: $(OUT)\utst_client.obj $(OUT)\utst_int.cs.obj $(OUT)\utst_int.xdr.obj $(EXELIBS) - $(EXECONLINK) + $(EXECONLINK) $(_VC_MANIFEST_EMBED_EXE) $(CODESIGN_USERLAND) $(SYMSTORE_IMPORT) - + # rxgen on utst_int.xg utst_int.ss.c utst_int.cs.c utst_int.xdr.c utst_int.h: utst_int.xg $(RXGEN) utst_int.xg -$(OUT)\utst_server.obj $(OUT)\utst_client.obj : utst_int.h +$(OUT)\utst_server.obj $(OUT)\utst_client.obj : utst_int.h mkdir: - + diff --git a/src/update/Makefile.in b/src/update/Makefile.in index 2dd023dfc1..917bf766c7 100644 --- a/src/update/Makefile.in +++ b/src/update/Makefile.in @@ -29,7 +29,7 @@ generated: update.cs.c update.ss.c update.xdr.c update.h # # Build targets # -upclient: client.o update.cs.o utils.o ${LIBS} +upclient: client.o update.cs.o utils.o ${LIBS} $(AFS_LDRULE) client.o update.cs.o utils.o \ ${LIBS} $(LIB_roken) ${XLIBS} @@ -73,7 +73,7 @@ dest: upserver upclient # # Misc. targets # -clean: +clean: $(RM) -f *.o upclient upserver update.ss.c update.cs.c update.xdr.c update.h core \ AFS_component_version_number.c diff --git a/src/update/NTMakefile b/src/update/NTMakefile index 2f6f9e764a..607fbb3bb0 100644 --- a/src/update/NTMakefile +++ b/src/update/NTMakefile @@ -57,7 +57,7 @@ USVR_OBJS = \ $(UPSERVER): $(USVR_OBJS) $(LIBS) $(EXECONLINK) dnsapi.lib mpr.lib iphlpapi.lib shell32.lib $(_VC_MANIFEST_EMBED_EXE) - $(EXEPREP) + $(EXEPREP) $(CODESIGN_USERLAND) $(SYMSTORE_IMPORT) @@ -75,7 +75,7 @@ UCLNT_OBJS = \ $(UPCLIENT): $(UCLNT_OBJS) $(LIBS) $(EXECONLINK) dnsapi.lib mpr.lib iphlpapi.lib shell32.lib $(_VC_MANIFEST_EMBED_EXE) - $(EXEPREP) + $(EXEPREP) $(CODESIGN_USERLAND) $(SYMSTORE_IMPORT) diff --git a/src/usd/NTMakefile b/src/usd/NTMakefile index 352ae0190a..246c4a83a1 100644 --- a/src/usd/NTMakefile +++ b/src/usd/NTMakefile @@ -29,21 +29,21 @@ LIBOBJS =\ $(OUT)\usd_nt.obj \ $(OUT)\AFS_component_version_number.obj -$(LIBFILE): $(LIBOBJS) - $(LIBARCH) +$(LIBFILE): $(LIBOBJS) + $(LIBARCH) ############################################################################ -# make and install +# make and install install: $(INCFILES) $(LIBFILE) clean:: $(DEL) $(LIBFILE) -test: +test: $(CD) test $(MAKECMD) /fNTMakefile test $(CD) .. mkdir: - + diff --git a/src/usd/test/NTMakefile b/src/usd/test/NTMakefile index e7da58784e..879664fd28 100644 --- a/src/usd/test/NTMakefile +++ b/src/usd/test/NTMakefile @@ -24,4 +24,4 @@ $(OUT)\usd_test.exe: $(OUT)\usd_test.obj $(LIBFILE) $(LIBUTIL) $(SYMSTORE_IMPORT) mkdir: - + diff --git a/src/uss/Makefile.in b/src/uss/Makefile.in index 250aa3f1dd..018a0988ea 100644 --- a/src/uss/Makefile.in +++ b/src/uss/Makefile.in @@ -41,7 +41,7 @@ OBJS = uss_procs.o \ uss_kauth.o \ uss_fs.o \ lex.yy.o \ - y.tab.o + y.tab.o uss: uss.o ${OBJS} $(LIBS) $(AFS_LDRULE) uss.o ${OBJS} ${LIBS} $(LIB_roken) $(LIB_crypt) $(XLIBS) diff --git a/src/util/Makefile.in b/src/util/Makefile.in index b28550ed44..9dd1dc0353 100644 --- a/src/util/Makefile.in +++ b/src/util/Makefile.in @@ -150,7 +150,7 @@ $(LT_objs): ${includes} sys.o: sys.c AFS_component_version_number.c ${includes} -sys: sys.o +sys: sys.o $(AFS_LDRULE) sys.o # diff --git a/src/util/NTMakefile b/src/util/NTMakefile index 1b4c4e5599..b8a4c5ae5b 100644 --- a/src/util/NTMakefile +++ b/src/util/NTMakefile @@ -89,7 +89,7 @@ $(LIBFILE): $(LIBOBJS) $(MT_LIBFILE): $(MT_LIBOBJS) $(LIBARCH) Rpcrt4.lib -install_headers: $(INCFILES) +install_headers: $(INCFILES) install: install_headers $(LIBOBJS) $(LIBFILE) $(MT_LIBFILE) diff --git a/src/util/test/Makefile.in b/src/util/test/Makefile.in index ddca2eb30d..c8b7c67bc1 100644 --- a/src/util/test/Makefile.in +++ b/src/util/test/Makefile.in @@ -25,7 +25,7 @@ test_ktime.o: test_ktime.c ../ktime.h test_ktime: test_ktime.o ../util.a $(AFS_LDRULE) test_ktime.o ../util.a ${XLIBS} -dirpath_test: dirpath_test.o ../util.a +dirpath_test: dirpath_test.o ../util.a $(AFS_LDRULE) dirpath_test.o ../util.a ${XLIBS} b64: b64.o ../util.a diff --git a/src/util/test/NTMakefile b/src/util/test/NTMakefile index 8295dd35e0..58d6561af0 100644 --- a/src/util/test/NTMakefile +++ b/src/util/test/NTMakefile @@ -32,4 +32,4 @@ clean:: $(DEL) $(OUT)\snprintf_test.* mkdir: - + diff --git a/src/venus/Makefile.in b/src/venus/Makefile.in index d0cabf65ae..71d47462de 100644 --- a/src/venus/Makefile.in +++ b/src/venus/Makefile.in @@ -63,7 +63,7 @@ CMLIBS=${TOP_LIBDIR}/libsys.a \ $(TOP_LIBDIR)/libopr.a \ $(TOP_LIBDIR)/libafsutil.a -LIBS = ${FSLIBS} +LIBS = ${FSLIBS} all: fs up fstrace cmdebug livesys kdump-build cacheout afsio @@ -181,7 +181,7 @@ kdump: kdump.o * ) ${CC} -o kdump kdump.o ${TOP_LIBDIR}/libcmd.a ${TOP_LIBDIR}/util.a ${XLIBS} ;; \ esac -kdump64: +kdump64: -set -x; \ case ${SYS_NAME} in \ sun4x_5[789] | sun4x_510 | hp_ux11* | sunx86_5[789] | sunx86_510 ) \ diff --git a/src/vfsck/Makefile.in b/src/vfsck/Makefile.in index 3a85ba4684..542700f42f 100644 --- a/src/vfsck/Makefile.in +++ b/src/vfsck/Makefile.in @@ -33,7 +33,7 @@ OBJS= dir.o inode.o main.o pass1.o pass1b.o pass2.o pass3.o pass4.o \ all: vfsck -vfsck: ${OBJS} +vfsck: ${OBJS} $(AFS_LDRULE) ${OBJS} ${NON_SHARED} ${XLIBS} main.o: main.c AFS_component_version_number.c diff --git a/src/viced/NTMakefile b/src/viced/NTMakefile index 72aa02d2ab..0785743919 100644 --- a/src/viced/NTMakefile +++ b/src/viced/NTMakefile @@ -88,7 +88,7 @@ EXELIBS = \ $(EXEFILE): $(EXEOBJS) $(EXELIBS) $(EXECONLINK) $(_VC_MANIFEST_EMBED_EXE) - $(EXEPREP) + $(EXEPREP) $(CODESIGN_USERLAND) $(SYMSTORE_IMPORT) diff --git a/src/vlserver/Makefile.in b/src/vlserver/Makefile.in index d312775654..91baeb9955 100644 --- a/src/vlserver/Makefile.in +++ b/src/vlserver/Makefile.in @@ -60,7 +60,7 @@ depinstall: \ ${TOP_INCDIR}/afs/vl_opcodes.h \ ${TOP_INCDIR}/afs/vlserver.h \ ${TOP_INCDIR}/afs/vldbint.h \ - ${TOP_INCDIR}/afs/cnvldb.h + ${TOP_INCDIR}/afs/cnvldb.h ${TOP_LIBDIR}/libvldb.a: libvldb.a ${INSTALL_DATA} $? $@ diff --git a/src/vlserver/NTMakefile b/src/vlserver/NTMakefile index d097ab59a3..d690d6a5ac 100644 --- a/src/vlserver/NTMakefile +++ b/src/vlserver/NTMakefile @@ -23,7 +23,7 @@ INCFILES = \ $(INCFILEDIR)\vl_opcodes.h: vl_opcodes.h $(COPY) vl_opcodes.h $(INCFILEDIR)\vl_opcodes.h - + ############################################################################ # build afsvldb.lib @@ -35,8 +35,8 @@ LIBOBJS =\ $(OUT)\vldbint.xdr.obj \ $(OUT)\AFS_component_version_number.obj -$(LIBFILE): $(LIBOBJS) - $(LIBARCH) +$(LIBFILE): $(LIBOBJS) + $(LIBARCH) ############################################################################ # build mtafsvldb.lib @@ -58,8 +58,8 @@ $(OUT)\vldbint.cs_mt.obj:vldbint.cs.c $(OUT)\vldbint.xdr_mt.obj:vldbint.xdr.c $(C2OBJ) $** -DAFS_PTHREAD_ENV -$(MT_LIBFILE): $(MT_LIBOBJS) - $(LIBARCH) +$(MT_LIBFILE): $(MT_LIBOBJS) + $(LIBARCH) ############################################################################ # build vlserver.exe @@ -98,7 +98,7 @@ VLSERVER_EXECLIBS = \ $(VLSERVER): $(VLSERVER_EXEOBJS) $(LIBFILE) $(VLSERVER_EXECLIBS) $(EXECONLINK) dnsapi.lib mpr.lib iphlpapi.lib shell32.lib $(_VC_MANIFEST_EMBED_EXE) - $(EXEPREP) + $(EXEPREP) $(CODESIGN_USERLAND) $(SYMSTORE_IMPORT) diff --git a/src/vol/Makefile.in b/src/vol/Makefile.in index 192dea4d90..cb37d77e3a 100644 --- a/src/vol/Makefile.in +++ b/src/vol/Makefile.in @@ -205,7 +205,7 @@ listinodes.o: listinodes.c AFS_component_version_number.c ;; \ esac -gi: ${TOP_LIBDIR}/libsys.a +gi: ${TOP_LIBDIR}/libsys.a $(Q)case ${SYS_NAME} in \ *linux* | sgi_* | *fbsd* ) \ echo "Don't build gi on ${SYS_NAME}";; \ diff --git a/src/vol/NTMakefile b/src/vol/NTMakefile index ecced42e46..1e80c2f0f7 100644 --- a/src/vol/NTMakefile +++ b/src/vol/NTMakefile @@ -286,4 +286,4 @@ $(OUT)\volinfo.res: AFS_component_version_number.h install: $(INCFILES) $(LIBFILE) $(MT_LIBFILE) $(DAFS_LIBFILE) $(SALVAGER) $(VOLINFO) $(VOLSCAN) mkdir: - + diff --git a/src/vol/test/Makefile.in b/src/vol/test/Makefile.in index c92d5acccb..6d89913671 100644 --- a/src/vol/test/Makefile.in +++ b/src/vol/test/Makefile.in @@ -29,20 +29,20 @@ OBJECTS=listVicepx.o utilities.o updateDirInode.o all: listVicepx updateDirInode testpart -install: +install: ${OBJECTS}: ${PUBLICHEADERS} ${TOP_INCDIR}/lwp.h ${TOP_INCDIR}/lock.h ${TOP_INCDIR}/afs/afsint.h ../filesignal.h ../vutils.h ../vldb.h ../salvage.h ../volinodes.h ../qiin.h testpart: testpart.c ../vlib.a $(AFS_LDRULE) testpart.c ${TOP_LIBDIR}/vlib.a ${TOP_LIBDIR}/liblwp.a \ ${TOP_LIBDIR}/util.a ${XLIBS} - -listVicepx: listVicepx.o utilities.o - $(AFS_LDRULE) listVicepx.o utilities.o ${LIBS} -updateDirInode: updateDirInode.o - $(AFS_LDRULE) updateDirInode.o ${LIBS} +listVicepx: listVicepx.o utilities.o + $(AFS_LDRULE) listVicepx.o utilities.o ${LIBS} + +updateDirInode: updateDirInode.o + $(AFS_LDRULE) updateDirInode.o ${LIBS} NAMEI_PROGS = nicreate nincdec nino nilist @@ -61,7 +61,7 @@ nino: nino.o $(AFS_LDRULE) nino.o ${TOP_LIBDIR}/util.a clean: - $(RM) -f *.o *.a + $(RM) -f *.o *.a $(RM) -f ${SCMPROGS} ${STAGEPROGS} core listVicepx updateDirInode -dest: +dest: diff --git a/src/vol/test/NTMakefile b/src/vol/test/NTMakefile index 165b6908a9..8592ef3bf6 100644 --- a/src/vol/test/NTMakefile +++ b/src/vol/test/NTMakefile @@ -44,4 +44,4 @@ $(LTLIST): $(OUT)\ltlist.obj $(EXEC_LIBS) $(SYMSTORE_IMPORT) mkdir: - + diff --git a/src/volser/Makefile.in b/src/volser/Makefile.in index a402ef89c0..16e900e5fb 100644 --- a/src/volser/Makefile.in +++ b/src/volser/Makefile.in @@ -246,7 +246,7 @@ dest: restorevol voldump volser.h volint.h vos volserver libvolser.a # # Misc targets -# +# clean: $(LT_CLEAN) $(RM) -f *.o *.a core volserver volint.ss.c volint.cs.c volint.h \ diff --git a/src/volser/NTMakefile b/src/volser/NTMakefile index e134b624e1..fefa1d5be8 100644 --- a/src/volser/NTMakefile +++ b/src/volser/NTMakefile @@ -43,7 +43,7 @@ LIBOBJS =\ $(OUT)\volint.xdr.obj \ $(OUT)\vsprocs.obj \ $(OUT)\vsutils.obj \ - $(OUT)\AFS_component_version_number.obj + $(OUT)\AFS_component_version_number.obj $(LIBFILE): $(LIBOBJS) $(LIBARCH) @@ -105,7 +105,7 @@ VOLSERVER_EXELIBS = \ $(VOLSERVER_EXEFILE): $(VOLSERVER_EXEOBJS) $(VOLSERVER_EXELIBS) $(EXEC_LIBS) $(HEIMDEPS) $(EXECONLINK) dnsapi.lib mpr.lib iphlpapi.lib shell32.lib $(HEIMLINKOPTS) $(_VC_MANIFEST_EMBED_EXE) - $(EXEPREP) + $(EXEPREP) $(CODESIGN_USERLAND) $(SYMSTORE_IMPORT) @@ -133,7 +133,7 @@ VOS_EXELIBS = \ $(RS_VOS_EXEFILE): $(VOS_EXEOBJS) $(VOS_EXELIBS) $(EXEC_LIBS) $(HEIMDEPS) $(EXECONLINK) dnsapi.lib mpr.lib iphlpapi.lib shell32.lib $(HEIMLINKOPTS) $(_VC_MANIFEST_EMBED_EXE) - $(EXEPREP) + $(EXEPREP) $(CODESIGN_USERLAND) $(SYMSTORE_IMPORT) diff --git a/src/xstat/NTMakefile b/src/xstat/NTMakefile index feee07d498..a0c4cd523f 100644 --- a/src/xstat/NTMakefile +++ b/src/xstat/NTMakefile @@ -70,7 +70,7 @@ $(LIBDIR)\afs_xstat_cm.lib: $(OUT)\xstat_cm.obj $(OUT)\AFS_component_version_num $(OUT)\xstat_cm_test.res: xstat_cm_test.rc AFS_component_version_number.h $(BINDIR)\xstat_cm_test.exe: $(OUT)\xstat_cm_test.obj $(OUT)\xstat_cm_test.res $(LIBDIR)\afs_xstat_cm.lib $(LIBS) - $(EXECONLINK) + $(EXECONLINK) $(_VC_MANIFEST_EMBED_EXE) $(EXEPREP) $(CODESIGN_USERLAND)