From f22ae5f7d8b3c143de21355f819ab872a0cf76fd Mon Sep 17 00:00:00 2001 From: Simon Wilkinson Date: Mon, 4 Oct 2010 13:49:16 +0100 Subject: [PATCH] Unix: Rework build system Rework the unix build system so that we support taking CFLAGS and LDFLAGS from the command line, and don't replace them with our own settings. Also, take the opportunity to bring some sanity and consistency into our Makefiles. The standard Makefile.config now defines rules for LWP, pthreaded and shared library builds. The CFLAGS settings for these are called LWP_CFLAGS, PTH_CFLAGS and SHD_CFLAGS, respectively. Similarly named variables are provided for LDFLAGS. A module may select to use a particular build type for its suffix rule by including either Makefile.lwp, Makefile.pthread or Makefile.shared from src/config. This creates an appropriate .c.o suffix rule, defines AFS_CFLAGS and AFS_LDFLAGS as appropriate, and creates two rules AFS_CCRULE and AFS_LDRULE, which can be used to build, and link objects. For example: foo.o: foo.c $(AFS_CCRULE) foo.c foo: foo.o $(AFS_LDRULE) foo.o If a you wish to override the CFLAGS or LDFLAGS for an object build using these rules (or through the .c.o suffix rule) you can do so, by defining CFLAGS_ or LDFLAGS_. For example: CFLAGS_foo.o= -DDEBUG LDFLAGS_foo = -ldebugging A module may also alter the behaviour of the compile and link steps module wide by defining MODULE_CFLAGS or MODULE_LDFLAGS. This functionality is now used throughout the tree: *) Suffix rules are used wherever possible, removing a number of unecessary build rules. *) All link steps are replaced with AFS_LDRULE *) All standard compile steps are replaced with AFS_CCRULE *) Unusal compile steps are defined, as far as possible, int terms of the LWP_ PTH_ and SHD_ variables. *) The use of $? has been removed entirely, as it makes it impossible to provide build rules with dependency information Change-Id: If76207e45da402a0ed9d7c1bdbe83c58c911a4f2 Reviewed-on: http://gerrit.openafs.org/2896 Tested-by: BuildBot Tested-by: Derrick Brashear Reviewed-by: Derrick Brashear --- Makefile.in | 3 + configure.ac | 3 + src/afs/Makefile.in | 2 + src/afsd/Makefile.in | 26 +-- src/afsmonitor/Makefile.in | 9 +- src/afsweb/Makefile.in | 10 +- src/aklog/Makefile.in | 8 +- src/audit/Makefile.in | 9 +- src/auth/Makefile.in | 12 +- src/auth/test/Makefile.in | 6 +- src/bozo/Makefile.in | 12 +- src/bozo/test/Makefile.in | 9 +- src/bu_utils/Makefile.in | 4 +- src/bubasics/Makefile.in | 2 + src/bucoord/Makefile.in | 21 +-- src/budb/Makefile.in | 4 +- src/butc/Makefile.in | 23 ++- src/butm/Makefile.in | 4 +- src/cf/osconf.m4 | 1 - src/cmd/Makefile.in | 12 +- src/cmd/test/Makefile.in | 13 +- src/comerr/Makefile.in | 9 +- src/comerr/test/Makefile.in | 7 +- src/config/.gitignore | 3 + src/config/Makefile.config.in | 30 ++- src/config/Makefile.in | 17 +- src/config/Makefile.lwp.in | 7 + src/config/Makefile.pthread.in | 8 + src/config/Makefile.shared.in | 10 + src/crypto/hcrypto/Makefile.in | 140 +++++++------- src/des/Makefile.in | 22 ++- src/des/test/Makefile.in | 12 +- src/dir/Makefile.in | 2 + src/dir/test/Makefile.in | 6 +- src/dviced/Makefile.in | 148 +++++++-------- src/dvolser/Makefile.in | 177 +++++++++--------- src/export/Makefile.in | 57 ++++-- src/finale/Makefile.in | 4 +- src/fsint/Makefile.in | 4 +- src/fsprobe/Makefile.in | 5 +- src/gtx/Makefile.in | 13 +- src/kauth/Makefile.in | 47 +++-- src/kauth/test/Makefile.in | 20 +- src/kopenafs/Makefile.in | 19 +- src/libacl/Makefile.in | 2 + src/libacl/test/Makefile.in | 7 +- src/libadmin/Makefile.in | 2 + src/libadmin/adminutil/Makefile.in | 25 ++- src/libadmin/bos/Makefile.in | 11 +- src/libadmin/cfg/Makefile.in | 9 +- src/libadmin/cfg/test/Makefile.in | 8 +- src/libadmin/client/Makefile.in | 5 +- src/libadmin/kas/Makefile.in | 14 +- src/libadmin/pts/Makefile.in | 10 +- src/libadmin/samples/Makefile.in | 53 +++--- src/libadmin/test/Makefile.in | 11 +- src/libadmin/vos/Makefile.in | 18 +- src/libafsauthent/Makefile.in | 157 ++++++++-------- src/libafsrpc/Makefile.in | 167 +++++++++-------- src/log/Makefile.in | 10 +- src/log/test/Makefile.in | 11 +- src/lwp/Makefile.in | 21 +-- src/lwp/test/Makefile.in | 17 +- src/pam/Makefile.in | 34 ++-- src/platform/DARWIN/Makefile.in | 4 +- src/platform/DARWIN/growlagent/Makefile.in | 4 +- src/platform/SOLARIS/Makefile.in | 5 +- src/procmgmt/Makefile.in | 3 +- src/procmgmt/test/Makefile.in | 4 +- src/ptserver/Makefile.in | 33 ++-- src/rx/Makefile.in | 4 +- src/rx/bulk.example/Makefile.in | 9 +- src/rx/bulktest/Makefile.in | 9 +- src/rx/multi.example/Makefile.in | 6 +- src/rx/simple.example/Makefile.in | 10 +- src/rx/test/Makefile.in | 42 ++--- src/rxdebug/Makefile.in | 12 +- src/rxgen/Makefile.in | 7 +- src/rxkad/Makefile.in | 9 +- src/rxkad/test/Makefile.in | 15 +- src/rxstat/Makefile.in | 2 + src/scout/Makefile.in | 4 +- src/sgistuff/Makefile.in | 12 +- src/shlibafsauthent/Makefile.in | 177 ++++++++---------- src/shlibafsrpc/Makefile.in | 203 +++++++++++---------- src/sys/Makefile.in | 47 +++-- src/tbudb/Makefile.in | 64 ++++--- src/tbutc/Makefile.in | 43 ++--- src/tests/Makefile.in | 139 +++++++------- src/tptserver/Makefile.in | 100 +++++----- src/tsalvaged/Makefile.in | 118 ++++++------ src/tsm41/Makefile.in | 18 +- src/tubik/Makefile.in | 176 ++++++++---------- src/tviced/Makefile.in | 145 +++++++-------- src/tvlserver/Makefile.in | 77 ++++---- src/tvolser/Makefile.in | 182 +++++++++--------- src/ubik/Makefile.in | 12 +- src/update/Makefile.in | 6 +- src/usd/Makefile.in | 6 +- src/usd/test/Makefile.in | 4 +- src/uss/Makefile.in | 32 +--- src/util/Makefile.in | 86 +-------- src/util/test/Makefile.in | 14 +- src/venus/Makefile.in | 41 +++-- src/venus/test/Makefile.in | 12 +- src/vfsck/Makefile.in | 6 +- src/viced/Makefile.in | 28 +-- src/vlserver/Makefile.in | 13 +- src/vol/Makefile.in | 37 ++-- src/vol/test/Makefile.in | 31 ++-- src/volser/Makefile.in | 15 +- src/xstat/Makefile.in | 6 +- tests/Makefile.in | 8 +- tests/rpctestlib/Makefile.in | 39 +--- tests/tap/Makefile.in | 3 +- tests/util/Makefile.in | 9 +- 116 files changed, 1773 insertions(+), 1870 deletions(-) create mode 100644 src/config/Makefile.lwp.in create mode 100644 src/config/Makefile.pthread.in create mode 100644 src/config/Makefile.shared.in diff --git a/Makefile.in b/Makefile.in index 70a39a1725..312535f353 100644 --- a/Makefile.in +++ b/Makefile.in @@ -811,6 +811,9 @@ distclean: clean src/comerr/test/Makefile \ src/config/Makefile \ src/config/Makefile.config \ + src/config/Makefile.lwp \ + src/config/Makefile.pthread \ + src/config/Makefile.shared \ src/config/Makefile.version \ src/config/Makefile.version-CML \ src/config/Makefile.version-NOCML \ diff --git a/configure.ac b/configure.ac index 3d41681f69..9f42d8ec86 100644 --- a/configure.ac +++ b/configure.ac @@ -131,6 +131,9 @@ src/comerr/Makefile \ src/comerr/test/Makefile \ src/config/Makefile \ src/config/Makefile.config \ +src/config/Makefile.lwp \ +src/config/Makefile.pthread \ +src/config/Makefile.shared \ src/config/Makefile.version-CML \ src/config/Makefile.version-NOCML \ src/config/shlib-build \ diff --git a/src/afs/Makefile.in b/src/afs/Makefile.in index 782212de4e..60c4cf0a64 100644 --- a/src/afs/Makefile.in +++ b/src/afs/Makefile.in @@ -9,6 +9,8 @@ srcdir=@srcdir@ include @TOP_OBJDIR@/src/config/Makefile.config +include @TOP_OBJDIR@/src/config/Makefile.lwp + INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ diff --git a/src/afsd/Makefile.in b/src/afsd/Makefile.in index 9d9d317e92..e05e7ace0d 100644 --- a/src/afsd/Makefile.in +++ b/src/afsd/Makefile.in @@ -8,13 +8,13 @@ srcdir=@srcdir@ include @TOP_OBJDIR@/src/config/Makefile.config +include @TOP_OBJDIR@/src/config/Makefile.lwp + INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ -LDFLAGS = ${XLDFLAGS} ${ARCHFLAGS} - # # What to make # @@ -27,26 +27,30 @@ all: afsd vsys @ENABLE_FUSE_CLIENT@ AFSLIBS=${TOP_LIBDIR}/libauth.a ${TOP_LIBDIR}/libcmd.a ${TOP_LIBDIR}/libsys.a ${TOP_LIBDIR}/util.a ${TOP_LIBDIR}/librx.a ${TOP_LIBDIR}/liblwp.a ${TOP_LIBDIR}/util.a UAFSLIBS=${TOP_LIBDIR}/libuafs.a ${TOP_LIBDIR}/libdes.a ${TOP_LIBDIR}/libafsutil.a ${TOP_LIBDIR}/libcmd.a ${TOP_LIBDIR}/libafsutil.a -UAFS_CFLAGS=${CFLAGS} -I${TOP_SRCDIR}/afs -I${TOP_SRCDIR}/afs/UKERNEL -I${TOP_SRCDIR}/rx/UKERNEL -DUKERNEL @FUSE_CFLAGS@ -UAFS_XLIBS=${XLIBS} @FUSE_LIBS@ +FUSE_LIBS=@FUSE_LIBS@ +LDFLAGS_afsd = $(AFSD_LDFLAGS) afsd: afsd.o afsd_kernel.o $(AFSLIBS) $(AFSD_LIBS) - ${CC} ${CFLAGS} -o afsd afsd.o afsd_kernel.o $(NON_SHARED) $(LDFLAGS) $(AFSD_LDFLAGS) $(AFSLIBS) ${XLIBS} ${AFSD_LIBS} + ${AFS_LDRULE} afsd.o afsd_kernel.o $(NON_SHARED) \ + $(AFSLIBS) ${XLIBS} ${AFSD_LIBS} +LDFLAGS_afsd.fuse = $(AFSD_LDFLAGS) afsd.fuse: afsd_fuse.o $(UAFSLIBS) $(AFSD_LIBS) - ${CC} ${UAFS_CFLAGS} -o afsd.fuse afsd_fuse.o $(NON_SHARED) $(LDFLAGS) $(AFSD_LDFLAGS) $(UAFSLIBS) ${UAFS_XLIBS} ${AFSD_LIBS} + ${AFS_LDRULE} afsd_fuse.o $(NON_SHARED) \ + $(UAFSLIBS) ${XLIBS} ${FUSE_LIBS} ${AFSD_LIBS} vsys: vsys.o - ${CC} ${CFLAGS} -o vsys vsys.o ${TOP_LIBDIR}/libsys.a $(LDFLAGS) ${XLIBS} + ${AFS_LDRULE} vsys.o ${TOP_LIBDIR}/libsys.a ${XLIBS} # # Objects # -afsd.o: afsd.c AFS_component_version_number.c - $(CC) $(CFLAGS) @CFLAGS_NOERROR@ -c ${srcdir}/afsd.c +CFLAGS_afsd.o = @CFLAGS_NOERROR@ +CFLAGS_afsd_kernel.o = @CFLAGS_NOERROR@ +CFLAGS_afsd_fuse.o = -I${TOP_SRCDIR}/afs -I${TOP_SRCDIR}/afs/UKERNEL \ + -I${TOP_SRCDIR}/rx/UKERNEL -DUKERNEL @FUSE_CFLAGS@ -afsd_kernel.o: afsd_kernel.c - $(CC) $(CFLAGS) @CFLAGS_NOERROR@ -c ${srcdir}/afsd_kernel.c +afsd.o: afsd.c AFS_component_version_number.c afsd_fuse.o: afsd_fuse.c AFS_component_version_number.c $(CC) $(UAFS_CFLAGS) -c ${srcdir}/afsd_fuse.c diff --git a/src/afsmonitor/Makefile.in b/src/afsmonitor/Makefile.in index 70661ae7fe..f653583507 100644 --- a/src/afsmonitor/Makefile.in +++ b/src/afsmonitor/Makefile.in @@ -7,6 +7,8 @@ srcdir=@srcdir@ include @TOP_OBJDIR@/src/config/Makefile.config +include @TOP_OBJDIR@/src/config/Makefile.lwp + INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -47,12 +49,11 @@ afsmon-win.o: afsmon-win.c ${INCLS} afsmonitor.o: afsmonitor.c ${INCLS} AFS_component_version_number.c afsmonitor: afsmonitor.o afsmon-win.o afsmon-output.o ${LIBS} - ${CC} ${LDFLAGS} -o afsmonitor afsmonitor.o afsmon-win.o \ - afsmon-output.o ${LIBS} ${EXTRA_LIBS} + $(AFS_LDRULE) afsmonitor.o afsmon-win.o afsmon-output.o \ + ${LIBS} ${EXTRA_LIBS} afsmon-parselog: afsmon-parselog.o ${LIBS} - ${CC} ${CFLAGS} -o afsmon-parselog afsmon-parselog.c \ - ${LIBS} ${EXTRA_LIBS} + $(AFS_LDRULE) afsmon-parselog.c ${LIBS} ${EXTRA_LIBS} install: afsmonitor ${INSTALL} -d ${DESTDIR}${bindir} diff --git a/src/afsweb/Makefile.in b/src/afsweb/Makefile.in index 23e40afbcf..5b6d1dd90c 100644 --- a/src/afsweb/Makefile.in +++ b/src/afsweb/Makefile.in @@ -7,6 +7,8 @@ srcdir=@srcdir@ include @TOP_OBJDIR@/src/config/Makefile.config +include @TOP_OBJDIR@/src/config/Makefile.lwp + INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -155,7 +157,7 @@ DEBUG_FLAG= AUX_CFLAGS= VERSION_CFLAG= AFS_INCL=-I${TOP_INCDIR} -I.. -I../config -CFLAGS=$(OPTF) $(DEFINES) -I. -I.. $(VERSION_CFLAG) $(DEBUG_FLAG) +XCFLAGS= $(CFLAGS) $(OPTF) $(DEFINES) -I. -I.. $(VERSION_CFLAG) $(DEBUG_FLAG) INCLS=${TOP_INCDIR}/ubik.h \ ${TOP_INCDIR}/lwp.h \ ${TOP_INCDIR}/lock.h \ @@ -187,7 +189,7 @@ LIBOBJS=$(LIBCOMMON_OBJS) $(LIBAPACHE_OBJS) OBJS=$(LIBOBJS) apache_afs_weblog.o weblog.o .c.o: - $(CCOBJ) -c $(CFLAGS) $(AFS_INCL) $(AUX_CFLAGS) $< + $(CCOBJ) -c $(XCFLAGS) $(AFS_INCL) $(AUX_CFLAGS) $< weblog: weblog.o $(APACHE_AFS_COMMON_LIB) @@ -225,9 +227,9 @@ apache_afs_utils.o: apache_afs_utils.c apache_afs_utils.h apache_afs_cache.o: apache_afs_cache.c apache_afs_cache.h weblog.o: weblog.c weblog_errors.h $(APACHE_AFS_COMMON_LIB) apache_afs_client.o: apache_api.h apache_afs_client.c apache_afs_utils.o apache_afs_cache.o AFS_component_version_number.o - $(CC) -c $(CFLAGS) $(AFS_INCL) $(APACHE_INCLUDES) $(AUX_CFLAGS) apache_afs_client.c + $(CC) -c $(XCFLAGS) $(AFS_INCL) $(APACHE_INCLUDES) $(AUX_CFLAGS) apache_afs_client.c apache_afs_plugin.o: apache_api.h apache_afs_plugin.c apache_afs_client.o apache_afs_utils.o apache_afs_cache.o - $(CC) -c $(CFLAGS) $(APACHE_INCLUDES) $(AUX_CFLAGS) apache_afs_plugin.c + $(CC) -c $(XCFLAGS) $(APACHE_INCLUDES) $(AUX_CFLAGS) apache_afs_plugin.c clean: diff --git a/src/aklog/Makefile.in b/src/aklog/Makefile.in index a0c2d1c629..84367e3bc3 100644 --- a/src/aklog/Makefile.in +++ b/src/aklog/Makefile.in @@ -4,6 +4,8 @@ srcdir=@srcdir@ include @TOP_OBJDIR@/src/config/Makefile.config +include @TOP_OBJDIR@/src/config/Makefile.lwp + INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -24,13 +26,13 @@ OBJS= aklog.o krb_util.o linked_list.o all: aklog asetkey klog aklog: ${OBJS} ${AFSLIBS} - ${CC} -o $@ ${CFLAGS} ${OBJS} ${AKLIBS} ${AFSLIBS} ${XLIBS} + $(AFS_LDRULE) ${OBJS} ${AKLIBS} ${AFSLIBS} ${XLIBS} asetkey: asetkey.o ${AFSLIBS} - ${CC} -o $@ ${CFLAGS} asetkey.o ${AKLIBS} ${AFSLIBS} ${XLIBS} + $(AFS_LDRULE) asetkey.o ${AKLIBS} ${AFSLIBS} ${XLIBS} klog: klog.o skipwrap.o ${AFSLIBS} - ${CC} -o $@ ${CFLAGS} klog.o skipwrap.o ${AKLIBS} ${AFSLIBS} ${XLIBS} + $(AFS_LDRULE) klog.o skipwrap.o ${AKLIBS} ${AFSLIBS} ${XLIBS} # # Installation targets diff --git a/src/audit/Makefile.in b/src/audit/Makefile.in index c2a29ea363..dc8c35c077 100644 --- a/src/audit/Makefile.in +++ b/src/audit/Makefile.in @@ -14,13 +14,13 @@ srcdir=@srcdir@ include @TOP_OBJDIR@/src/config/Makefile.config +include @TOP_OBJDIR@/src/config/Makefile.lwp + INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ -CFLAGS=${OPTMZ} -I${TOP_OBJDIR}/src/config -I${TOP_INCDIR} ${XCFLAGS} ${ARCHFLAGS} - all: ${TOP_LIBDIR}/libaudit.a ${TOP_INCDIR}/afs/audit.h ${TOP_LIBDIR}/libaudit.a: libaudit.a @@ -35,13 +35,8 @@ libaudit.a: audit.o audit-file.o audit-sysvmq.o AFS_component_version_number.o $(RANLIB) libaudit.a audit.o: audit.c audit.h audit-api.h - ${CC} ${CFLAGS} -c ${srcdir}/audit.c - audit-file.o: audit-file.c audit.h audit-api.h - ${CC} ${CFLAGS} -c ${srcdir}/audit-file.c - audit-sysvmq.o: audit-sysvmq.c audit.h audit-api.h - ${CC} ${CFLAGS} -c ${srcdir}/audit-sysvmq.c # XXX-INST: where to install the AIX audit files? install: audit.h libaudit.a diff --git a/src/auth/Makefile.in b/src/auth/Makefile.in index c1dea3762a..246c1601cd 100644 --- a/src/auth/Makefile.in +++ b/src/auth/Makefile.in @@ -7,6 +7,7 @@ srcdir=@srcdir@ include @TOP_OBJDIR@/src/config/Makefile.config +include @TOP_OBJDIR@/src/config/Makefile.lwp INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ @@ -69,8 +70,9 @@ cellconfig.o: cellconfig.c ${INCLS} copyauth.o: copyauth.c ${INCLS} AFS_component_version_number.o setkey.o: setkey.c ${INCLS} AFS_component_version_number.o +CFLAGS_ktc.krb.o = -DAFS_KERBEROS_ENV ktc.krb.o: ktc.c ${INCLS} ${TOP_INCDIR}/afs/vice.h - ${CCOBJ} ${CFLAGS} -DAFS_KERBEROS_ENV -c ${srcdir}/ktc.c -o ktc.krb.o + $(AFS_CCRULE) $(srcdir)/ktc.c libauth.a: $(OBJS) AFS_component_version_number.o -$(RM) -f libauth.a @@ -83,19 +85,15 @@ libauth.krb.a: $(KOBJS) AFS_component_version_number.o $(RANLIB) $@ copyauth: copyauth.o ${LIBS} - $(CC) $(CFLAGS) -o copyauth copyauth.o ${LIBS} ${XLIBS} + $(AFS_LDRULE) copyauth.o ${LIBS} ${XLIBS} setkey: setkey.o ${LIBS} - ${CC} $(CFLAGS) -o setkey setkey.o ${LIBS} ${XLIBS} - -acfg_errors.o: acfg_errors.c + $(AFS_LDRULE) setkey.o ${LIBS} ${XLIBS} acfg_errors.c cellconfig.h: acfg_errors.et cellconfig.p.h $(RM) -f cellconfig.h acfg_errors.c ${COMPILE_ET} -p ${srcdir} acfg_errors -h cellconfig -ktc_errors.o: ktc_errors.c - ktc.o: token.h ktc_errors.c auth.h: ktc_errors.et auth.p.h diff --git a/src/auth/test/Makefile.in b/src/auth/test/Makefile.in index 7582137eb1..db1792b5d0 100644 --- a/src/auth/test/Makefile.in +++ b/src/auth/test/Makefile.in @@ -7,6 +7,8 @@ srcdir=@srcdir@ include @TOP_OBJDIR@/src/config/Makefile.config +include @TOP_OBJDIR@/src/config/Makefile.lwp + INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -18,10 +20,10 @@ LIBS= ../libauth.a ${TOP_LIBDIR}/librx.a ${TOP_LIBDIR}/libsys.a \ tests all: testcellconf ktctest testcellconf: testcellconf.o - $(CC) $(CFLAGS) -o testcellconf testcellconf.o ${LIBS} + $(AFS_LDRULE) testcellconf.o ${LIBS} ktctest: ktctest.o - $(CC) $(CFLAGS) -o ktctest ktctest.o ${LIBS} + $(AFS_LDRULE) ktctest.o ${LIBS} clean: $(RM) -f *.o *.a copyauth testcellconf ktctest setkey auth.h cellconfig.h acfg_errors.c ktc_errors.c core diff --git a/src/bozo/Makefile.in b/src/bozo/Makefile.in index c386254bf5..9abeaf2418 100644 --- a/src/bozo/Makefile.in +++ b/src/bozo/Makefile.in @@ -7,6 +7,8 @@ srcdir=@srcdir@ include @TOP_OBJDIR@/src/config/Makefile.config +include @TOP_OBJDIR@/src/config/Makefile.lwp + INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -93,16 +95,14 @@ bnode.o: bnode.c ${INCLS} bosoprocs.o: bosoprocs.c ${INCLS} bos.o: bos.c ${INCLS} AFS_component_version_number.o - $(CC) $(CFLAGS) -c ${srcdir}/bos.c bos: bos.o $(LIBS) libbos.a - ${CC} ${CFLAGS} -o bos bos.o libbos.a $(LIBS) ${XLIBS} + $(AFS_LDRULE) bos.o libbos.a $(LIBS) ${XLIBS} bos_util.o: bos_util.c ${INCLS} AFS_component_version_number.o ${TOP_INCDIR}/afs/bnode.h - $(CC) $(CFLAGS) -c ${srcdir}/bos_util.c -bos_util: bos_util.o $(LIBS) - ${CC} ${CFLAGS} -o bos_util bos_util.o $(LIBS) ${XLIBS} +bos_util: bos_util.o $(LIBS) + $(AFS_LDRULE) bos_util.o $(LIBS) ${XLIBS} ezbnodeops.o: ezbnodeops.c ${INCLS} @@ -114,7 +114,7 @@ libbos.a: bosint.xdr.o bosint.cs.o boserr.o AFS_component_version_number.o $(RANLIB) $@ bosserver: $(OBJS) $(LIBS) - ${CC} $(CFLAGS) -o bosserver $(OBJS) ${TOP_LIBDIR}/libaudit.a $(LIBS) ${XLIBS} + $(AFS_LDRULE) $(OBJS) ${TOP_LIBDIR}/libaudit.a $(LIBS) ${XLIBS} # # Install targets diff --git a/src/bozo/test/Makefile.in b/src/bozo/test/Makefile.in index 9231760609..e65f7d8f18 100644 --- a/src/bozo/test/Makefile.in +++ b/src/bozo/test/Makefile.in @@ -12,10 +12,7 @@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ -INCDIRS=-I${TOP_INCDIR} -I.. -LDIRS=-L${TOP_LIBDIR} -L${DESTDIR}/lib/afs -L.. - -CFLAGS = ${OPTIMIZE} ${INCDIRS} ${LDIRS} ${LIBS} ${XCFLAGS} ${ARCHFLAGS} +MODULE_CFLAGS=$(LDIRS) $(LIBS) all: testproc smail-notifier @@ -25,10 +22,10 @@ install: # Build targets # testproc: testproc.c - $(CC) $(CFLAGS) -o testproc testproc.c + $(CC) $(AFS_LDFLAGS) $(AFS_CFLAGS) -o testproc testproc.c smail-notifier: smail-notifier.c - $(CC) $(CFLAGS) -o smail-notifier smail-notifier.c + $(CC) $(AFS_LDFLAGS) $(AFS_CFLAGS) -o smail-notifier smail-notifier.c # # Misc targets diff --git a/src/bu_utils/Makefile.in b/src/bu_utils/Makefile.in index 03edfdcae2..083334667d 100644 --- a/src/bu_utils/Makefile.in +++ b/src/bu_utils/Makefile.in @@ -7,6 +7,8 @@ srcdir=@srcdir@ include @TOP_OBJDIR@/src/config/Makefile.config +include @TOP_OBJDIR@/src/config/Makefile.lwp + INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -21,7 +23,7 @@ FMSLIBS=${TOP_LIBDIR}/libcmd.a \ ${TOP_LIBDIR}/util.a fms: fms.o - ${CC} ${LDFLAGS} -o fms fms.o ${FMSLIBS} + $(AFS_LDRULE) fms.o ${FMSLIBS} fms.o: fms.c AFS_component_version_number.o diff --git a/src/bubasics/Makefile.in b/src/bubasics/Makefile.in index 4c94f19769..3e511126fb 100644 --- a/src/bubasics/Makefile.in +++ b/src/bubasics/Makefile.in @@ -7,6 +7,8 @@ srcdir=@srcdir@ include @TOP_OBJDIR@/src/config/Makefile.config +include @TOP_OBJDIR@/src/config/Makefile.lwp + INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ diff --git a/src/bucoord/Makefile.in b/src/bucoord/Makefile.in index 375aacaaea..beb384400e 100644 --- a/src/bucoord/Makefile.in +++ b/src/bucoord/Makefile.in @@ -7,6 +7,8 @@ srcdir=@srcdir@ include @TOP_OBJDIR@/src/config/Makefile.config +include @TOP_OBJDIR@/src/config/Makefile.lwp + INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -41,14 +43,13 @@ libbxdb.a: dsstub.o ubik_db_if.o status.o dlq.o bucoord_errs.o volstub.o AFS_com $(RANLIB) $@ ttest: ttest.o ${TOP_LIBDIR}/librx.a ${TOP_LIBDIR}/liblwp.a libbxdb.a - ${CC} ${CFLAGS} -o ttest ttest.o libbxdb.a \ - ${TOP_LIBDIR}/libbubasics.a \ + $(AFS_LDRULE) ttest.o libbxdb.a ${TOP_LIBDIR}/libbubasics.a \ ${TOP_LIBDIR}/librx.a ${TOP_LIBDIR}/liblwp.a ttest.o: AFS_component_version_number.c btest: btest.o ${TOP_LIBDIR}/libbubasics.a ${TOP_LIBDIR}/librx.a ${TOP_LIBDIR}/liblwp.a - ${CC} ${CFLAGS} -o btest btest.o ${TOP_LIBDIR}/libbubasics.a \ + $(AFS_LDRULE) btest.o ${TOP_LIBDIR}/libbubasics.a \ ${TOP_LIBDIR}/librx.a ${TOP_LIBDIR}/liblwp.a btest.o: AFS_component_version_number.c @@ -67,7 +68,7 @@ main.o: AFS_component_version_number.c $(BACKOBJS): bc.h ${TOP_INCDIR}/afs/butc.h backup: $(BACKOBJS) ${LIBS} - ${CC} ${CFLAGS} -o backup $(BACKOBJS) ${LIBS} ${XLIBS} + $(AFS_LDRULE) $(BACKOBJS) ${LIBS} ${XLIBS} bucoord_errs.c bc.h: bucoord_errs.et bc.p.h $(RM) -f bc.h bucoord_errs.c @@ -76,17 +77,7 @@ bucoord_errs.c bc.h: bucoord_errs.et bc.p.h # # Errors # -ubik_db_if.o: ubik_db_if.c - $(CC) $(CFLAGS) -c ${srcdir}/ubik_db_if.c - -volstub.o: volstub.c - $(CC) $(CFLAGS) -c ${srcdir}/volstub.c - -commands.o: commands.c - $(CC) $(CFLAGS) @CFLAGS_NOERROR@ -c ${srcdir}/commands.c - -regex.o: regex.c - $(CC) $(CFLAGS) -c ${srcdir}/regex.c +CFLAGS_commands.o=@CFLAGS_NOERROR@ # # Install targets diff --git a/src/budb/Makefile.in b/src/budb/Makefile.in index ef251bb5cd..b8aefbdcbb 100644 --- a/src/budb/Makefile.in +++ b/src/budb/Makefile.in @@ -8,6 +8,8 @@ srcdir=@srcdir@ include @TOP_OBJDIR@/src/config/Makefile.config +include @TOP_OBJDIR@/src/config/Makefile.lwp + INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -96,7 +98,7 @@ struct_ops.o: budb_errs.h ${TOP_INCDIR}/afs/budb_client.h server.o: server.c budb_errs.h ${INCLS} AFS_component_version_number.c budb_server: $(SERVER_OBJS) ${LIBS} ${TOP_INCDIR}/afs/budb_client.h - ${CC} ${LDFLAGS} -o budb_server $(SERVER_OBJS) ${LIBS} ${XLIBS} + $(AFS_LDRULE) $(SERVER_OBJS) ${LIBS} ${XLIBS} budb.cs.c: budb.rg ${RXGEN} -A -u -C -o $@ ${srcdir}/budb.rg diff --git a/src/butc/Makefile.in b/src/butc/Makefile.in index 9bd050de0a..b418de5faf 100644 --- a/src/butc/Makefile.in +++ b/src/butc/Makefile.in @@ -9,6 +9,8 @@ srcdir=@srcdir@ include @TOP_OBJDIR@/src/config/Makefile.config +include @TOP_OBJDIR@/src/config/Makefile.lwp + INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -56,38 +58,39 @@ SOBJS=dbentries.o tcprocs.o lwps.o tcmain.o list.o recoverDb.o tcudbprocs.o \ all: butc read_tape butc_test: ${TESTOBJS} ${LIBS} ${INCLS} ${HACKS} - ${CC} ${CFLAGS} ${TESTOBJS} ${LIBS} ${XLIBS} -o butc_test + $(AFS_LDRULE) ${TESTOBJS} ${LIBS} ${XLIBS} tdump: tdump.c AFS_component_version_number.c - ${CC} ${CFLAGS} ${srcdir}/tdump.c -o tdump + $(CC) $(AFS_CPPFLAGS) $(AFS_CFLAGS) $(AFS_LDFLAGS) \ + ${srcdir}/tdump.c -o tdump butc: ${SOBJS} ${LIBS} ${INCLS} ${HACKS} @case ${SYS_NAME} in \ - rs_aix*) ${CC} ${CFLAGS} ${SOBJS} ${LIBS} ${XLIBS} /usr/lib/libc_r.a -o butc;; \ - *) ${CC} ${CFLAGS} ${SOBJS} ${LIBS} ${XLIBS} -o butc;; \ + rs_aix*) $(AFS_LDRULE) ${SOBJS} ${LIBS} ${XLIBS} \ + /usr/lib/libc_r.a ;; \ + *) $(AFS_LDRULE) ${SOBJS} ${LIBS} ${XLIBS} ;; \ esac tcmain.o: tcmain.c ${INCLS} AFS_component_version_number.c - $(CC) $(CFLAGS) -c ${srcdir}/tcmain.c - dbentries.o: dbentries.c ${INCLS} tcprocs.o: tcprocs.c ${INCLS} test.o: test.c ${INCLS} AFS_component_version_number.c lwps.o: lwps.c ${INCLS} - $(CC) $(CFLAGS) -c ${srcdir}/lwps.c list.o: list.c ${INCLS} recoverDb.o: recoverDb.c ${INCLS} tcudbprocs.o: tcudbprocs.c ${INCLS} - $(CC) $(CFLAGS) @CFLAGS_NOERROR@ -c ${srcdir}/tcudbprocs.c dump.o: dump.c ${INCLS} - $(CC) $(CFLAGS) -c ${srcdir}/dump.c tcstatus.o: tcstatus.c ${INCLS} read_tape: read_tape.c - ${CC} ${CFLAGS} -o read_tape ${srcdir}/read_tape.c \ + $(CC) $(AFS_CPPFLAGS) $(AFS_CFLAGS) $(AFS_LDFLAGS) \ + -o read_tape ${srcdir}/read_tape.c \ ${TOP_LIBDIR}/libcmd.a ${TOP_LIBDIR}/util.a \ ${TOP_LIBDIR}/libusd.a +# Errors +CFLAGS_tcudbprocs.o=@CFLAGS_NOERROR@ + clean: $(RM) -f butc *.o butc_test core tdump read_tape AFS_component_version_number.c diff --git a/src/butm/Makefile.in b/src/butm/Makefile.in index c230a062cf..540fa8b7a1 100644 --- a/src/butm/Makefile.in +++ b/src/butm/Makefile.in @@ -7,6 +7,8 @@ srcdir=@srcdir@ include @TOP_OBJDIR@/src/config/Makefile.config +include @TOP_OBJDIR@/src/config/Makefile.lwp + INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -41,7 +43,7 @@ file_tm.o: file_tm.c ${INCLS} AFS_component_version_number.c test_ftm.o: test_ftm.c ${INCLS} AFS_component_version_number.c test_ftm: test_ftm.o libbutm.a - ${CC} ${LDFLAGS} -o test_ftm test_ftm.o libbutm.a ${LIBS} + $(AFS_LDRULE) test_ftm.o libbutm.a ${LIBS} test: test_ftm echo 'Usage: ./test_ftm -conf config -tape xxx *' diff --git a/src/cf/osconf.m4 b/src/cf/osconf.m4 index ceca428eb2..250a76dff4 100644 --- a/src/cf/osconf.m4 +++ b/src/cf/osconf.m4 @@ -2,7 +2,6 @@ AC_DEFUN([OPENAFS_OSCONF], [ dnl defaults, override in case below as needed -CFLAGS= XCFLAGS='${DBG} ${OPTMZ}' RXDEBUG="-DRXDEBUG" SHLIB_SUFFIX="so" diff --git a/src/cmd/Makefile.in b/src/cmd/Makefile.in index 260bcc0995..9a2293891a 100644 --- a/src/cmd/Makefile.in +++ b/src/cmd/Makefile.in @@ -7,6 +7,8 @@ srcdir=@srcdir@ include @TOP_OBJDIR@/src/config/Makefile.config +include @TOP_OBJDIR@/src/config/Makefile.lwp + INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -41,10 +43,12 @@ cmd_errors.o: cmd_errors.c cmd.o: cmd.c cmd.h cmd_errors64.o: cmd_errors.c - ${CC} ${OPTMZ} -I. -I${TOP_OBJDIR}/src/config -I${TOP_INCDIR} ${XCFLAGS64} -c -o cmd_errors64.o cmd_errors.c + ${CC} $(COMMON_CFLAGS) $(CPPFLAGS) ${XCFLAGS64} \ + -c -o cmd_errors64.o cmd_errors.c cmd64.o: cmd.c cmd.h - ${CC} ${OPTMZ} -I. -I${TOP_OBJDIR}/src/config -I${TOP_INCDIR} ${XCFLAGS64} -c -o cmd64.o ${srcdir}/cmd.c + ${CC} $(COMMON_CFLAGS) $(CPPFLAGS) ${XCFLAGS64} \ + -c -o cmd64.o ${srcdir}/cmd.c libcmd64.a: ${LIB64OBJS} AFS_component_version_number64.o -$(RM) -f $@ @@ -57,7 +61,9 @@ libcmd.a: ${LIBOBJS} AFS_component_version_number.o $(RANLIB) $@ AFS_component_version_number64.o: AFS_component_version_number.c - ${CC} ${OPTMZ} -I${TOP_INCDIR} ${XCFLAGS64} -c -o AFS_component_version_number64.o AFS_component_version_number.c + ${CC} $(COMMON_CFLAGS) $(CPPFLAGS) ${XCFLAGS64} \ + -c -o AFS_component_version_number64.o \ + AFS_component_version_number.c # # Install targets diff --git a/src/cmd/test/Makefile.in b/src/cmd/test/Makefile.in index d0adeb36da..d1bdb43b19 100644 --- a/src/cmd/test/Makefile.in +++ b/src/cmd/test/Makefile.in @@ -7,30 +7,27 @@ srcdir=@srcdir@ include @TOP_OBJDIR@/src/config/Makefile.config +include @TOP_OBJDIR@/src/config/Makefile.lwp + INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ - LDIRS= -L${DESTDIR}/lib -L${DESTDIR}/lib/afs -L.. LIBS=-lcmd -lcom_err -lafsutil -INCDIRS= -I${SRCDIR}/include -I${SRCDIR}/include/afs -I.. - -CFLAGS = ${OPTIMIZE} ${INCDIRS} ${LDIRS} ${LIBS} ${XCFLAGS} ${ARCHFLAGS} - all: test test tests: ctest dtest itest itest: itest.o - cc ${CFLAGS} -o itest itest.o + $(AFS_LDRULE) itest.o $(LDIRS) $(LIBS) ctest: ctest.o - cc ${CFLAGS} -o ctest ctest.o + $(AFS_LDRULE) ctest.o $(LDIRS) $(LIBS) dtest: dtest.o - cc ${CFLAGS} -o dtest dtest.o + $(AFS_LDRULE) dtest.o $(LDIRS) $(LIBS) system: test diff --git a/src/comerr/Makefile.in b/src/comerr/Makefile.in index a22742d4c0..1991f4baea 100644 --- a/src/comerr/Makefile.in +++ b/src/comerr/Makefile.in @@ -6,6 +6,8 @@ srcdir=@srcdir@ include @TOP_OBJDIR@/src/config/Makefile.config +include @TOP_OBJDIR@/src/config/Makefile.lwp + INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -34,9 +36,9 @@ et_lex.lex.c: et_lex.lex.l compile_et: compile_et.o error_table.o case $(SYS_NAME) in \ *_linux* | *_umlinux* ) \ - ${CC} ${CFLAGS} -o compile_et compile_et.o error_table.o -L${TOP_LIBDIR} -lafsutil;; \ + $(AFS_LDRULE) compile_et.o error_table.o -L${TOP_LIBDIR} -lafsutil;; \ * ) \ - ${CC} ${CFLAGS} -o compile_et compile_et.o error_table.o -L${TOP_LIBDIR} -lafsutil -ll;; \ + $(AFS_LDRULE) compile_et.o error_table.o -L${TOP_LIBDIR} -lafsutil -ll;; \ esac libcom_err.a: error_msg.o et_name.o com_err.o AFS_component_version_number.o @@ -48,8 +50,7 @@ libcom_err.a: error_msg.o et_name.o com_err.o AFS_component_version_number.o # When we build this file, we're using a .c file that's in the object directory, # so we need to add the source directory to the includes to pick up local headers. # -error_table.o: error_table.c - $(CC) $(CFLAGS) -I${srcdir} @CFLAGS_NOUNUSED@ @CFLAGS_NOOLDSTYLE@ -c error_table.c +CFLAGS_error_table.o= -I${srcdir} @CFLAGS_NOUNUSED@ @CFLAGS_NOOLDSTYLE@ # # Installation targets diff --git a/src/comerr/test/Makefile.in b/src/comerr/test/Makefile.in index 28211239c2..9b4542d446 100644 --- a/src/comerr/test/Makefile.in +++ b/src/comerr/test/Makefile.in @@ -5,13 +5,8 @@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ - - -INCDIRS=-I${TOP_INCDIR} -I.. LDIRS=-L${TOP_LIBDIR} -L${DESTDIR}/lib/afs -L.. -CFLAGS = ${OPTIMIZE} ${INCDIRS} ${LDIRS} -lcom_err ${XCFLAGS} ${ARCHFLAGS} - all: test install: @@ -20,7 +15,7 @@ install: # Build targets # test: test.o test1.o test2.o - $(CC) ${CFLAGS} -o test test.o test1.o test2.o + $(AFS_LDRULE) ${LDIRS} -lcom_err test.o test1.o test2.o test.o: test1.h test2.h test1.o : test1.c diff --git a/src/config/.gitignore b/src/config/.gitignore index d6e314e3e8..2bac1d5904 100644 --- a/src/config/.gitignore +++ b/src/config/.gitignore @@ -5,6 +5,9 @@ /Makefile.*_*[0123456789] /Makefile.*_*[0123456789].in /Makefile.config +/Makefile.lwp +/Makefile.shared +/Makefile.pthread /Makefile.version /Makefile.version-NOCML /Makefile.version-CML diff --git a/src/config/Makefile.config.in b/src/config/Makefile.config.in index 1be3eed3ee..2016b8b19f 100644 --- a/src/config/Makefile.config.in +++ b/src/config/Makefile.config.in @@ -24,7 +24,7 @@ mandir=@mandir@ prefix=@prefix@ sbindir=@sbindir@ sysconfdir=@sysconfdir@ -viceetcdir=@viceetcdir@ +viceetcdir=@viceetcdir@/ # @@ -132,11 +132,27 @@ SHELL = /bin/sh # -I. and -I${srcdir} are only needed for objdir builds - we should # conditionalise them on that. -COMMON_INCL=-I${TOP_OBJDIR}/src/config -I${TOP_INCDIR} -I${srcdir} -I. -COMMON_CFLAGS=${DBG} ${OPTMZ} ${COMMON_INCL} ${INCLUDE_LIBINTL} +COMMON_INCL=$(MODULE_INCLUDE) -I${TOP_OBJDIR}/src/config -I${TOP_INCDIR} \ + -I${srcdir} -I. -CFLAGS=${COMMON_CFLAGS} ${XCFLAGS} ${ARCHFLAGS} $(CFLAGS_NOERROR) -LDFLAGS=${XLDFLAGS} ${ARCHFLAGS} +COMMON_CFLAGS=$(CFLAGS) ${DBG} ${OPTMZ} ${COMMON_INCL} ${INCLUDE_LIBINTL} + +COMMON_LDFLAGS=$(LDFLAGS) $(DBG) $(OPTMZ) + +# LWP Flags +LWP_CFLAGS=$(COMMON_CFLAGS) $(MODULE_CFLAGS) $(XCFLAGS) $(ARCHFLAGS) +LWP_LDFLAGS=$(COMMON_LDFLAGS) $(MODULE_LDFLAGS) $(XLDFLAGS) $(ARCHFLAGS) + +# Pthreaded +PTH_CFLAGS=$(COMMON_CFLAGS) $(MODULE_CFLAGS) $(MT_CFLAGS) +PTH_LDFLAGS=$(COMMON_LDFLAGS) $(MODULE_LDFLAGS) $(MT_LDFLAGS) + +# Shared +SHD_CFLAGS=$(COMMON_CFLAGS) $(MODULE_CFLAGS) $(MT_CFLAGS) $(SHLIB_CFLAGS) +SHD_LDFLAGS=$(COMMON_LDFLAGS) $(MODULE_LDFLAGS) $(SHLIB_LDFLAGS) + +# Default rules. These will be overriden if the module Makefile specifically +# includes a particular type (lwp, pthread, or shared) + +AFS_LDRULE =$(CC) $(AFS_LDFLAGS) $(AFS_CFLAGS) $(LDFLAGS_$(@)) -o $@ -.c.o: - $(CCOBJ) $(CFLAGS) -c $< diff --git a/src/config/Makefile.in b/src/config/Makefile.in index d6a805f8b2..4c8d79b7d7 100644 --- a/src/config/Makefile.in +++ b/src/config/Makefile.in @@ -7,13 +7,13 @@ srcdir=@srcdir@ include @TOP_OBJDIR@/src/config/Makefile.config +include @TOP_OBJDIR@/src/config/Makefile.lwp + INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ -CFLAGS=${DBG} ${OPTMZ} -I${TOP_INCDIR} ${XCFLAGS} ${ARCHFLAGS} - INST=$(RM) -f $@; $(CP) $? $@ all: config mkvers \ @@ -50,16 +50,13 @@ AFS_component_version_number.c: Makefile.version # App build/install targets # config: config.o mc.o - $(CC) $(CFLAGS) -o config config.o mc.o + $(AFS_LDRULE) config.o mc.o -mkvers: ${srcdir}/mkvers.c - $(CC) $(CFLAGS) -o mkvers ${srcdir}/mkvers.c +mkvers: mkvers.c + $(CC) $(AFS_CPPFLAGS) $(AFS_CFLAGS) $(AFS_LDFLAGS) \ + -o mkvers ${srcdir}/mkvers.c -mc.o: ${srcdir}/mc.c - $(CC) $(CFLAGS) -I. -c ${srcdir}/mc.c - -config.o: ${srcdir}/config.c AFS_component_version_number.c - $(CC) $(CFLAGS) -I. -c ${srcdir}/config.c +config.o: config.c AFS_component_version_number.c # # Include installation targets diff --git a/src/config/Makefile.lwp.in b/src/config/Makefile.lwp.in new file mode 100644 index 0000000000..6987736093 --- /dev/null +++ b/src/config/Makefile.lwp.in @@ -0,0 +1,7 @@ +AFS_CFLAGS = $(LWP_CFLAGS) +AFS_LDFLAGS = $(LWP_LDFLAGS) +AFS_CCRULE =$(CCOBJ) $(LWP_CFLAGS) $(CFLAGS_$(@)) -o $@ -c + +.c.o: + $(AFS_CCRULE) $< + diff --git a/src/config/Makefile.pthread.in b/src/config/Makefile.pthread.in new file mode 100644 index 0000000000..1079e5f40e --- /dev/null +++ b/src/config/Makefile.pthread.in @@ -0,0 +1,8 @@ +AFS_CFLAGS=$(PTH_CFLAGS) +AFS_LDFLAGS=$(PTH_LDFLAGS) + +AFS_CCRULE=$(MT_CC) $(AFS_CFLAGS) $(CFLAGS_$(@)) -o $@ -c +AFS_LDRULE=$(MT_CC) $(AFS_LDFLAGS) $(AFS_CFLAGS) $(LDFLAGS_$(@)) -o $@ + +.c.o: + $(AFS_CCRULE) $< diff --git a/src/config/Makefile.shared.in b/src/config/Makefile.shared.in new file mode 100644 index 0000000000..6e7d37268a --- /dev/null +++ b/src/config/Makefile.shared.in @@ -0,0 +1,10 @@ + +AFS_CFLAGS=$(SHD_CFLAGS) +AFS_LDFLAGS=$(SHD_LDFLAGS) + +AFS_CCRULE=$(MT_CC) $(AFS_CFLAGS) $(CFLAGS_$(@)) -o $@ -c +AFS_LDRULE=$(MT_CC) $(AFS_CFLAGS) $(AFS_LDFLAGS) $(LDFLAGS_($(@)) -o $@ + +.c.o: + $(AFS_CCRULE) $< + diff --git a/src/crypto/hcrypto/Makefile.in b/src/crypto/hcrypto/Makefile.in index 93b67038d9..5029000b15 100644 --- a/src/crypto/hcrypto/Makefile.in +++ b/src/crypto/hcrypto/Makefile.in @@ -10,13 +10,11 @@ LIBMINOR=1 srcdir=@srcdir@ include @TOP_OBJDIR@/src/config/Makefile.config +include @TOP_OBJDIR@/src/config/Makefile.shared INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ -CC=${MT_CC} -CFLAGS=${COMMON_CFLAGS} ${MT_CFLAGS} ${SHLIB_CFLAGS} - HEADERS= ${TOP_INCDIR}/hcrypto/aes.h \ ${TOP_INCDIR}/hcrypto/des.h \ ${TOP_INCDIR}/hcrypto/engine.h \ @@ -33,6 +31,10 @@ HEADERS= ${TOP_INCDIR}/hcrypto/aes.h \ ${TOP_INCDIR}/hcrypto/sha.h \ ${TOP_INCDIR}/hcrypto/ui.h +UPSTREAM= ${TOP_SRCDIR}/external/heimdal + +MODULE_INCLUDE=-I${TOP_INCDIR}/hcrypto -I$(UPSTREAM)/hcrypto + SHLIBOBJ= libafshcrypto.${SHLIB_SUFFIX}.${LIBMAJOR}.${LIBMINOR} all: $(ROKEN_HEADERS) ${HEADERS} ${TOP_LIBDIR}/${SHLIBOBJ} \ @@ -64,12 +66,7 @@ OBJECTS = $(COMMON_OBJS) rand-fortuna.o $(ROKEN_LIBOBJS) LWP_OBJS = $(COMMON_OBJS) rand-fortuna_lwp.o $(ROKEN_LIBOBJS) -UPSTREAM= ${TOP_SRCDIR}/external/heimdal - -CFLAGS=$(COMMON_CFLAGS) $(MT_CFLAGS) $(SHLIB_CFLAGS) -CCRULE = $(MT_CC) -I${TOP_INCDIR}/hcrypto ${CFLAGS} -I${UPSTREAM}/hcrypto -c $? - -LWPRULE=$(CC) $(COMMON_CFLAGS) $(XCFLAGS) $(ARCHFLAGS) \ +LWPRULE=$(CC) $(AFS_CPPFLAGS) $(COMMON_CFLAGS) $(XCFLAGS) $(ARCHFLAGS) \ -I$(TOP_INCDIR)/hcrypto -I$(UPSTREAM)/hcrypto -c $? ${TOP_LIBDIR}/${SHLIBOBJ}: ${SHLIBOBJ} @@ -92,7 +89,7 @@ libafshcrypto_lwp.a: $(LWP_OBJS) $(RANLIB) $@ test_cipher: test_cipher.o hex.o libafshcrypto.a - ${CC} ${LDFLAGS} -o test_cipher test_cipher.o hex.o libafshcrypto.a + $(AFS_LDRULE) test_cipher.o hex.o libafshcrypto.a ${TOP_INCDIR}/hcrypto/aes.h: ${UPSTREAM}/hcrypto/aes.h ${INSTALL_DATA} $? $@ @@ -160,173 +157,168 @@ ${TOP_LIBDIR}/libafshcrypto.a: libafshcrypto.a ${TOP_LIBDIR}/libafshcrypto_lwp.a: libafshcrypto_lwp.a ${INSTALL_DATA} $? $@ +# Pthread Targets + +CFLAGS_test_cipher.o= -I${UPSTREAM}/roken/ +CFLAGS_rand-unix.o=@CFLAGS_NOERROR@ +CFLAGS_evp.o=-DHAVE_CONFIG_H aes.o: ${UPSTREAM}/hcrypto/aes.c - ${CCRULE} + $(AFS_CCRULE) $(UPSTREAM)/hcrypto/aes.c bn.o: ${UPSTREAM}/hcrypto/bn.c - ${CCRULE} + $(AFS_CCRULE) $(UPSTREAM)/hcrypto/bn.c camellia.o: ${UPSTREAM}/hcrypto/camellia.c - ${CCRULE} + $(AFS_CCRULE) $(UPSTREAM)/hcrypto/camellia.c camellia-ntt.o: ${UPSTREAM}/hcrypto/camellia-ntt.c - ${CCRULE} + $(AFS_CCRULE) $(UPSTREAM)/hcrypto/camellia-ntt.c des.o: ${UPSTREAM}/hcrypto/des.c - ${CCRULE} - -dh-imath.o: ${UPSTREAM}/hcrypto/dh-imath.c - ${CCRULE} - -dsa.o: ${UPSTREAM}/hcrypto/dsa.c - ${CCRULE} - + $(AFS_CCRULE) $(UPSTREAM)/hcrypto/des.c + evp.o: ${UPSTREAM}/hcrypto/evp.c - ${CCRULE} -DHAVE_CONFIG_H - + $(AFS_CCRULE) $(UPSTREAM)/hcrypto/evp.c + evp-hcrypto.o: ${UPSTREAM}/hcrypto/evp-hcrypto.c - ${CCRULE} - + $(AFS_CCRULE) $(UPSTREAM)/hcrypto/evp-hcrypto.c + evp-cc.o: ${UPSTREAM}/hcrypto/evp-cc.c - ${CCRULE} - -engine.o: engine.c - ${CCRULE} + $(AFS_CCRULE) $(UPSTREAM)/hcrypto/evp-cc.c hmac.o: ${UPSTREAM}/hcrypto/hmac.c - ${CCRULE} + $(AFS_CCRULE) $(UPSTREAM)/hcrypto/hmac.c md2.o: ${UPSTREAM}/hcrypto/md2.c - ${CCRULE} + $(AFS_CCRULE) $(UPSTREAM)/hcrypto/md2.c md4.o: ${UPSTREAM}/hcrypto/md4.c - ${CCRULE} + $(AFS_CCRULE) $(UPSTREAM)/hcrypto/md4.c md5.o: ${UPSTREAM}/hcrypto/md5.c - ${CCRULE} + $(AFS_CCRULE) $(UPSTREAM)/hcrypto/md5.c pkcs5.o: ${UPSTREAM}/hcrypto/pkcs5.c - ${CCRULE} - -pkcs12.o: ${UPSTREAM}/hcrypto/pkcs12.c - ${CCRULE} + $(AFS_CCRULE) $(UPSTREAM)/hcrypto/pkcs5.c rand-egd.o: ${UPSTREAM}/hcrypto/rand-egd.c - ${CCRULE} + $(AFS_CCRULE) $(UPSTREAM)/hcrypto/rand-egd.c rand-fortuna.o: ${UPSTREAM}/hcrypto/rand-fortuna.c - ${CCRULE} - -rand-fortuna_lwp.o: ${UPSTREAM}/hcrypto/rand-fortuna.c - ${LWPRULE} -o rand-fortuna_lwp.o + $(AFS_CCRULE) $(UPSTREAM)/hcrypto/rand-fortuna.c rand-timer.o: ${UPSTREAM}/hcrypto/rand-timer.c - ${CCRULE} + $(AFS_CCRULE) $(UPSTREAM)/hcrypto/rand-timer.c -# The upstream code has a const pointer warning, which we need to suppress */ rand-unix.o: ${UPSTREAM}/hcrypto/rand-unix.c - ${CCRULE} @CFLAGS_NOERROR@ + $(AFS_CCRULE) $(UPSTREAM)/hcrypto/rand-unix.c rand.o: ${UPSTREAM}/hcrypto/rand.c - ${CCRULE} + $(AFS_CCRULE) $(UPSTREAM)/hcrypto/rand.c rc2.o: ${UPSTREAM}/hcrypto/rc2.c - ${CCRULE} + $(AFS_CCRULE) $(UPSTREAM)/hcrypto/rc2.c rc4.o: ${UPSTREAM}/hcrypto/rc4.c - ${CCRULE} + $(AFS_CCRULE) $(UPSTREAM)/hcrypto/rc4.c rijndael-alg-fst.o: ${UPSTREAM}/hcrypto/rijndael-alg-fst.c - ${CCRULE} + $(AFS_CCRULE) $(UPSTREAM)/hcrypto/rijndael-alg-fst.c rnd_keys.o: ${UPSTREAM}/hcrypto/rnd_keys.c - ${CCRULE} - -rsa.o: ${UPSTREAM}/hcrypto/rsa.c - ${CCRULE} - -rsa-gmp.o: ${UPSTREAM}/hcrypto/rsa-gmp.c - ${CCRULE} - -rsa-imath.o: ${UPSTREAM}/hcrypto/rsa-imath.c - ${CCRULE} + $(AFS_CCRULE) $(UPSTREAM)/hcrypto/rnd_keys.c sha.o: ${UPSTREAM}/hcrypto/sha.c - ${CCRULE} + $(AFS_CCRULE) $(UPSTREAM)/hcrypto/sha.c sha256.o: ${UPSTREAM}/hcrypto/sha256.c - ${CCRULE} + $(AFS_CCRULE) $(UPSTREAM)/hcrypto/sha256.c sha512.o: ${UPSTREAM}/hcrypto/sha512.c - ${CCRULE} + ${AFS_CCRULE} $(UPSTREAM)/hcrypto/sha512.c ui.o: ${UPSTREAM}/hcrypto/ui.c - ${CCRULE} + $(AFS_CCRULE) $(UPSTREAM)/hcrypto/ui.c validate.o: ${UPSTREAM}/hcrypto/validate.c - ${CCRULE} + ${AFS_CCRULE} ${UPSTREAM}/hcrypto/validate.c test_cipher.o: ${UPSTREAM}/hcrypto/test_cipher.c - ${CCRULE} -I${UPSTREAM}/roken/ + $(AFS_CCRULE) $(UPSTREAM)/hcrypto/test_cipher.c # These bits of libroken are new functionality, rather than compatibility # code. Where they should go eventually is unclear. cloexec.o: ${UPSTREAM}/roken/cloexec.c - ${CCRULE} + $(AFS_CCRULE) $(UPSTREAM)/roken/cloexec.c ct.o: ${UPSTREAM}/roken/ct.c - ${CCRULE} + $(AFS_CCRULE) $(UPSTREAM)/roken/ct.c hex.o: ${UPSTREAM}/roken/hex.c - ${CCRULE} + $(AFS_CCRULE) $(UPSTREAM)/roken/hex.c issuid.o: ${UPSTREAM}/roken/issuid.c - ${CCRULE} + $(AFS_CCRULE) $(UPSTREAM)/roken/issuid.c net_read.o: ${UPSTREAM}/roken/net_read.c - ${CCRULE} + $(AFS_CCRULE) $(UPSTREAM)/roken/net_read.c net_write.o: ${UPSTREAM}/roken/net_write.c - ${CCRULE} + $(AFS_CCRULE) $(UPSTREAM)/roken/net_write.c # These bits of libroken are compatibility functions. They should get moved # out into a new libroken top level target, which allows the use of an # existing libroken, if one is available. strlcpy.o: ${UPSTREAM}/roken/strlcpy.c - ${CCRULE} + $(AFS_CCRULE) $(UPSTREAM)/roken/strlcpy.c err.h: ${UPSTREAM}/roken/err.hin cp $? $@ err.o: ${UPSTREAM}/roken/err.c - ${CCRULE} + $(AFS_CCRULE) $(UPSTREAM)/roken/err.c errx.o: ${UPSTREAM}/roken/errx.c + $(AFS_CCRULE) $(UPSTREAM)/roken/errx.c ${CCRULE} getprogname.o: ${UPSTREAM}/roken/getprogname.c + $(AFS_CCRULE) $(UPSTREAM)/roken/getprogname.c ${CCRULE} verr.o: ${UPSTREAM}/roken/verr.c + $(AFS_CCRULE) $(UPSTREAM)/roken/verr.c ${CCRULE} verrx.o: ${UPSTREAM}/roken/verrx.c + $(AFS_CCRULE) $(UPSTREAM)/roken/verrx.c ${CCRULE} vwarn.o: ${UPSTREAM}/roken/vwarn.c + $(AFS_CCRULE) $(UPSTREAM)/roken/vwarn.c ${CCRULE} vwarnx.o: ${UPSTREAM}/roken/vwarnx.c + $(AFS_CCRULE) $(UPSTREAM)/roken/vwarnx.c ${CCRULE} warn.o: ${UPSTREAM}/roken/warn.c + $(AFS_CCRULE) $(UPSTREAM)/roken/warn.c ${CCRULE} warnerr.o: ${UPSTREAM}/roken/warnerr.c + $(AFS_CCRULE) $(UPSTREAM)/roken/warnerr.c ${CCRULE} warnx.o: ${UPSTREAM}/roken/warnx.c + $(AFS_CCRULE) $(UPSTREAM)/roken/warnx.c ${CCRULE} + +# LWP Targets + +rand-fortuna_lwp.o: ${UPSTREAM}/hcrypto/rand-fortuna.c + ${LWPRULE} -o rand-fortuna_lwp.o + diff --git a/src/des/Makefile.in b/src/des/Makefile.in index aa628151a8..0d1aa8263a 100644 --- a/src/des/Makefile.in +++ b/src/des/Makefile.in @@ -24,6 +24,8 @@ srcdir=@srcdir@ include @TOP_OBJDIR@/src/config/Makefile.config +include @TOP_OBJDIR@/src/config/Makefile.lwp + INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -101,38 +103,38 @@ libdes.a: ${OBJS} AFS_component_version_number.o $(RANLIB) libdes.a make_ip: make_ip.o misc.o main.o - ${CC} make_ip.o misc.o main.o ${LDFLAGS} -o make_ip + $(AFS_LDRULE) make_ip.o misc.o main.o make_fp: make_fp.o misc.o main.o - ${CC} make_fp.o misc.o main.o ${LDFLAGS} -o make_fp + $(AFS_LDRULE) make_fp.o misc.o main.o make_odd: make_odd.o misc.o main.o - ${CC} make_odd.o misc.o main.o ${LDFLAGS} -o make_odd + $(AFS_LDRULE) make_odd.o misc.o main.o make_s_table: make_s_table.o misc.o main.o - ${CC} make_s_table.o misc.o main.o ${LDFLAGS} -o make_s_table + $(AFS_LDRULE) make_s_table.o misc.o main.o make_p_table: make_p_table.o misc.o main.o - ${CC} make_p_table.o misc.o main.o ${LDFLAGS} -o make_p_table + $(AFS_LDRULE) make_p_table.o misc.o main.o make_keyperm: make_keyperm.o misc.o main.o - ${CC} make_keyperm.o misc.o main.o ${LDFLAGS} -o make_keyperm + $(AFS_LDRULE) make_keyperm.o misc.o main.o make_e: make_e.o misc.o main.o - ${CC} make_e.o misc.o main.o ${LDFLAGS} -o make_e + $(AFS_LDRULE) make_e.o misc.o main.o make_p: make_p.o misc.o main.o - ${CC} make_p.o misc.o main.o ${LDFLAGS} -o make_p + $(AFS_LDRULE) make_p.o misc.o main.o make_s: make_s.o misc.o main.o - ${CC} make_s.o misc.o main.o ${LDFLAGS} -o make_s + $(AFS_LDRULE) make_s.o misc.o main.o crypt.o: ${srcdir}/crypt.c case ${SYS_NAME} in \ rs_aix*)\ ${CCOBJ} -c ${COMMON_INCL} -o crypt.o ${srcdir}/crypt.c ;;\ *)\ - ${CCOBJ} -c ${CFLAGS} -o crypt.o ${srcdir}/crypt.c ;;\ + $(AFS_CCRULE) ${srcdir}/crypt.c ;;\ esac # # Table/code generation targets diff --git a/src/des/test/Makefile.in b/src/des/test/Makefile.in index 83a0666967..c99bcc2e7d 100644 --- a/src/des/test/Makefile.in +++ b/src/des/test/Makefile.in @@ -1,20 +1,18 @@ srcdir=@srcdir@ include @TOP_OBJDIR@/src/config/Makefile.config +include @TOP_OBJDIR@/src/config/Makefile.lwp + INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ -CFLAGS=-g -I. -I${srcdir} -I${TOP_OBJDIR}/src/config -I${TOP_INCDIR} ${XCFLAGS} ${ARCHFLAGS} - # Test programs PROGS = \ key_test \ testit \ verify -LDFLAGS = ${XLDFLAGS} ${ARCHFLAGS} - LIBS=\ ${TOP_LIBDIR}/libdes.a \ @@ -26,9 +24,9 @@ clean: install: testit: testit.o - ${CC} ${CFLAGS} testit.o ${LIBS} ${LDFLAGS} -o testit + $(AFS_LDRULE) testit.o ${LIBS} verify: verify.o ../libdes.a - ${CC} ${CFLAGS} verify.o ${LIBS} ${LDFLAGS} -o verify + $(AFS_LDRULE) verify.o ${LIBS} key_test: key_test.o ../libdes.a - ${CC} ${CFLAGS} key_test.o ${LIBS} ${LDFLAGS} -o key_test + $(AFS_LDRULE) key_test.o ${LIBS} diff --git a/src/dir/Makefile.in b/src/dir/Makefile.in index 152423b54a..8eb0f961c3 100644 --- a/src/dir/Makefile.in +++ b/src/dir/Makefile.in @@ -7,6 +7,8 @@ srcdir=@srcdir@ include @TOP_OBJDIR@/src/config/Makefile.config +include @TOP_OBJDIR@/src/config/Makefile.lwp + INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ diff --git a/src/dir/test/Makefile.in b/src/dir/test/Makefile.in index e6ef475395..4a25ebf2b6 100644 --- a/src/dir/test/Makefile.in +++ b/src/dir/test/Makefile.in @@ -7,6 +7,8 @@ srcdir=../../.. include @TOP_OBJDIR@/src/config/Makefile.config +include @TOP_OBJDIR@/src/config/Makefile.lwp + INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -25,7 +27,5 @@ clean: $(RM) -f *.o *.a test dtest core dtest: dtest.o - $(CC) $(LDFLAGS) -o dtest dtest.o $(LIBS) + $(AFS_LDRULE) dtest.o $(LIBS) -dtest.o: dtest.c - $(CC) $(CFLAGS) -c dtest.c diff --git a/src/dviced/Makefile.in b/src/dviced/Makefile.in index 40d8bc0035..cfd2519614 100644 --- a/src/dviced/Makefile.in +++ b/src/dviced/Makefile.in @@ -9,26 +9,26 @@ srcdir=@srcdir@ include @TOP_OBJDIR@/src/config/Makefile.config +include @TOP_OBJDIR@/src/config/Makefile.pthread + INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ -CC=${MT_CC} -CFLAGS=${COMMON_CFLAGS} -DNINTERFACE ${MT_CFLAGS} -DRXDEBUG -DFSSYNC_BUILD_SERVER -DSALVSYNC_BUILD_CLIENT -DAFS_DEMAND_ATTACH_FS +MODULE_CFLAGS=-DNINTERFACE -DRXDEBUG -DFSSYNC_BUILD_SERVER \ + -DSALVSYNC_BUILD_CLIENT -DAFS_DEMAND_ATTACH_FS -CCRULE=${CC} ${CFLAGS} -c $? - -RX=../rx -VICED=../viced -TVICED=../tviced -VLSERVER=../vlserver -LWP=../lwp -LIBACL=../libacl -UTIL=../util -DIR=../dir -VOL=../vol -FSINT=../fsint +RX=$(srcdir)/../rx +VICED=$(srcdir)/../viced +TVICED=$(srcdir)/../tviced +VLSERVER=$(srcdir)/../vlserver +LWP=$(srcdir)/../lwp +LIBACL=$(srcdir)/../libacl +UTIL=$(srcdir)/../util +DIR=$(srcdir)/../dir +VOL=$(srcdir)/../vol +FSINT=$(srcdir)/../fsint VICEDOBJS=viced.o afsfileprocs.o host.o physio.o callback.o serialize_state.o @@ -59,162 +59,164 @@ LIBS=${TOP_LIBDIR}/libafsauthent.a ${TOP_LIBDIR}/libafsrpc.a ${TOP_LIBDIR}/util. all: dafileserver state_analyzer +CFLAGS_rx_pthread.o=-DDPF_FSLOG rx_pthread.o: ${RX}/rx_pthread.c - ${CCRULE} -DDPF_FSLOG + $(AFS_CCRULE) $(RX)/rx_pthread.c viced.o: ${VICED}/viced.c - ${CCRULE} + $(AFS_CCRULE) $(VICED)/viced.c afsfileprocs.o: ${VICED}/afsfileprocs.c - ${CCRULE} + $(AFS_CCRULE) $(VICED)/afsfileprocs.c host.o: ${VICED}/host.c - ${CCRULE} + $(AFS_CCRULE) $(VICED)/host.c physio.o: ${VICED}/physio.c - ${CCRULE} + $(AFS_CCRULE) $(VICED)/physio.c callback.o: ${VICED}/callback.c - ${CCRULE} + $(AFS_CCRULE) $(VICED)/callback.c serialize_state.o: ${TVICED}/serialize_state.c - ${CCRULE} + $(AFS_CCRULE) $(TVICED)/serialize_state.c assert.o: ${UTIL}/assert.c - ${CCRULE} + $(AFS_CCRULE) $(UTIL)/assert.c uuid.o: ${UTIL}/uuid.c - ${CCRULE} + $(AFS_CCRULE) $(UTIL)/uuid.c serverLog.o: ${UTIL}/serverLog.c - ${CCRULE} + $(AFS_CCRULE) $(UTIL)/serverLog.c fileutil.o: ${UTIL}/fileutil.c - ${CCRULE} + $(AFS_CCRULE) $(UTIL)/fileutil.c volparse.o: ${UTIL}/volparse.c - ${CCRULE} + $(AFS_CCRULE) $(UTIL)/volparse.c flipbase64.o: ${UTIL}/flipbase64.c - ${CCRULE} + $(AFS_CCRULE) $(UTIL)/flipbase64.c netutils.o: ${UTIL}/netutils.c - ${CCRULE} -I../util + $(AFS_CCRULE) -I../util $(UTIL)/netutils.c dirpath.o: ${UTIL}/dirpath.c - ${CCRULE} + $(AFS_CCRULE) $(UTIL)/dirpath.c softsig.o: ${UTIL}/softsig.c - ${CCRULE} + $(AFS_CCRULE) $(UTIL)/softsig.c lock.o: ${LWP}/lock.c - ${CCRULE} + $(AFS_CCRULE) $(LWP)/lock.c threadname.o: ${LWP}/threadname.c - ${CCRULE} + $(AFS_CCRULE) $(LWP)/threadname.c aclprocs.o: ${LIBACL}/aclprocs.c - ${CCRULE} + $(AFS_CCRULE) $(LIBACL)/aclprocs.c netprocs.o: ${LIBACL}/netprocs.c - ${CCRULE} + $(AFS_CCRULE) $(LIBACL)/netprocs.c -vldbint.cs.o: ${VLSERVER}/vldbint.cs.c - ${CCRULE} -I${srcdir}/../vlserver +vldbint.cs.o: ../vlserver/vldbint.cs.c + $(AFS_CCRULE) -I$(VLSERVER) ../vlserver/vldbint.cs.c + +vldbint.xdr.o: ../vlserver/vldbint.xdr.c + $(AFS_CCRULE) -I$(VLSERVER) ../vlserver/vldbint.xdr.c -vldbint.xdr.o: ${VLSERVER}/vldbint.xdr.c - ${CCRULE} -I${srcdir}/../vlserver buffer.o: ${DIR}/buffer.c - ${CCRULE} + $(AFS_CCRULE) $(DIR)/buffer.c dir.o: ${DIR}/dir.c - ${CCRULE} + $(AFS_CCRULE) $(DIR)/dir.c salvage.o: ${DIR}/salvage.c - ${CCRULE} + $(AFS_CCRULE) $(DIR)/salvage.c vnode.o: ${VOL}/vnode.c - ${CCRULE} + $(AFS_CCRULE) $(VOL)/vnode.c volume.o: ${VOL}/volume.c - ${CCRULE} + $(AFS_CCRULE) $(VOL)/volume.c vutil.o: ${VOL}/vutil.c - ${CCRULE} + $(AFS_CCRULE) $(VOL)/vutil.c partition.o: ${VOL}/partition.c - ${CCRULE} + $(AFS_CCRULE) $(VOL)/partition.c vg_cache.o: ${VOL}/vg_cache.c - ${CCRULE} + $(AFS_CCRULE) $(VOL)/vg_cache.c vg_scan.o: ${VOL}/vg_scan.c - ${CCRULE} + $(AFS_CCRULE) $(VOL)/vg_scan.c fssync-server.o: ${VOL}/fssync-server.c - ${CCRULE} + $(AFS_CCRULE) $(VOL)/fssync-server.c fssync-client.o: ${VOL}/fssync-client.c - ${CCRULE} + $(AFS_CCRULE) $(VOL)/fssync-client.c salvsync-client.o: ${VOL}/salvsync-client.c - ${CCRULE} + $(AFS_CCRULE) $(VOL)/salvsync-client.c daemon_com.o: ${VOL}/daemon_com.c - ${CCRULE} + $(AFS_CCRULE) $(VOL)/daemon_com.c clone.o: ${VOL}/clone.c - ${CCRULE} + $(AFS_CCRULE) $(VOL)/clone.c nuke.o: ${VOL}/nuke.c - ${CCRULE} + $(AFS_CCRULE) $(VOL)/nuke.c devname.o: ${VOL}/devname.c - ${CCRULE} + $(AFS_CCRULE) $(VOL)/devname.c # only for darwin? fstab.o: ${UTIL}/fstab.c - ${CCRULE} + $(AFS_CCRULE) $(UTIL)/fstab.c common.o: ${VOL}/common.c - ${CCRULE} + $(AFS_CCRULE) $(VOL)/common.c listinodes.o: ${VOL}/listinodes.c - ${CCRULE} + $(AFS_CCRULE) $(VOL)/listinodes.c ihandle.o: ${VOL}/ihandle.c - ${CCRULE} + $(AFS_CCRULE) $(VOL)/ihandle.c namei_ops.o: ${VOL}/namei_ops.c - ${CCRULE} + $(AFS_CCRULE) $(VOL)/namei_ops.c afsaux.o: ${FSINT}/afsaux.c - ${CCRULE} -I../fsint + $(AFS_CCRULE) -I../fsint $(FSINT)/afsaux.c -afscbint.cs.o: ${FSINT}/afscbint.cs.c - ${CCRULE} +afscbint.cs.o: ../fsint/afscbint.cs.c + $(AFS_CCRULE) ../fsint/afscbint.cs.c -afscbint.ss.o: ${FSINT}/afscbint.ss.c - ${CCRULE} +afscbint.ss.o: ../fsint/afscbint.ss.c + $(AFS_CCRULE) ../fsint/afscbint.ss.c -afsint.cs.o: ${FSINT}/afsint.cs.c - ${CCRULE} +afsint.cs.o: ../fsint/afsint.cs.c + $(AFS_CCRULE) ../fsint/afsint.cs.c -afsint.ss.o: ${FSINT}/afsint.ss.c - ${CCRULE} +afsint.ss.o: ../fsint/afsint.ss.c + $(AFS_CCRULE) ../fsint/afsint.ss.c -afsint.xdr.o: ${FSINT}/afsint.xdr.c - ${CCRULE} +afsint.xdr.o: ../fsint/afsint.xdr.c + $(AFS_CCRULE) ../fsint/afsint.xdr.c state_analyzer.o: ${TVICED}/state_analyzer.c - ${CCRULE} + $(AFS_CCRULE) $(TVICED)/state_analyzer.c dafileserver: ${objects} ${LIBS} - ${CC} ${LDFLAGS} -o dafileserver ${objects} ${LIBS} ${MT_LIBS} ${XLIBS} + $(AFS_LDRULE) ${objects} ${LIBS} ${MT_LIBS} ${XLIBS} state_analyzer: ${SDBGOBJS} - ${CC} ${LDFLAGS} -o state_analyzer ${SDBGOBJS} ${MT_LIBS} ${XLIBS} + $(AFS_LDRULE) ${SDBGOBJS} ${MT_LIBS} ${XLIBS} install: dafileserver state_analyzer ${INSTALL} -d ${DESTDIR}${afssrvlibexecdir} diff --git a/src/dvolser/Makefile.in b/src/dvolser/Makefile.in index da3925e5ec..98303d35f9 100644 --- a/src/dvolser/Makefile.in +++ b/src/dvolser/Makefile.in @@ -7,27 +7,25 @@ srcdir=@srcdir@ include @TOP_OBJDIR@/src/config/Makefile.config +include @TOP_OBJDIR@/src/config/Makefile.pthread + INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ HELPER_SPLINT=@HELPER_SPLINT@ -CC=${MT_CC} -CFLAGS=${COMMON_CFLAGS} -DNINTERFACE ${MT_CFLAGS} -DRXDEBUG -DFSSYNC_BUILD_CLIENT -DAFS_DEMAND_ATTACH_FS +MODULE_CFLAGS=-DNINTERFACE -DRXDEBUG \ + -DFSSYNC_BUILD_CLIENT -DAFS_DEMAND_ATTACH_FS -CCRULE=${CC} ${CFLAGS} -c $? - -VICED=../viced -VLSERVER=../vlserver -LWP=../lwp -LIBACL=../libacl -UTIL=../util -DIR=../dir -VOL=../vol -FSINT=../fsint -VOLSER=../volser -RX=../rx +VLSERVER=$(srcdir)/../vlserver +LWP=$(srcdir)/../lwp +LIBACL=$(srcdir)/../libacl +UTIL=$(srcdir)/../util +DIR=$(srcdir)/../dir +VOL=$(srcdir)/../vol +VOLSER=$(srcdir)/../volser +RX=$(srcdir)/../rx VOLSEROBJS=volmain.o volprocs.o physio.o voltrans.o volerr.o volint.cs.o dumpstuff.o volint.ss.o volint.xdr.o vscommon.o vol_split.o @@ -45,12 +43,10 @@ VOLOBJS= vnode.o volume.o vutil.o partition.o fssync-client.o purge.o \ clone.o devname.o common.o ihandle.o listinodes.o \ namei_ops.o nuke.o salvsync-client.o daemon_com.o -FSINTOBJS=# afsaux.o afscbint.cs.o afsint.ss.o afsint.xdr.o - RXOBJS=rx_pthread.o objects= ${VOLSEROBJS} ${LWPOBJS} ${LIBACLOBJS} \ - ${UTILOBJS} ${DIROBJS} ${VOLOBJS} ${FSINTOBJS} ${RXOBJS} + ${UTILOBJS} ${DIROBJS} ${VOLOBJS} ${RXOBJS} LIBS= ${TOP_LIBDIR}/libcmd.a \ ${TOP_LIBDIR}/libafsauthent.a \ @@ -60,165 +56,156 @@ LIBS= ${TOP_LIBDIR}/libcmd.a \ all: davolserver -COMPILE=${CC} ${CFLAGS} -c $? - +CFLAGS_rx_pthread.o = -DDPF_FSLOG rx_pthread.o: ${RX}/rx_pthread.c - ${COMPILE} -DDPF_FSLOG + $(AFS_CCRULE) $(RX)/rx_pthread.c + volmain.o: ${VOLSER}/volmain.c - ${COMPILE} -I../volser + $(AFS_CCRULE) -I../volser $(VOLSER)/volmain.c + vol_split.o: ${VOLSER}/vol_split.c - ${COMPILE} -I../volser + $(AFS_CCRULE) -I../volser $(VOLSER)/vol_split.c + volprocs.o: ${VOLSER}/volprocs.c - ${COMPILE} -I../volser + $(AFS_CCRULE) -I../volser $(VOLSER)/volprocs.c + physio.o: ${VOLSER}/physio.c - ${COMPILE} + $(AFS_CCRULE) $(VOLSER)/physio.c + voltrans.o: ${VOLSER}/voltrans.c - ${COMPILE} -I../volser -volerr.o: ${VOLSER}/volerr.c - ${COMPILE} -volint.cs.o: ${VOLSER}/volint.cs.c - ${COMPILE} + $(AFS_CCRULE) -I../volser $(VOLSER)/voltrans.c + +volerr.o: ../volser/volerr.c + $(AFS_CCRULE) ../volser/volerr.c + +volint.cs.o: ../volser/volint.cs.c + $(AFS_CCRULE) ../volser/volint.cs.c + dumpstuff.o: ${VOLSER}/dumpstuff.c - ${COMPILE} -I../volser -volint.ss.o: ${VOLSER}/volint.ss.c - ${COMPILE} -volint.xdr.o: ${VOLSER}/volint.xdr.c - ${COMPILE} + $(AFS_CCRULE) -I../volser $(VOLSER)/dumpstuff.c + +volint.ss.o: ../volser/volint.ss.c + $(AFS_CCRULE) ../volser/volint.ss.c + +volint.xdr.o: ../volser/volint.xdr.c + $(AFS_CCRULE) ../volser/volint.xdr.c + vsprocs.o: ${VOLSER}/vsprocs.c - ${COMPILE} + $(AFS_CCRULE) $(VOLSER)/vsprocs.c + vsutils.o: ${VOLSER}/vsutils.c - ${COMPILE} + $(AFS_CCRULE) $(VOLSER)/vsutils.c + lockprocs.o: ${VOLSER}/lockprocs.c - ${COMPILE} + $(AFS_CCRULE) $(VOLSER)/lockprocs.c assert.o: ${UTIL}/assert.c - ${COMPILE} + $(AFS_CCRULE) $(UTIL)/assert.c uuid.o: ${UTIL}/uuid.c - ${COMPILE} + $(AFS_CCRULE) $(UTIL)/uuid.c serverLog.o: ${UTIL}/serverLog.c - ${COMPILE} + $(AFS_CCRULE) $(UTIL)/serverLog.c fileutil.o: ${UTIL}/fileutil.c - ${COMPILE} + $(AFS_CCRULE) $(UTIL)/fileutil.c volparse.o: ${UTIL}/volparse.c - ${COMPILE} + $(AFS_CCRULE) $(UTIL)/volparse.c flipbase64.o: ${UTIL}/flipbase64.c - ${COMPILE} + $(AFS_CCRULE) $(UTIL)/flipbase64.c netutils.o: ${UTIL}/netutils.c - ${COMPILE} -I../util + $(AFS_CCRULE) -I../util $(UTIL)/netutils.c dirpath.o: ${UTIL}/dirpath.c - ${COMPILE} + $(AFS_CCRULE) $(UTIL)/dirpath.c softsig.o: ${UTIL}/softsig.c - ${COMPILE} + $(AFS_CCRULE) $(UTIL)/softsig.c lock.o: ${LWP}/lock.c - ${COMPILE} + $(AFS_CCRULE) $(LWP)/lock.c threadname.o: ${LWP}/threadname.c - ${COMPILE} + $(AFS_CCRULE) $(LWP)/threadname.c aclprocs.o: ${LIBACL}/aclprocs.c - ${COMPILE} + $(AFS_CCRULE) $(LIBACL)/aclprocs.c netprocs.o: ${LIBACL}/netprocs.c - ${COMPILE} + $(AFS_CCRULE) $(LIBACL)/netprocs.c vlserver.h vl_errors.c: ${VLSERVER}/vl_errors.et ${VLSERVER}/vlserver.p.h $(RM) -f vlserver.h vl_errors.c; ${COMPILE_ET} -p ${VLSERVER} vl_errors -h vlserver -vl_errors.o: vl_errors.c - ${COMPILE} +vldbint.cs.o: ../vlserver/vldbint.cs.c + $(AFS_CCRULE) -I$(VLSERVER) ../vlserver/vldbint.cs.c -vldbint.cs.o: ${VLSERVER}/vldbint.cs.c - ${COMPILE} - -vldbint.xdr.o: ${VLSERVER}/vldbint.xdr.c - ${COMPILE} +vldbint.xdr.o: ../vlserver/vldbint.xdr.c + $(AFS_CCRULE) -I$(VLSERVER) ../vlserver/vldbint.xdr.c buffer.o: ${DIR}/buffer.c - ${COMPILE} + $(AFS_CCRULE) $(DIR)/buffer.c dir.o: ${DIR}/dir.c - ${COMPILE} + $(AFS_CCRULE) $(DIR)/dir.c salvage.o: ${DIR}/salvage.c - ${COMPILE} + $(AFS_CCRULE) $(DIR)/salvage.c vnode.o: ${VOL}/vnode.c - ${COMPILE} + $(AFS_CCRULE) $(VOL)/vnode.c volume.o: ${VOL}/volume.c - ${COMPILE} + $(AFS_CCRULE) $(VOL)/volume.c vutil.o: ${VOL}/vutil.c - ${COMPILE} + $(AFS_CCRULE) $(VOL)/vutil.c partition.o: ${VOL}/partition.c - ${COMPILE} + $(AFS_CCRULE) $(VOL)/partition.c nuke.o: ${VOL}/nuke.c - ${COMPILE} + $(AFS_CCRULE) $(VOL)/nuke.c fssync-client.o: ${VOL}/fssync-client.c - ${COMPILE} + $(AFS_CCRULE) $(VOL)/fssync-client.c salvsync-client.o: ${VOL}/salvsync-client.c - ${COMPILE} + $(AFS_CCRULE) $(VOL)/salvsync-client.c daemon_com.o: ${VOL}/daemon_com.c - ${COMPILE} + $(AFS_CCRULE) $(VOL)/daemon_com.c purge.o: ${VOL}/purge.c - ${COMPILE} + $(AFS_CCRULE) $(VOL)/purge.c clone.o: ${VOL}/clone.c - ${COMPILE} + $(AFS_CCRULE) $(VOL)/clone.c devname.o: ${VOL}/devname.c - ${COMPILE} + $(AFS_CCRULE) $(VOL)/devname.c common.o: ${VOL}/common.c - ${COMPILE} + $(AFS_CCRULE) $(VOL)/common.c vscommon.o: ${VOLSER}/common.c - ${COMPILE} -o vscommon.o + $(AFS_CCRULE) $(VOLSER)/common.c listinodes.o: ${VOL}/listinodes.c - ${COMPILE} + $(AFS_CCRULE) $(VOL)/listinodes.c ihandle.o: ${VOL}/ihandle.c - ${COMPILE} + $(AFS_CCRULE) $(VOL)/ihandle.c namei_ops.o: ${VOL}/namei_ops.c - ${COMPILE} - -afsaux.o: ${FSINT}/afsaux.c - ${COMPILE} - -afscbint.cs.o: ${FSINT}/afscbint.cs.c - ${COMPILE} - -afscbint.ss.o: ${FSINT}/afscbint.ss.c - ${COMPILE} - -afsint.cs.o: ${FSINT}/afsint.cs.c - ${COMPILE} - -afsint.ss.o: ${FSINT}/afsint.ss.c - ${COMPILE} - -afsint.xdr.o: ${FSINT}/afsint.xdr.c - ${COMPILE} + $(AFS_CCRULE) $(VOL)/namei_ops.c davolserver: ${objects} ${LIBS} - ${CC} ${LDFLAGS} -o davolserver ${objects} ${LIBS} ${MT_LIBS} ${XLIBS} + $(AFS_LDRULE) ${objects} ${LIBS} ${MT_LIBS} ${XLIBS} install: davolserver ${INSTALL} -d ${DESTDIR}${afssrvlibexecdir} diff --git a/src/export/Makefile.in b/src/export/Makefile.in index 820d7077ca..c06fd38df1 100644 --- a/src/export/Makefile.in +++ b/src/export/Makefile.in @@ -7,6 +7,8 @@ srcdir=@srcdir@ include @TOP_OBJDIR@/src/config/Makefile.config +include @TOP_OBJDIR@/src/config/Makefile.lwp + INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -78,63 +80,82 @@ export64.ext.nonfs: export64.nonfs.o symtab64.o symtab.o symtab64.o: ${srcdir}/symtab.c case ${SYS_NAME} in \ rs_aix4* ) \ - ${CC} ${CFLAGS} -c ${srcdir}/symtab.c ;; \ + $(CC) $(AFS_CPPFLAGS) $(AFS_CFLAGS) -c ${srcdir}/symtab.c ;; \ rs_aix5* ) \ - ${CC} ${CFLAGS} -q64 -D__XCOFF64__ -DAFS_64BIT_KERNEL -DAFS_AIX51_ENV -c ${srcdir}/symtab.c ; \ + $(CC) $(AFS_CPPFLAGS) ${AFS_CFLAGS} -q64 -D__XCOFF64__ \ + -DAFS_64BIT_KERNEL -DAFS_AIX51_ENV \ + -c ${srcdir}/symtab.c ; \ mv symtab.o symtab64.o ; \ - ${CC} ${CFLAGS} -DAFS_AIX51_ENV -c ${srcdir}/symtab.c ;; \ + $(CC) $(AFS_CPPFLAGS) $(AFS_CFLAGS) -DAFS_AIX51_ENV \ + -c ${srcdir}/symtab.c ;; \ rs_aix6* ) \ - ${CC} ${CFLAGS} -q64 -D__XCOFF64__ -DAFS_64BIT_KERNEL -DAFS_AIX51_ENV -c ${srcdir}/symtab.c ; \ + $(CC) $(AFS_CPPFLAGS) $(AFS_CFLAGS) -q64 -D__XCOFF64__ \ + -DAFS_64BIT_KERNEL -DAFS_AIX51_ENV \ + -c ${srcdir}/symtab.c ; \ mv symtab.o symtab64.o ;; \ esac export.o export64.o: ${srcdir}/export.c case ${SYS_NAME} in \ rs_aix4* ) \ - ${CC} ${CFLAGS} -c ${srcdir}/export.c ;; \ + $(CC) $(AFS_CPPFLAGS) $(AFS_CFLAGS) -c ${srcdir}/export.c ;; \ rs_aix5* ) \ - ${CC} ${CFLAGS} -q64 -D__XCOFF64__ -DAFS_64BIT_KERNEL -DAFS_AIX51_ENV -c ${srcdir}/export.c ; \ + $(CC) $(AFS_CPPFLAGS) $(AFS_CFLAGS) -q64 -D__XCOFF64__ \ + -DAFS_64BIT_KERNEL -DAFS_AIX51_ENV \ + -c ${srcdir}/export.c ; \ mv export.o export64.o ; \ - ${CC} ${CFLAGS} -DAFS_AIX51_ENV -c ${srcdir}/export.c ;; \ + $(CC) $(AFS_CPPFLAGS) $(AFS_CFLAGS) -DAFS_AIX51_ENV \ + -c ${srcdir}/export.c ;; \ rs_aix6* ) \ - ${CC} ${CFLAGS} -q64 -D__XCOFF64__ -DAFS_64BIT_KERNEL -DAFS_AIX51_ENV -c ${srcdir}/export.c ; \ + $(CC) $(AFS_CPPFLAGS) $(AFS_CFLAGS) -q64 \ + -D__XCOFF64__ -DAFS_64BIT_KERNEL -DAFS_AIX51_ENV \ + -c ${srcdir}/export.c ; \ mv export.o export64.o ;; \ esac export.nonfs.o export64.nonfs.o: ${srcdir}/export.c case ${SYS_NAME} in \ rs_aix4* ) \ - ${CC} ${INCS} -DAFS_NONFSTRANS -c ${srcdir}/export.c ; \ + $(CC) $(CPPFLAGS) $(CFLAGS) ${INCS} -DAFS_NONFSTRANS \ + -c ${srcdir}/export.c ; \ mv export.o export.nonfs.o ;; \ rs_aix5* ) \ - ${CC} -q64 ${INCS} -D__XCOFF64__ -DAFS_64BIT_KERNEL -DAFS_NONFSTRANS -DAFS_AIX51_ENV -c ${srcdir}/export.c ; \ + $(CC) $(CPPFLAGS) $(CFLAGS) -q64 ${INCS} -D__XCOFF64__ \ + -DAFS_64BIT_KERNEL -DAFS_NONFSTRANS -DAFS_AIX51_ENV \ + -c ${srcdir}/export.c ; \ mv export.o export64.nonfs.o ; \ - ${CC} ${INCS} -DAFS_NONFSTRANS -DAFS_AIX51_ENV -c ${srcdir}/export.c ; \ + $(CC) $(CPPFLAGS) $(CFLAGS) ${INCS} -DAFS_NONFSTRANS \ + -DAFS_AIX51_ENV -c ${srcdir}/export.c ; \ mv export.o export.nonfs.o ;; \ rs_aix6* ) \ - ${CC} -q64 ${INCS} -D__XCOFF64__ -DAFS_64BIT_KERNEL -DAFS_NONFSTRANS -DAFS_AIX51_ENV -c ${srcdir}/export.c ; \ + $(CC) $(CPPFLAGS) $(CFLAGS) -q64 ${INCS} -D__XCOFF64__ \ + -DAFS_64BIT_KERNEL -DAFS_NONFSTRANS -DAFS_AIX51_ENV \ + -c ${srcdir}/export.c ; \ mv export.o export64.nonfs.o ;; \ esac cfgexport: cfgexport.o - ${CC} -g ${INCS} -o cfgexport cfgexport.o + $(CC) $(LDFLAGS) -g ${INCS} -o cfgexport cfgexport.o cfgexport64: cfgexport64.o - ${CC} -g ${INCS} -q64 -o cfgexport64 cfgexport64.o + $(CC) $(LDFLAGS) -g ${INCS} -q64 -o cfgexport64 cfgexport64.o cfgafs: cfgafs.o - ${CC} ${INCS} -o cfgafs cfgafs.o + $(CC) $(LDFLAGS) ${INCS} -o cfgafs cfgafs.o cfgafs64: cfgafs64.o - ${CC} -g ${INCS} -q64 -o cfgafs64 cfgafs64.o + $(CC) $(LDFLAGS) -g ${INCS} -q64 -o cfgafs64 cfgafs64.o +CFLAGS_cfgexport64.o = -g -q64 -D__XCOFF64__ cfgexport64.o: ${srcdir}/cfgexport.c AFS_component_version_number.c - ${CC} -g -q64 ${CFLAGS} -D__XCOFF64__ -c ${srcdir}/cfgexport.c -o cfgexport64.o + $(AFS_CCRULE) $(srcdir)/cfgexport.c cfgexport.o: ${srcdir}/cfgexport.c AFS_component_version_number.c cfgafs.o: ${srcdir}/cfgafs.c AFS_component_version_number.c + +CFLAGS_cfgafs64.o = -q64 cfgafs64.o: ${srcdir}/cfgafs.c AFS_component_version_number.c - ${CC} -q64 ${CFLAGS} -c ${srcdir}/cfgafs.c -o cfgafs64.o + $(AFS_CCRULE) $(srcdir)/cfgafs.c clean: $(RM) -f *.o *.Zlst *.map *.out AFS_component_version_number.c diff --git a/src/finale/Makefile.in b/src/finale/Makefile.in index 176095e958..474789a522 100644 --- a/src/finale/Makefile.in +++ b/src/finale/Makefile.in @@ -7,6 +7,8 @@ srcdir=@srcdir@ include @TOP_OBJDIR@/src/config/Makefile.config +include @TOP_OBJDIR@/src/config/Makefile.lwp + INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -47,7 +49,7 @@ LIBS=${TOP_LIBDIR}/libubik.a \ all: translate_et translate_et: translate_et.o ${INCLS} - ${CC} ${LDFLAGS} -o translate_et translate_et.o ${LIBS} + $(AFS_LDRULE) translate_et.o ${LIBS} translate_et.o: AFS_component_version_number.c diff --git a/src/fsint/Makefile.in b/src/fsint/Makefile.in index 8dd4a673ad..9f52d69825 100644 --- a/src/fsint/Makefile.in +++ b/src/fsint/Makefile.in @@ -7,6 +7,8 @@ srcdir=@srcdir@ include @TOP_OBJDIR@/src/config/Makefile.config +include @TOP_OBJDIR@/src/config/Makefile.lwp + INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -115,8 +117,6 @@ afsint.h: common.xg afsint.xg afscbint.h: common.xg afscbint.xg ${RXGEN} -A -x -h -o afscbint.h ${srcdir}/afscbint.xg -afsint.xdr.o: afsint.xdr.c - # # Installation targets # diff --git a/src/fsprobe/Makefile.in b/src/fsprobe/Makefile.in index 040d8b9823..d36ef53e8b 100644 --- a/src/fsprobe/Makefile.in +++ b/src/fsprobe/Makefile.in @@ -7,6 +7,8 @@ srcdir=@srcdir@ include @TOP_OBJDIR@/src/config/Makefile.config +include @TOP_OBJDIR@/src/config/Makefile.lwp + INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -50,8 +52,7 @@ fsprobe.o: fsprobe.c ${INCLS} AFS_component_version_number.c fsprobe_callback.o: fsprobe_callback.c ${INCLS} fsprobe_test: fsprobe_test.o libfsprobe.a ${LIBS} - ${CC} ${CFLAGS} -o fsprobe_test fsprobe_test.o libfsprobe.a \ - ${LIBS} ${XLIBS} + $(AFS_LDRULE) fsprobe_test.o libfsprobe.a ${LIBS} ${XLIBS} # # Install targets diff --git a/src/gtx/Makefile.in b/src/gtx/Makefile.in index 8762a946b6..2c2e92d054 100644 --- a/src/gtx/Makefile.in +++ b/src/gtx/Makefile.in @@ -9,6 +9,8 @@ srcdir=@srcdir@ include @TOP_OBJDIR@/src/config/Makefile.config +include @TOP_OBJDIR@/src/config/Makefile.lwp + INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -161,27 +163,28 @@ textcb.o: textcb.c ${INCLS} curses_test.o: curses_test.c ${INCLS} AFS_component_version_number.o curses_test: curses_test.o $(LIBS) - ${CC} ${CFLAGS} -o curses_test curses_test.o $(LIBS) ${EXTRA_LIBS} + $(AFS_LDRULE) curses_test.o $(LIBS) ${EXTRA_LIBS} screen_test.o: screen_test.c ${INCLS} AFS_component_version_number.o screen_test: screen_test.o ${WINDOW_OBJS} ${LIBS} - ${CC} ${CFLAGS} -o screen_test screen_test.o ${WINDOW_OBJS} ${LIBS} ${EXTRA_LIBS} + $(AFS_LDRULE) screen_test.o ${WINDOW_OBJS} ${LIBS} ${EXTRA_LIBS} cb_test.o: cb_test.c ${INCLS} AFS_component_version_number.o cb_test: cb_test.o ${CB_OBJS} ${LIBS} - ${CC} ${CFLAGS} -o cb_test cb_test.o ${CB_OBJS} ${LIBS} ${EXTRA_LIBS} + $(AFS_LDRULE) cb_test.o ${CB_OBJS} ${LIBS} ${EXTRA_LIBS} gtxtest.o: gtxtest.c ${INCLS} AFS_component_version_number.o gtxtest: gtxtest.o libgtx.a ${LIBS} - ${CC} ${LDFLAGS} -o gtxtest gtxtest.o libgtx.a ${LIBS} ${EXTRA_LIBS} + $(AFS_LDRULE) gtxtest.o libgtx.a ${LIBS} ${EXTRA_LIBS} object_test.o: object_test.c ${INCLS} AFS_component_version_number.o object_test: object_test.o ${WINDOW_OBJS} ${DICT_OBJS} ${OBJECT_OBJS} ${CB_OBJS} ${LIBS} - ${CC} ${CFLAGS} -o object_test object_test.o ${WINDOW_OBJS} ${DICT_OBJS} ${OBJECT_OBJS} ${CB_OBJS} ${LIBS} ${EXTRA_LIBS} + $(AFS_LDRULE) object_test.o ${WINDOW_OBJS} ${DICT_OBJS} \ + ${OBJECT_OBJS} ${CB_OBJS} ${LIBS} ${EXTRA_LIBS} # # Installation targets diff --git a/src/kauth/Makefile.in b/src/kauth/Makefile.in index 414b70b5f1..ea4dadc385 100644 --- a/src/kauth/Makefile.in +++ b/src/kauth/Makefile.in @@ -7,6 +7,8 @@ srcdir=@srcdir@ include @TOP_OBJDIR@/src/config/Makefile.config +include @TOP_OBJDIR@/src/config/Makefile.lwp + INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -89,7 +91,10 @@ test tests: all cd test; $(MAKE) kaserver: kautils.o kalocalcell.o kadatabase.o kaprocs.o kalog.o kauth.ss.o kauth.xdr.o kaserver.o kaaux.o krb_udp.o kaauxdb.o $(LIBS) - ${CC} ${LDFLAGS} -o kaserver kaserver.o kautils.o kalocalcell.o kadatabase.o krb_udp.o kaprocs.o kalog.o kauth.ss.o kauth.xdr.o kaaux.o kaauxdb.o $(LIBS) ${XLIBS} ${TOP_LIBDIR}/libaudit.a + $(AFS_LDRULE) kaserver.o kautils.o kalocalcell.o kadatabase.o \ + krb_udp.o kaprocs.o kalog.o kauth.ss.o kauth.xdr.o kaaux.o \ + kaauxdb.o \ + $(LIBS) ${XLIBS} ${TOP_LIBDIR}/libaudit.a kaserver.o: kaserver.c ${INCLS} AFS_component_version_number.o @@ -98,10 +103,8 @@ kautils.o: kautils.c ${INCLS} kalocalcell.o: kalocalcell.c ${INCLS} kadatabase.o: kadatabase.c ${INCLS} - ${CC} ${CFLAGS} -c ${srcdir}/kadatabase.c kaprocs.o: kaprocs.c ${INCLS} kaport.h - ${CC} ${CFLAGS} -c ${srcdir}/kaprocs.c authclient.o: authclient.c ${INCLS} @@ -157,87 +160,81 @@ libkauth.krb.a: $(KOBJS) AFS_component_version_number.o $(RANLIB) $@ read_passwd.o: read_passwd.c - ${CC} ${CFLAGS} -c read_passwd.c katoken.o: katoken.c ${INCLS} client.o: client.c ${INCLS} AFS_component_version_number.o kas.o: kas.c ${INCLS} AFS_component_version_number.o - $(CC) $(CFLAGS) -c ${srcdir}/kas.c +CFLAGS_admin_tools.o= @CFLAGS_NOERROR@ admin_tools.o: admin_tools.c ${INCLS} kaport.h - $(CC) $(CFLAGS) @CFLAGS_NOERROR@ -c ${srcdir}/admin_tools.c kkids.o: kkids.c ${INCLS} krb_tf.o: krb_tf.c ${INCLS} kas: kauth.h kautils.h admin_tools.o libkauth.a $(LIBS) kas.o kkids.o - ${CC} ${LDFLAGS} -o kas kas.o admin_tools.o kkids.o libkauth.a \ - ${LIBS} ${XLIBS} + $(AFS_LDRULE) kas.o admin_tools.o kkids.o libkauth.a ${LIBS} ${XLIBS} klog: AFS_component_version_number.o kauth.h kautils.h libkauth.a $(LIBS) \ klog.o - ${CC} ${LDFLAGS} -o klog klog.o libkauth.a ${LIBS} ${XLIBS} + $(AFS_LDRULE) klog.o libkauth.a ${LIBS} ${XLIBS} klog.o: klog.c kauth.h kautils.h AFS_component_version_number.o klog.krb: kauth.h kautils.h libkauth.krb.a $(KLIBS) klog.o - ${CC} ${LDFLAGS} -o klog.krb klog.o libkauth.krb.a ${KLIBS} ${XLIBS} + $(AFS_LDRULE) klog.o libkauth.krb.a ${KLIBS} ${XLIBS} knfs: kauth.h kautils.h libkauth.a $(LIBS) knfs.o - ${CC} ${LDFLAGS} -o knfs knfs.o libkauth.a ${LIBS} ${XLIBS} + $(AFS_LDRULE) knfs.o libkauth.a ${LIBS} ${XLIBS} knfs.o: knfs.c AFS_component_version_number.o +CFLAGS_klogin.o = -DKAUTH klogin.o: klogin.c ${INCLS} AFS_component_version_number.o - ${CC} ${CFLAGS} -c ${srcdir}/klogin.c -DKAUTH klogin: libkauth.a $(LIBS) klogin.o - ${CC} ${LDFLAGS} -o klogin klogin.o libkauth.a ${LIBS} ${XLIBS} + $(AFS_LDRULE) klogin.o libkauth.a ${LIBS} ${XLIBS} klogin.krb: libkauth.a $(KLIBS) klogin.o - ${CC} ${LDFLAGS} -o klogin.krb klogin.o libkauth.krb.a ${KLIBS} ${XLIBS} + $(AFS_LDRULE) klogin.o libkauth.krb.a ${KLIBS} ${XLIBS} kpasswd.o: kauth.h kautils.h ${INCLS} kpasswd.c AFS_component_version_number.o - ${CC} ${CFLAGS} -c ${srcdir}/kpasswd.c kpasswd: kauth.h kautils.h libkauth.a $(LIBS) kpasswd.o kkids.o - ${CC} ${LDFLAGS} -o kpasswd kpasswd.o kkids.o libkauth.a ${LIBS} ${XLIBS} + $(AFS_LDRULE) kpasswd.o kkids.o libkauth.a ${LIBS} ${XLIBS} kpwvalid.o: kpwvalid.c AFS_component_version_number.o - ${CC} ${CFLAGS} -c ${srcdir}/kpwvalid.c kpwvalid: kpwvalid.o $(LIBS) - ${CC} ${LDFLAGS} -o kpwvalid kpwvalid.o ${LIBS} ${XLIBS} + $(AFS_LDRULE) kpwvalid.o ${LIBS} ${XLIBS} +CFLAGS_user.krb.o = -DAFS_KERBEROS_ENV user.krb.o: user.c ${INCLS} ${TOP_INCDIR}/afs/vice.h - ${CCOBJ} ${CFLAGS} -DAFS_KERBEROS_ENV -c ${srcdir}/user.c -o user.krb.o + $(AFS_CCRULE) $(srcdir)/user.c user.o: user.c ${INCLS} ${TOP_INCDIR}/afs/vice.h - ${CCOBJ} ${CFLAGS} -c ${srcdir}/user.c kdb: kdb.o ${INCLS} ${LIBS} libkauth.a - ${CC} ${LDFLAGS} -o kdb kdb.o libkauth.a ${LIBS} ${XLIBS} + $(AFS_LDRULE) kdb.o libkauth.a ${LIBS} ${XLIBS} kdb.o: kdb.c AFS_component_version_number.o krb_udp.o: krb_udp.c kaserver.h kautils.h kauth.h prot.h ${TOP_INCDIR}/lwp.h AFS_component_version_number.o - $(CC) $(CFLAGS) -c ${srcdir}/krb_udp.c krb_udp: krb_udp.o libkauth.a $(KLIBS) - ${CC} ${LDFLAGS} -o krb_udp krb_udp.o libkauth.a $(KLIBS) + $(AFS_LDRULE) krb_udp.o libkauth.a $(KLIBS) ka-forwarder.o: ka-forwarder.c ka-forwarder: ka-forwarder.o - ${CC} -o $@ ${CFLAGS} ka-forwarder.o ${LIBS} ${XLIBS} + $(AFS_LDRULE) ka-forwarder.o ${LIBS} ${XLIBS} rebuild.o: rebuild.c $(INCLS) AFS_component_version_number.o rebuild: rebuild.o kautils.o $(LIBS) - ${CC} ${LDFLAGS} -o rebuild rebuild.o kautils.o $(LIBS) ${XLIBS} + $(AFS_LDRULE) rebuild.o kautils.o $(LIBS) ${XLIBS} # # Install targets diff --git a/src/kauth/test/Makefile.in b/src/kauth/test/Makefile.in index 917136ec06..c9a397ab0c 100644 --- a/src/kauth/test/Makefile.in +++ b/src/kauth/test/Makefile.in @@ -16,9 +16,6 @@ INCDIRS= -I${DESTDIR}/include -I.. LDIRS= -L${DESTDIR}/lib -L${DESTDIR}/lib/afs -L.. LIBS= -llwp -ldes -lrxkad -lauth -lcmd -lubik -lprot -lsys -lrx -lcom_err -lkauth -CFLAGS = ${OPTIMIZE} ${INCDIRS} ${LDIRS} ${LIBS} ${XCFLAGS} ${ARCHFLAGS} - - # the only tests _known_ to work are multiklog and the tcl scripts. all test tests: multiklog @@ -30,28 +27,29 @@ clean: $(RM) -f *.o core multiklog: multiklog.o - cc -o multiklog ${CFLAGS} multiklog.o -lafsutil + $(AFS_LDRULE) multiklog.o ${LDIRS} ${LIBS} -lafsutil test_date: ../kautils.o test_date.o ${utilib} - cc -o test_date ${CFLAGS} test_date.o ../kautils.o -lafsutil + $(AFS_LDRULE) test_date.o ../kautils.o ${LDIRS} ${LIBS} -lafsutil test_badtix: test_badtix.o - cc -o test_badtix ${CFLAGS} test_badtix.o + $(AFS_LDRULE) test_badtix.o ${LDIRS} ${LIBS} decode_ticket: decode_ticket.o - cc -o decode_ticket ${CFLAGS} decode_ticket.o + $(AFS_LDRULE) decode_ticket.o ${LDIRS} ${LIBS} test_interim_ktc: test_interim_ktc.o - cc -o test_interim_ktc ${CFLAGS} test_interim_ktc.o + $(AFS_LDRULE) test_interim_ktc.o ${LDIRS} ${LIBS} test_rxkad_free: test_rxkad_free.o - cc -o test_rxkad_free ${CFLAGS} test_rxkad_free.o + $(AFS_LDRULE) test_rxkad_free.o ${LDIRS} ${LIBS} test_getticket: test_getticket.o - cc -o test_getticket ${CFLAGS} test_getticket.o + $(AFS_LDRULE) test_getticket.o ${LDIRS} ${LIBS} background: background.c - cc -o background background.c + $(CC) $(AFS_CPPFLAGS) $(AFS_CFLAGS) $(AFS_LDFLAGS) \ + ${LDIRS} ${LIBS} -o background background.c # test_interim_ktc depends on normally running ka & pr servers. Also on # the current user having write access to the working directory. Also diff --git a/src/kopenafs/Makefile.in b/src/kopenafs/Makefile.in index 1ceadc05c9..35d6b74d82 100644 --- a/src/kopenafs/Makefile.in +++ b/src/kopenafs/Makefile.in @@ -9,6 +9,8 @@ srcdir=@srcdir@ include @TOP_OBJDIR@/src/config/Makefile.config +include @TOP_OBJDIR@/src/config/Makefile.shared + INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -19,9 +21,7 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ MAJOR = 1 MINOR = 1 -CC = ${MT_CC} -INCLUDES = -I. -I${srcdir} -I../sys -CFLAGS = ${COMMON_CFLAGS} ${INCLUDES} ${MT_CFLAGS} ${SHLIB_CFLAGS} +MODULE_INCLUDE = -I. -I${srcdir} -I../sys SFLAGS = -I${TOP_INCDIR} SYS = ${srcdir}/../sys @@ -44,20 +44,21 @@ ${TOP_INCDIR}/kopenafs.h: kopenafs.h ${INSTALL_DATA} $? $@ glue.o: ${SYS}/glue.c ${SYS}/afssyscalls.h - ${CCOBJ} ${CFLAGS} -c ${SYS}/glue.c + $(AFS_CCRULE) $(SYS)/glue.c pioctl.o: ${SYS}/pioctl.c ${SYS}/afssyscalls.h - ${CCOBJ} ${CFLAGS} -c ${SYS}/pioctl.c + $(AFS_CCRULE) $(SYS)/pioctl.c setpag.o: ${SYS}/setpag.c ${SYS}/afssyscalls.h - ${CCOBJ} ${CFLAGS} -c ${SYS}/setpag.c + $(AFS_CCRULE) $(SYS)/setpag.c # This file is only actually used on SGI and AIX, but some systems can't cope # with an empty .o file being included in a link. + syscall.o: ${SYS}/syscall.s @set -e; set -x; case "$(SYS_NAME)" in \ sgi_*) \ - ${CC} ${CFLAGS} -c ${SYS}/syscall.s; \ + $(AFS_CCRULE) ${SYS}/syscall.s; \ ;; \ rs_aix* | hp_ux10*) \ $(PATH_CPP) -P ${SFLAGS} ${SYS}/syscall.s > syscall.ss; \ @@ -94,10 +95,10 @@ ${LIBKOPENAFS}: ${LIBOBJS} syscall.o libkopenafs.map esac test-unlog: test-unlog.o libkopenafs.a - ${CC} -o test-unlog test-unlog.o libkopenafs.a ${XLIBS} ${CFLAGS} + $(AFS_LDRULE) test-unlog.o libkopenafs.a ${XLIBS} test-setpag: test-setpag.o libkopenafs.a - ${CC} -o test-setpag test-setpag.o libkopenafs.a ${XLIBS} ${CFLAGS} + $(AFS_LDRULE) test-setpag.o libkopenafs.a ${XLIBS} # # Installation targets diff --git a/src/libacl/Makefile.in b/src/libacl/Makefile.in index f0caca29ec..3b4655e285 100644 --- a/src/libacl/Makefile.in +++ b/src/libacl/Makefile.in @@ -7,6 +7,8 @@ srcdir=@srcdir@ include @TOP_OBJDIR@/src/config/Makefile.config +include @TOP_OBJDIR@/src/config/Makefile.lwp + INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ diff --git a/src/libacl/test/Makefile.in b/src/libacl/test/Makefile.in index 4532d7ca5c..e918db0bba 100644 --- a/src/libacl/test/Makefile.in +++ b/src/libacl/test/Makefile.in @@ -7,17 +7,16 @@ srcdir=@srcdir@ include @TOP_OBJDIR@/src/config/Makefile.config +include @TOP_OBJDIR@/src/config/Makefile.lwp + INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ -INCDIRS=-I${TOP_INCDIR} -I.. LDIRS=-L${TOP_LIBDIR} -L${DESTDIR}/lib/afs -L.. LIBS= -lacl -lprot -lubik -lrx -llwp -lauth -lrxkad -lsys ${XLIBS} -CFLAGS = ${OPTIMIZE} ${INCDIRS} ${LDIRS} ${LIBS} ${XCFLAGS} ${ARCHFLAGS} - all: acltest install: @@ -26,7 +25,7 @@ install: # Build targets # acltest: acltest.o - $(CC) -o acltest acltest.o $(CFLAGS) + $(AFS_LDRULE) $(LDIRS) $(LIBS) acltest.o acltest.o: acltest.c diff --git a/src/libadmin/Makefile.in b/src/libadmin/Makefile.in index e6d9b2941b..2461418107 100644 --- a/src/libadmin/Makefile.in +++ b/src/libadmin/Makefile.in @@ -7,6 +7,8 @@ srcdir=@srcdir@ include @TOP_OBJDIR@/src/config/Makefile.config +include @TOP_OBJDIR@/src/config/Makefile.pthread + INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ diff --git a/src/libadmin/adminutil/Makefile.in b/src/libadmin/adminutil/Makefile.in index 5ff2d0fec6..9c496168d8 100644 --- a/src/libadmin/adminutil/Makefile.in +++ b/src/libadmin/adminutil/Makefile.in @@ -7,14 +7,13 @@ srcdir=@srcdir@ include @TOP_OBJDIR@/src/config/Makefile.config +include @TOP_OBJDIR@/src/config/Makefile.pthread + INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ -CC = ${MT_CC} -CFLAGS=${COMMON_CFLAGS} ${MT_CFLAGS} -CCRULE = ${CC} ${CFLAGS} -c $? RXKAD = ../../rxkad AUTH = ../../auth BOZO = ../../bozo @@ -125,34 +124,34 @@ libafsadminutil.a: ${LIBOBJS} afs_utilAdmin.o: afs_utilAdmin.h ktc_errors.o: ${AUTH}/ktc_errors.c - ${CCRULE} + $(AFS_CCRULE) $(AUTH)/ktc_errors.c acfg_errors.o: ${AUTH}/acfg_errors.c - ${CCRULE} + $(AFS_CCRULE) $(AUTH)/acfg_errors.c boserr.o: ${BOZO}/boserr.c - ${CCRULE} + $(AFS_CCRULE) $(BOZO)/boserr.c cmd_errors.o: ${CMD}/cmd_errors.c - ${CCRULE} + $(AFS_CCRULE) $(CMD)/cmd_errors.c kaerrors.o: ${KAUTH}/kaerrors.c - ${CCRULE} + $(AFS_CCRULE) $(KAUTH)/kaerrors.c pterror.o: ${PTSERVER}/pterror.c - ${CCRULE} + $(AFS_CCRULE) $(PTSERVER)/pterror.c rxkad_errs.o: ${RXKAD}/rxkad_errs.c - ${CCRULE} + $(AFS_CCRULE) $(RXKAD)/rxkad_errs.c uerrors.o: ${UBIK}/uerrors.c - ${CCRULE} + $(AFS_CCRULE) $(UBIK)/uerrors.c vl_errors.o: ${VLSERVER}/vl_errors.c - ${CCRULE} + $(AFS_CCRULE) $(VLSERVER)/vl_errors.c volerr.o: ${VOLSER}/volerr.c - ${CCRULE} + $(AFS_CCRULE) $(VOLSER)/volerr.c clean: $(RM) -f *.o libafsadminutil* diff --git a/src/libadmin/bos/Makefile.in b/src/libadmin/bos/Makefile.in index e2e3336fc1..5d33340446 100644 --- a/src/libadmin/bos/Makefile.in +++ b/src/libadmin/bos/Makefile.in @@ -7,15 +7,13 @@ srcdir=@srcdir@ include @TOP_OBJDIR@/src/config/Makefile.config +include @TOP_OBJDIR@/src/config/Makefile.pthread + INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ -CC = ${MT_CC} -CFLAGS=${COMMON_CFLAGS} ${MT_CFLAGS} ${CFLAGS_NOERROR} -CCRULE = ${CC} ${CFLAGS} -c $? - BOZO = ../../bozo ADMINOBJS = afs_bosAdmin.o @@ -50,13 +48,12 @@ libbosadmin.a: ${LIBOBJS} ${RANLIB} $@ afs_bosAdmin.o: afs_bosAdmin.c afs_bosAdmin.h - $(CC) $(CFLAGS) -c ${srcdir}/afs_bosAdmin.c bosint.xdr.o: ${BOZO}/bosint.xdr.c - ${CCRULE} + $(AFS_CCRULE) $(BOZO)/bosint.xdr.c bosint.cs.o: ${BOZO}/bosint.cs.c - ${CCRULE} + $(AFS_CCRULE) $(BOZO)/bosint.cs.c clean: $(RM) -f *.o libbosadmin* diff --git a/src/libadmin/cfg/Makefile.in b/src/libadmin/cfg/Makefile.in index ddaf617286..f1f20ac0f1 100644 --- a/src/libadmin/cfg/Makefile.in +++ b/src/libadmin/cfg/Makefile.in @@ -7,14 +7,13 @@ srcdir=@srcdir@ include @TOP_OBJDIR@/src/config/Makefile.config +include @TOP_OBJDIR@/src/config/Makefile.pthread + INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ -CFLAGS=${COMMON_CFLAGS} ${MT_CFLAGS} -CCRULE = ${CC} ${CFLAGS} -c $? - UBIKOBJS=\ ubik_int.cs.o \ ubik_int.xdr.o @@ -58,10 +57,10 @@ libcfgadmin.a: ${LIBOBJS} UBIKDIR=../../ubik ubik_int.cs.o: ${UBIKDIR}/ubik_int.cs.c - ${CCRULE} + $(AFS_CCRULE) $(UBIKDIR)/ubik_int.cs.c ubik_int.xdr.o: ${UBIKDIR}/ubik_int.xdr.c - ${CCRULE} + $(AFS_CCRULE) $(UBIKDIR)/ubik_int.xdr.c ${CFGOBJS}: afs_cfgAdmin.h diff --git a/src/libadmin/cfg/test/Makefile.in b/src/libadmin/cfg/test/Makefile.in index e3437a7b89..d7e0bbfdfb 100644 --- a/src/libadmin/cfg/test/Makefile.in +++ b/src/libadmin/cfg/test/Makefile.in @@ -7,15 +7,13 @@ srcdir=@srcdir@ include @TOP_OBJDIR@/src/config/Makefile.config +include @TOP_OBJDIR@/src/config/Makefile.pthread + INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ -CC = ${MT_CC} -CFLAGS = ${DBG} ${OPTMZ} -DAFS_PTHREAD_ENV -I${SRCDIR}/include ${MT_CFLAGS} - - ######################################################################## # build tests @@ -32,7 +30,7 @@ CFGTESTLIBS =\ $(DESTDIR)/lib/afs/libcmd.a # static library cfgtest: cfgtest.o $(CFGTESTLIBS) - $(CC) $(CFLAGS) -o cfgtest cfgtest.o -LDEST/lib/afs $(CFGTESTLIBS) $(XLIBS) + $(AFS_LDRULE) cfgtest.o -LDEST/lib/afs $(CFGTESTLIBS) $(XLIBS) ####################################################################### test tests: cfgtest diff --git a/src/libadmin/client/Makefile.in b/src/libadmin/client/Makefile.in index 4fe5d2aa98..129f122448 100644 --- a/src/libadmin/client/Makefile.in +++ b/src/libadmin/client/Makefile.in @@ -7,14 +7,13 @@ srcdir=@srcdir@ include @TOP_OBJDIR@/src/config/Makefile.config +include @TOP_OBJDIR@/src/config/Makefile.pthread + INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ -CC = ${MT_CC} -CFLAGS=${COMMON_CFLAGS} ${MT_CFLAGS} - ADMINOBJS = afs_clientAdmin.o LIBOBJS = ${ADMINOBJS} diff --git a/src/libadmin/kas/Makefile.in b/src/libadmin/kas/Makefile.in index b1478e8b17..714c5ca79e 100644 --- a/src/libadmin/kas/Makefile.in +++ b/src/libadmin/kas/Makefile.in @@ -7,15 +7,13 @@ srcdir=@srcdir@ include @TOP_OBJDIR@/src/config/Makefile.config +include @TOP_OBJDIR@/src/config/Makefile.pthread + INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ -CC = ${MT_CC} -CFLAGS=${COMMON_CFLAGS} ${MT_CFLAGS} -CCRULE = ${CC} ${CFLAGS} -c $? - KAUTH= ${srcdir}/../../kauth ADMINOBJS = afs_kasAdmin.o @@ -52,17 +50,17 @@ libkasadmin.a: ${LIBOBJS} $(AR) crv $@ ${LIBOBJS} ${RANLIB} $@ +CFLAGS_afs_kasAdmin.o = @CFLAGS_NOERROR@ afs_kasAdmin.o: afs_kasAdmin.c afs_kasAdmin.h - $(CC) $(CFLAGS) @CFLAGS_NOERROR@ -c ${srcdir}/afs_kasAdmin.c kauth.cs.o: ../../kauth/kauth.cs.c - ${CCRULE} + $(AFS_CCRULE) ../../kauth/kauth.cs.c kauth.xdr.o: ../../kauth/kauth.xdr.c - ${CCRULE} + $(AFS_CCRULE) ../../kauth/kauth.xdr.c kaaux.o: ${KAUTH}/kaaux.c - ${CCRULE} + $(AFS_CCRULE) $(KAUTH)/kaaux.c clean: $(RM) -f *.o libkasadmin* diff --git a/src/libadmin/pts/Makefile.in b/src/libadmin/pts/Makefile.in index 34dfb7ba88..731e78b78b 100644 --- a/src/libadmin/pts/Makefile.in +++ b/src/libadmin/pts/Makefile.in @@ -7,15 +7,13 @@ srcdir=@srcdir@ include @TOP_OBJDIR@/src/config/Makefile.config +include @TOP_OBJDIR@/src/config/Makefile.pthread + INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ -CC = ${MT_CC} -CFLAGS=${COMMON_CFLAGS} ${MT_CFLAGS} -CCRULE = ${CC} ${CFLAGS} -c $? - PTSERVER = ../../ptserver ADMINOBJS = \ @@ -55,10 +53,10 @@ libptsadmin.a: ${LIBOBJS} afs_ptsAdmin.o: afs_ptsAdmin.h ptint.xdr.o: ${PTSERVER}/ptint.xdr.c - ${CCRULE} + $(AFS_CCRULE) ${PTSERVER}/ptint.xdr.c ptint.cs.o: ${PTSERVER}/ptint.cs.c - ${CCRULE} + $(AFS_CCRULE) $(PTSERVER)/ptint.cs.c clean: $(RM) -f *.o libptsadmin* diff --git a/src/libadmin/samples/Makefile.in b/src/libadmin/samples/Makefile.in index 44b9a7de56..66f83e2620 100644 --- a/src/libadmin/samples/Makefile.in +++ b/src/libadmin/samples/Makefile.in @@ -7,14 +7,13 @@ srcdir=@srcdir@ include @TOP_OBJDIR@/src/config/Makefile.config +include @TOP_OBJDIR@/src/config/Makefile.pthread + INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ -CC = ${MT_CC} -CFLAGS=${COMMON_CFLAGS} ${MT_CFLAGS} - SAMPLEPROGS=\ cm_client_config \ cm_list_cells \ @@ -50,76 +49,74 @@ SAMPLELIBS =\ all test tests: $(SAMPLEPROGS) cm_client_config: cm_client_config.o $(SAMPLELIBS) - $(CC) $(LDFLAGS) -o $@ $@.o $(SAMPLELIBS) $(MT_LIBS) $(XLIBS) + $(AFS_LDRULE) $@.o $(SAMPLELIBS) $(MT_LIBS) $(XLIBS) cm_list_cells: cm_list_cells.o $(SAMPLELIBS) - $(CC) $(LDFLAGS) -o $@ $@.o $(SAMPLELIBS) $(MT_LIBS) $(XLIBS) + $(AFS_LDRULE) $@.o $(SAMPLELIBS) $(MT_LIBS) $(XLIBS) cm_local_cell: cm_local_cell.o $(SAMPLELIBS) - $(CC) $(LDFLAGS) -o $@ $@.o $(SAMPLELIBS) $(MT_LIBS) $(XLIBS) + $(AFS_LDRULE) $@.o $(SAMPLELIBS) $(MT_LIBS) $(XLIBS) cm_server_prefs: cm_server_prefs.o $(SAMPLELIBS) - $(CC) $(LDFLAGS) -o $@ $@.o $(SAMPLELIBS) $(MT_LIBS) $(XLIBS) + $(AFS_LDRULE) $@.o $(SAMPLELIBS) $(MT_LIBS) $(XLIBS) rxdebug_basic_stats: rxdebug_basic_stats.o $(SAMPLELIBS) - $(CC) $(LDFLAGS) -o $@ $@.o $(SAMPLELIBS) $(MT_LIBS) $(XLIBS) + $(AFS_LDRULE) $@.o $(SAMPLELIBS) $(MT_LIBS) $(XLIBS) rxdebug_conns: rxdebug_conns.o $(SAMPLELIBS) - $(CC) $(LDFLAGS) -o $@ $@.o $(SAMPLELIBS) $(MT_LIBS) $(XLIBS) + $(AFS_LDRULE) $@.o $(SAMPLELIBS) $(MT_LIBS) $(XLIBS) rxdebug_peers: rxdebug_peers.o $(SAMPLELIBS) - $(CC) $(LDFLAGS) -o $@ $@.o $(SAMPLELIBS) $(MT_LIBS) $(XLIBS) + $(AFS_LDRULE) $@.o $(SAMPLELIBS) $(MT_LIBS) $(XLIBS) rxdebug_rx_stats: rxdebug_rx_stats.o $(SAMPLELIBS) - $(CC) $(LDFLAGS) -o $@ $@.o $(SAMPLELIBS) $(MT_LIBS) $(XLIBS) + $(AFS_LDRULE) $@.o $(SAMPLELIBS) $(MT_LIBS) $(XLIBS) rxdebug_supported_stats: rxdebug_supported_stats.o $(SAMPLELIBS) - $(CC) $(LDFLAGS) -o $@ $@.o $(SAMPLELIBS) $(MT_LIBS) $(XLIBS) + $(AFS_LDRULE) $@.o $(SAMPLELIBS) $(MT_LIBS) $(XLIBS) rxdebug_version: rxdebug_version.o $(SAMPLELIBS) - $(CC) $(LDFLAGS) -o $@ $@.o $(SAMPLELIBS) $(MT_LIBS) $(XLIBS) + $(AFS_LDRULE) $@.o $(SAMPLELIBS) $(MT_LIBS) $(XLIBS) rxstat_clear_peer: rxstat_clear_peer.o $(SAMPLELIBS) - $(CC) $(LDFLAGS) -o $@ $@.o $(SAMPLELIBS) $(MT_LIBS) $(XLIBS) + $(AFS_LDRULE) $@.o $(SAMPLELIBS) $(MT_LIBS) $(XLIBS) rxstat_clear_process: rxstat_clear_process.o $(SAMPLELIBS) - $(CC) $(LDFLAGS) -o $@ $@.o $(SAMPLELIBS) $(MT_LIBS) $(XLIBS) + $(AFS_LDRULE) $@.o $(SAMPLELIBS) $(MT_LIBS) $(XLIBS) rxstat_disable_peer: rxstat_disable_peer.o $(SAMPLELIBS) - $(CC) $(LDFLAGS) -o $@ $@.o $(SAMPLELIBS) $(MT_LIBS) $(XLIBS) + $(AFS_LDRULE) $@.o $(SAMPLELIBS) $(MT_LIBS) $(XLIBS) rxstat_disable_process: rxstat_disable_process.o $(SAMPLELIBS) - $(CC) $(LDFLAGS) -o $@ $@.o $(SAMPLELIBS) $(MT_LIBS) $(XLIBS) + $(AFS_LDRULE) $@.o $(SAMPLELIBS) $(MT_LIBS) $(XLIBS) rxstat_enable_peer: rxstat_enable_peer.o $(SAMPLELIBS) - $(CC) $(LDFLAGS) -o $@ $@.o $(SAMPLELIBS) $(MT_LIBS) $(XLIBS) + $(AFS_LDRULE) $@.o $(SAMPLELIBS) $(MT_LIBS) $(XLIBS) rxstat_enable_process: rxstat_enable_process.o $(SAMPLELIBS) - $(CC) $(LDFLAGS) -o $@ $@.o $(SAMPLELIBS) $(MT_LIBS) $(XLIBS) + $(AFS_LDRULE) $@.o $(SAMPLELIBS) $(MT_LIBS) $(XLIBS) rxstat_get_peer: rxstat_get_peer.o $(SAMPLELIBS) - $(CC) $(LDFLAGS) -o $@ $@.o $(SAMPLELIBS) $(MT_LIBS) $(XLIBS) + $(AFS_LDRULE) $@.o $(SAMPLELIBS) $(MT_LIBS) $(XLIBS) rxstat_get_process: rxstat_get_process.o $(SAMPLELIBS) - $(CC) $(LDFLAGS) -o $@ $@.o $(SAMPLELIBS) $(MT_LIBS) $(XLIBS) + $(AFS_LDRULE) $@.o $(SAMPLELIBS) $(MT_LIBS) $(XLIBS) rxstat_get_version: rxstat_get_version.o $(SAMPLELIBS) - $(CC) $(LDFLAGS) -o $@ $@.o $(SAMPLELIBS) $(MT_LIBS) $(XLIBS) + $(AFS_LDRULE) $@.o $(SAMPLELIBS) $(MT_LIBS) $(XLIBS) rxstat_query_peer: rxstat_query_peer.o $(SAMPLELIBS) - $(CC) $(LDFLAGS) -o $@ $@.o $(SAMPLELIBS) $(MT_LIBS) $(XLIBS) + $(AFS_LDRULE) $@.o $(SAMPLELIBS) $(MT_LIBS) $(XLIBS) rxstat_query_process: rxstat_query_process.o $(SAMPLELIBS) - $(CC) $(LDFLAGS) -o $@ $@.o $(SAMPLELIBS) $(MT_LIBS) $(XLIBS) + $(AFS_LDRULE) $@.o $(SAMPLELIBS) $(MT_LIBS) $(XLIBS) # # Errors # -rxstat_query_peer.o: rxstat_query_peer.c - $(CC) $(CFLAGS) @CFLAGS_NOERROR@ -c ${srcdir}/rxstat_query_peer.c -rxstat_query_process.o: rxstat_query_process.c - $(CC) $(CFLAGS) @CFLAGS_NOERROR@ -c ${srcdir}/rxstat_query_process.c +CFLAGS_rxstat_query_peer.o = @CFLAGS_NOERROR@ +CFLAGS_rxstat_query_process.o = @CFLAGS_NOERROR@ ####################################################################### install: diff --git a/src/libadmin/test/Makefile.in b/src/libadmin/test/Makefile.in index 5d671b9b38..40a0bb2651 100644 --- a/src/libadmin/test/Makefile.in +++ b/src/libadmin/test/Makefile.in @@ -7,14 +7,13 @@ srcdir=@srcdir@ include @TOP_OBJDIR@/src/config/Makefile.config +include @TOP_OBJDIR@/src/config/Makefile.pthread + INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ -CC = ${MT_CC} -CFLAGS = ${COMMON_CFLAGS} ${MT_CFLAGS} - ######################################################################## # build tests @@ -40,12 +39,10 @@ AFSCPOBJS =\ all test tests: afscp -client.o: client.c - $(CC) $(CFLAGS) @CFLAGS_NOERROR@ -c ${srcdir}/client.c +CFLAGS_client.o = @CFLAGS_NOERROR@ afscp: afscp.o $(AFSCPOBJS) $(AFSCPLIBS) - $(CC) $(CFLAGS) -o afscp afscp.o $(AFSCPOBJS) \ - -L${TOP_LIBDIR} $(AFSCPLIBS) ${MT_LIBS} $(XLIBS) + $(AFS_LDRULE) afscp.o $(AFSCPOBJS) $(AFSCPLIBS) ${MT_LIBS} $(XLIBS) ####################################################################### install: diff --git a/src/libadmin/vos/Makefile.in b/src/libadmin/vos/Makefile.in index 780defa8a7..77db7662c9 100644 --- a/src/libadmin/vos/Makefile.in +++ b/src/libadmin/vos/Makefile.in @@ -7,15 +7,13 @@ srcdir=@srcdir@ include @TOP_OBJDIR@/src/config/Makefile.config +include @TOP_OBJDIR@/src/config/Makefile.pthread + INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ -CC = ${MT_CC} -CFLAGS=${COMMON_CFLAGS} ${MT_CFLAGS} -CCRULE = ${CC} ${CFLAGS} -c $? - VLSERVER = ../../vlserver VOLSER = ../../volser FSINT = ../../fsint @@ -70,22 +68,22 @@ libvosadmin.a: ${LIBOBJS} afs_vosAdmin.o: afs_vosAdmin.h vldbint.cs.o: ${VLSERVER}/vldbint.cs.c - ${CCRULE} + $(AFS_CCRULE) $(VLSERVER)/vldbint.cs.c vldbint.xdr.o: ${VLSERVER}/vldbint.xdr.c - ${CCRULE} + $(AFS_CCRULE) $(VLSERVER)/vldbint.xdr.c volint.xdr.o: ${VOLSER}/volint.xdr.c - ${CCRULE} + $(AFS_CCRULE) $(VOLSER)/volint.xdr.c volint.cs.o: ${VOLSER}/volint.cs.c - ${CCRULE} + $(AFS_CCRULE) $(VOLSER)/volint.cs.c afscbint.xdr.o: ${FSINT}/afscbint.xdr.c - ${CCRULE} + $(AFS_CCRULE) $(FSINT)/afscbint.xdr.c afsint.xdr.o: ${FSINT}/afsint.xdr.c - ${CCRULE} + $(AFS_CCRULE) $(FSINT)/afsint.xdr.c clean: $(RM) -f *.o libvosadmin* diff --git a/src/libafsauthent/Makefile.in b/src/libafsauthent/Makefile.in index 7e1845656f..9acec36ddc 100644 --- a/src/libafsauthent/Makefile.in +++ b/src/libafsauthent/Makefile.in @@ -9,23 +9,21 @@ srcdir=@srcdir@ include @TOP_OBJDIR@/src/config/Makefile.config +include @TOP_OBJDIR@/src/config/Makefile.pthread + INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ -CC=${MT_CC} -CFLAGS=${COMMON_CFLAGS} ${MT_CFLAGS} -CCRULE = ${CC} ${CFLAGS} -c $? - -AUDIT= ../audit -AUTH = ../auth -KAUTH = ../kauth -UBIK = ../ubik -UTIL = ../util -RXKAD = ../rxkad -PTSERVER = ../ptserver -SYS = ../sys +AUDIT= $(srcdir)/../audit +AUTH = $(srcdir)/../auth +KAUTH =$(srcdir)/../kauth +UBIK = $(srcdir)/../ubik +UTIL = $(srcdir)/../util +RXKAD = $(srcdir)/../rxkad +PTSERVER = $(srcdir)/../ptserver +SYS = $(srcdir)/../sys AUDITOBJS = audit.o audit-file.o audit-sysvmq.o @@ -112,118 +110,119 @@ libafsauthent.a: ${LIBOBJS} $(RANLIB) $@ audit.o: ${AUDIT}/audit.c - ${CCRULE} + ${AFS_CCRULE} ${AUDIT}/audit.c audit-file.o: ${AUDIT}/audit-file.c - ${CCRULE} + ${AFS_CCRULE} ${AUDIT}/audit-file.c audit-sysvmq.o: ${AUDIT}/audit-sysvmq.c - ${CCRULE} + ${AFS_CCRULE} ${AUDIT}/audit-sysvmq.c cellconfig.o: ${AUTH}/cellconfig.c - ${CCRULE} -I../auth + ${AFS_CCRULE} -I../auth ${AUTH}/cellconfig.c ktc.o: ${AUTH}/ktc.c - ${CCRULE} -I../auth + ${AFS_CCRULE} -I../auth ${AUTH}/ktc.c token.o: ${AUTH}/token.c - ${CCRULE} -I../auth + ${AFS_CCRULE} -I../auth ${AUTH}/token.c -token.xdr.o: ${AUTH}/token.xdr.c - ${CCRULE} -I../auth +token.xdr.o: ../auth/token.xdr.c + ${AFS_CCRULE} -I../auth ../auth/token.xdr.c userok.o: ${AUTH}/userok.c - ${CCRULE} -I../auth + ${AFS_CCRULE} -I../auth ${AUTH}/userok.c writeconfig.o: ${AUTH}/writeconfig.c - ${CCRULE} -I../auth + ${AFS_CCRULE} -I../auth ${AUTH}/writeconfig.c authcon.o: ${AUTH}/authcon.c - ${CCRULE} -I../auth + ${AFS_CCRULE} -I../auth ${AUTH}/authcon.c -ktc_errors.o: ${AUTH}/ktc_errors.c - ${CCRULE} +ktc_errors.o: ../auth/ktc_errors.c + ${AFS_CCRULE} ../auth/ktc_errors.c -acfg_errors.o: ${AUTH}/acfg_errors.c - ${CCRULE} +acfg_errors.o: ../auth/acfg_errors.c + ${AFS_CCRULE} ../auth/acfg_errors.c -kauth.xdr.o: ${KAUTH}/kauth.xdr.c - ${CCRULE} +kauth.xdr.o: ../kauth/kauth.xdr.c + ${AFS_CCRULE} ../kauth/kauth.xdr.c -kauth.cs.o: ${KAUTH}/kauth.cs.c - ${CCRULE} +kauth.cs.o: ../kauth/kauth.cs.c + ${AFS_CCRULE} ../kauth/kauth.cs.c kaaux.o: ${KAUTH}/kaaux.c - ${CCRULE} -I../kauth + ${AFS_CCRULE} -I../kauth ${KAUTH}/kaaux.c client.o: ${KAUTH}/client.c - ${CCRULE} -I../kauth + ${AFS_CCRULE} -I../kauth ${KAUTH}/client.c authclient.o: ${KAUTH}/authclient.c - ${CCRULE} -I../kauth + ${AFS_CCRULE} -I../kauth ${KAUTH}/authclient.c katoken.o: ${KAUTH}/katoken.c - ${CCRULE} -I../kauth + ${AFS_CCRULE} -I../kauth ${KAUTH}/katoken.c kautils.o: ${KAUTH}/kautils.c - ${CCRULE} -I../kauth + ${AFS_CCRULE} -I../kauth ${KAUTH}/kautils.c kalocalcell.o: ${KAUTH}/kalocalcell.c - ${CCRULE} -I ../kauth + ${AFS_CCRULE} -I ../kauth ${KAUTH}/kalocalcell.c -kaerrors.o: ${KAUTH}/kaerrors.c - ${CCRULE} +kaerrors.o: ../kauth/kaerrors.c + ${AFS_CCRULE} ../kauth/kaerrors.c user.o: ${KAUTH}/user.c - ${CCRULE} -I ../kauth + ${AFS_CCRULE} -I ../kauth ${KAUTH}/user.c read_passwd.o: ${KAUTH}/read_passwd.c - ${CCRULE} + ${AFS_CCRULE} ${KAUTH}/read_passwd.c ubikclient.o: ${UBIK}/ubikclient.c - ${CCRULE} + ${AFS_CCRULE} ${UBIK}/ubikclient.c uinit.o: ${UBIK}/uinit.c - ${CCRULE} + ${AFS_CCRULE} ${UBIK}/uinit.c -uerrors.o: ${UBIK}/uerrors.c - ${CCRULE} +uerrors.o: ../ubik/uerrors.c + ${AFS_CCRULE} ../ubik/uerrors.c -ubik_int.cs.o: ${UBIK}/ubik_int.cs.c - ${CCRULE} +ubik_int.cs.o: ../ubik/ubik_int.cs.c + ${AFS_CCRULE} ../ubik/ubik_int.cs.c + +ubik_int.xdr.o: ../ubik/ubik_int.xdr.c + ${AFS_CCRULE} ../ubik/ubik_int.xdr.c -ubik_int.xdr.o: ${UBIK}/ubik_int.xdr.c - ${CCRULE} get_krbrlm.o: ${UTIL}/get_krbrlm.c - ${CCRULE} + ${AFS_CCRULE} ${UTIL}/get_krbrlm.c dirpath.o: ${UTIL}/dirpath.c - ${CCRULE} + ${AFS_CCRULE} ${UTIL}/dirpath.c serverLog.o: ${UTIL}/serverLog.c - ${CCRULE} + ${AFS_CCRULE} ${UTIL}/serverLog.c snprintf.o: ${UTIL}/snprintf.c - ${CCRULE} + ${AFS_CCRULE} ${UTIL}/snprintf.c strlcat.o: ${UTIL}/strlcat.c - ${CCRULE} + ${AFS_CCRULE} ${UTIL}/strlcat.c strlcpy.o: ${UTIL}/strlcpy.c - ${CCRULE} + ${AFS_CCRULE} ${UTIL}/strlcpy.c fileutil.o: ${UTIL}/fileutil.c - ${CCRULE} + ${AFS_CCRULE} ${UTIL}/fileutil.c pthread_glock.o: ${UTIL}/pthread_glock.c - ${CCRULE} + ${AFS_CCRULE} ${UTIL}/pthread_glock.c -rxkad_errs.o: ${RXKAD}/rxkad_errs.c - ${CCRULE} +rxkad_errs.o: ../rxkad/rxkad_errs.c + ${AFS_CCRULE} ../rxkad/rxkad_errs.c ptclient.o: ${PTSERVER}/ptclient.c - ${CCRULE} -I../ptserver + ${AFS_CCRULE} -I../ptserver ${PTSERVER}/ptclient.c # The special treatment of this file for hp_ux110 is because of a bug # in version A.11.01.00 of the HP C compiler. This bug appears to be @@ -236,49 +235,49 @@ ptuser.o: ${PTSERVER}/ptuser.c set -x; \ case ${SYS_NAME} in \ hp_ux11*) \ - set X `echo ${CCRULE} -I../ptserver | sed s/-g//`; shift; \ + set X `echo ${AFS_CCRULE} -I../ptserver ${PTSERVER}/ptuser.c | sed s/-g//`; shift; \ "$$@" \ ;; \ *) \ - ${CCRULE} -I../ptserver\ + ${AFS_CCRULE} -I../ptserver ${PTSERVER}/ptuser.c \ ;; \ esac display.o: ${PTSERVER}/display.c - ${CCRULE} -I../ptserver + ${AFS_CCRULE} -I../ptserver ${PTSERVER}/display.c -ptint.cs.o: ${PTSERVER}/ptint.cs.c - ${CCRULE} +ptint.cs.o: ../ptserver/ptint.cs.c + ${AFS_CCRULE} ../ptserver/ptint.cs.c -ptint.xdr.o: ${PTSERVER}/ptint.xdr.c - ${CCRULE} +ptint.xdr.o: ../ptserver/ptint.xdr.c + ${AFS_CCRULE} ../ptserver/ptint.xdr.c -pterror.o: ${PTSERVER}/pterror.c - ${CCRULE} +pterror.o: ../ptserver/pterror.c + ${AFS_CCRULE} ../ptserver/pterror.c rmtsysc.o: ${SYS}/rmtsysc.c - ${CCRULE} -I../sys + ${AFS_CCRULE} -I../sys ${SYS}/rmtsysc.c -rmtsys.xdr.o: ${SYS}/rmtsys.xdr.c - ${CCRULE} +rmtsys.xdr.o: ../sys/rmtsys.xdr.c + ${AFS_CCRULE} ../sys/rmtsys.xdr.c -rmtsys.cs.o: ${SYS}/rmtsys.cs.c - ${CCRULE} +rmtsys.cs.o: ../sys/rmtsys.cs.c + ${AFS_CCRULE} ../sys/rmtsys.cs.c afssyscalls.o: ${SYS}/afssyscalls.c - ${CCRULE} + ${AFS_CCRULE} ${SYS}/afssyscalls.c rmtsysnet.o: ${SYS}/rmtsysnet.c - ${CCRULE} -I../sys + ${AFS_CCRULE} -I../sys ${SYS}/rmtsysnet.c glue.o: ${SYS}/glue.c - ${CCRULE} + ${AFS_CCRULE} ${SYS}/glue.c setpag.o: ${SYS}/setpag.c - ${CCRULE} + ${AFS_CCRULE} ${SYS}/setpag.c pioctl.o: ${SYS}/pioctl.c - ${CCRULE} + ${AFS_CCRULE} ${SYS}/pioctl.c clean: $(RM) -f *.o *.a libafsauthent* diff --git a/src/libafsrpc/Makefile.in b/src/libafsrpc/Makefile.in index e2c5da5045..637a12c390 100644 --- a/src/libafsrpc/Makefile.in +++ b/src/libafsrpc/Makefile.in @@ -11,18 +11,19 @@ srcdir=@srcdir@ include @TOP_OBJDIR@/src/config/Makefile.config +include @TOP_OBJDIR@/src/config/Makefile.pthread + INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ -CC=${MT_CC} -CFLAGS = ${COMMON_CFLAGS} -DRXDEBUG ${MT_CFLAGS} +MODULE_CFLAGS = -DRXDEBUG SFLAGS=-P -I${TOP_INCDIR} + RX = ${srcdir}/../rx -CCRULE = ${CC} ${CFLAGS} -c RXKAD = ${srcdir}/../rxkad RXSTAT = ${srcdir}/../rxstat FSINT = ${srcdir}/../fsint @@ -153,126 +154,128 @@ libafsrpc.a: ${LIBOBJS} esac rx_event.o: ${RX}/rx_event.c - ${CCRULE} ${RX}/rx_event.c + $(AFS_CCRULE) $(RX)/rx_event.c rx_user.o: ${RX}/rx_user.c - ${CCRULE} ${RX}/rx_user.c + $(AFS_CCRULE) $(RX)/rx_user.c rx_pthread.o: ${RX}/rx_pthread.c - ${CCRULE} ${RX}/rx_pthread.c + $(AFS_CCRULE) $(RX)/rx_pthread.c +CFLAGS_rx.o = @CFLAGS_NOERROR@ rx.o: ${RX}/rx.c - ${CCRULE} @CFLAGS_NOERROR@ ${RX}/rx.c + $(AFS_CCRULE) $(RX)/rx.c rx_conncache.o: ${RX}/rx_conncache.c - ${CCRULE} ${RX}/rx_conncache.c + $(AFS_CCRULE) $(RX)/rx_conncache.c rx_null.o: ${RX}/rx_null.c - ${CCRULE} ${RX}/rx_null.c + $(AFS_CCRULE) $(RX)/rx_null.c rx_opaque.o: ${RX}/rx_opaque.c - ${CCRULE} ${RX}/rx_opaque.c + $(AFS_CCRULE) $(RX)/rx_opaque.c rx_globals.o: ${RX}/rx_globals.c - ${CCRULE} ${RX}/rx_globals.c + $(AFS_CCRULE) $(RX)/rx_globals.c -rx_identity.o: ${RX}/rx_identity.o - ${CCRULE} ${RX}/rx_identity.c +rx_identity.o: ${RX}/rx_identity.c + $(AFS_CCRULE) $(RX)/rx_identity.c rx_getaddr.o: ${RX}/rx_getaddr.c - ${CCRULE} ${RX}/rx_getaddr.c + $(AFS_CCRULE) $(RX)/rx_getaddr.c rx_misc.o: ${RX}/rx_misc.c - ${CCRULE} ${RX}/rx_misc.c + $(AFS_CCRULE) $(RX)/rx_misc.c rx_packet.o: ${RX}/rx_packet.c - ${CCRULE} ${RX}/rx_packet.c + $(AFS_CCRULE) $(RX)/rx_packet.c rx_stats.o: ${RX}/rx_stats.c - ${CCRULE} ${RX}/rx_stats.c + $(AFS_CCRULE) $(RX)/rx_stats.c rx_rdwr.o: ${RX}/rx_rdwr.c - ${CCRULE} ${RX}/rx_rdwr.c + $(AFS_CCRULE) $(RX)/rx_rdwr.c rx_trace.o: ${RX}/rx_trace.c - ${CCRULE} ${RX}/rx_trace.c + $(AFS_CCRULE) $(RX)/rx_trace.c rx_multi.o: ${RX}/rx_multi.c - ${CCRULE} ${RX}/rx_multi.c + $(AFS_CCRULE) $(RX)/rx_multi.c -${RXOBJS}: ${RX}/rx.h ${RX}/rx_user.h ${RX}/rx_globals.h ${RX}/rx_clock.h ${RX}/rx_queue.h ${RX}/rx_event.h +${RXOBJS}: ${RX}/rx.h ${RX}/rx_user.h ${RX}/rx_globals.h \ + ${RX}/rx_clock.h ${RX}/rx_queue.h ${RX}/rx_event.h rxkad_client.o: ${RXKAD}/rxkad_client.c - ${CCRULE} -I../rxkad ${RXKAD}/rxkad_client.c + $(AFS_CCRULE) -I../rxkad $(RXKAD)/rxkad_client.c rxkad_server.o: ${RXKAD}/rxkad_server.c - ${CCRULE} -I../rxkad ${RXKAD}/rxkad_server.c + $(AFS_CCRULE) -I../rxkad $(RXKAD)/rxkad_server.c rxkad_common.o: ${RXKAD}/rxkad_common.c - ${CCRULE} -I../rxkad ${RXKAD}/rxkad_common.c + $(AFS_CCRULE) -I../rxkad $(RXKAD)/rxkad_common.c ticket.o: ${RXKAD}/ticket.c - ${CCRULE} -I../rxkad ${RXKAD}/ticket.c + $(AFS_CCRULE) -I../rxkad $(RXKAD)/ticket.c ticket5.o: ${RXKAD}/ticket5.c - ${CCRULE} -I../rxkad -I${RXKAD} ${RXKAD}/ticket5.c + $(AFS_CCRULE) -I../rxkad -I$(RXKAD) $(RXKAD)/ticket5.c crc.o: ${RXKAD}/crc.c - ${CCRULE} -I../rxkad ${RXKAD}/crc.c + $(AFS_CCRULE) -I../rxkad $(RXKAD)/crc.c md4.o: ${RXKAD}/md4.c - ${CCRULE} -I../rxkad ${RXKAD}/md4.c + $(AFS_CCRULE) -I../rxkad $(RXKAD)/md4.c md5.o: ${RXKAD}/md5.c - ${CCRULE} -I../rxkad ${RXKAD}/md5.c + $(AFS_CCRULE) -I../rxkad $(RXKAD)/md5.c fcrypt.o: ${RXKAD}/fcrypt.c - ${CCRULE} -I../rxkad ${RXKAD}/fcrypt.c + $(AFS_CCRULE) -I../rxkad $(RXKAD)/fcrypt.c crypt_conn.o: ${RXKAD}/crypt_conn.c - ${CCRULE} -I../rxkad ${RXKAD}/crypt_conn.c + $(AFS_CCRULE) -I../rxkad $(RXKAD)/crypt_conn.c AFS_component_version_number.o: ${TOP_OBJDIR}/src/rx/AFS_component_version_number.c - ${CCRULE} ${TOP_OBJDIR}/src/rx/AFS_component_version_number.c + $(AFS_CCRULE) ${TOP_OBJDIR}/src/rx/AFS_component_version_number.c xdr.o: ${RX}/xdr.c - ${CCRULE} ${RX}/xdr.c + $(AFS_CCRULE) $(RX)/xdr.c xdr_int32.o: ${RX}/xdr_int32.c - ${CCRULE} ${RX}/xdr_int32.c + $(AFS_CCRULE) $(RX)/xdr_int32.c xdr_int64.o: ${RX}/xdr_int64.c - ${CCRULE} ${RX}/xdr_int64.c + $(AFS_CCRULE) $(RX)/xdr_int64.c xdr_array.o: ${RX}/xdr_array.c - ${CCRULE} ${RX}/xdr_array.c + $(AFS_CCRULE) $(RX)/xdr_array.c xdr_arrayn.o: ${RX}/xdr_arrayn.c - ${CCRULE} ${RX}/xdr_arrayn.c + $(AFS_CCRULE) $(RX)/xdr_arrayn.c xdr_float.o: ${RX}/xdr_float.c - ${CCRULE} ${RX}/xdr_float.c + $(AFS_CCRULE) $(RX)/xdr_float.c xdr_len.o: ${RX}/xdr_len.c - ${CCRULE} ${RX}/xdr_len.c + $(AFS_CCRULE) $(RX)/xdr_len.c xdr_mem.o: ${RX}/xdr_mem.c - ${CCRULE} ${RX}/xdr_mem.c + $(AFS_CCRULE) $(RX)/xdr_mem.c xdr_rec.o: ${RX}/xdr_rec.c - ${CCRULE} ${RX}/xdr_rec.c + $(AFS_CCRULE) $(RX)/xdr_rec.c xdr_refernce.o: ${RX}/xdr_refernce.c - ${CCRULE} ${RX}/xdr_refernce.c + $(AFS_CCRULE) $(RX)/xdr_refernce.c xdr_rx.o: ${RX}/xdr_rx.c - ${CCRULE} ${RX}/xdr_rx.c + $(AFS_CCRULE) $(RX)/xdr_rx.c xdr_update.o: ${RX}/xdr_update.c - ${CCRULE} ${RX}/xdr_update.c + $(AFS_CCRULE) $(RX)/xdr_update.c xdr_afsuuid.o: ${RX}/xdr_afsuuid.c - ${CCRULE} ${RX}/xdr_afsuuid.c + $(AFS_CCRULE) $(RX)/xdr_afsuuid.c # Note that the special case statement for compiling des.c is present # simply to work around a compiler bug on HP-UX 11.0. The symptom of @@ -304,82 +307,84 @@ des.o: ${DES}/des.c set -x; \ case ${SYS_NAME} in \ hp_ux11*) \ - set X `echo ${CCRULE} -I../des ${DES}/des.c | sed s/-g//`; shift; \ + set X `echo ${AFS_CCRULE} -I../des ${DES}/des.c | sed s/-g//`; shift; \ "$$@" \ ;; \ *) \ - ${CCRULE} -I../des ${DES}/des.c \ + ${AFS_CCRULE} -I../des ${DES}/des.c \ ;; \ esac crypt.o: ${DES}/crypt.c - ${CCRULE} ${DES}/crypt.c + $(AFS_CCRULE) $(DES)/crypt.c cbc_encrypt.o: ${DES}/cbc_encrypt.c - ${CCRULE} ${DES}/cbc_encrypt.c + $(AFS_CCRULE) $(DES)/cbc_encrypt.c pcbc_encrypt.o: ${DES}/pcbc_encrypt.c - ${CCRULE} ${DES}/pcbc_encrypt.c + $(AFS_CCRULE) $(DES)/pcbc_encrypt.c cksum.o: ${DES}/cksum.c - ${CCRULE} ${DES}/cksum.c + $(AFS_CCRULE) $(DES)/cksum.c new_rnd_key.o: ${DES}/new_rnd_key.c - ${CCRULE} ${DES}/new_rnd_key.c + $(AFS_CCRULE) $(DES)/new_rnd_key.c key_sched.o: ${DES}/key_sched.c - ${CCRULE} -I../des ${DES}/key_sched.c + $(AFS_CCRULE) -I../des $(DES)/key_sched.c debug_decl.o: ${DES}/debug_decl.c - ${CCRULE} ${DES}/debug_decl.c + $(AFS_CCRULE) $(DES)/debug_decl.c quad_cksum.o: ${DES}/quad_cksum.c - ${CCRULE} ${DES}/quad_cksum.c + $(AFS_CCRULE) $(DES)/quad_cksum.c key_parity.o: ${DES}/key_parity.c - ${CCRULE} -I../des ${DES}/key_parity.c + $(AFS_CCRULE) -I../des $(DES)/key_parity.c weak_key.o: ${DES}/weak_key.c - ${CCRULE} ${DES}/weak_key.c + $(AFS_CCRULE) $(DES)/weak_key.c strng_to_key.o: ${DES}/strng_to_key.c - ${CCRULE} ${DES}/strng_to_key.c + $(AFS_CCRULE) $(DES)/strng_to_key.c misc.o: ${DES}/misc.c - ${CCRULE} ${DES}/misc.c + $(AFS_CCRULE) $(DES)/misc.c util.o: ${DES}/util.c - ${CCRULE} ${DES}/util.c + $(AFS_CCRULE) $(DES)/util.c + error_msg.o: ${COMERR}/error_msg.c - ${CCRULE} ${COMERR}/error_msg.c + $(AFS_CCRULE) $(COMERR)/error_msg.c et_name.o: ${COMERR}/et_name.c - ${CCRULE} ${COMERR}/et_name.c + $(AFS_CCRULE) $(COMERR)/et_name.c com_err.o: ${COMERR}/com_err.c - ${CCRULE} ${COMERR}/com_err.c + $(AFS_CCRULE) $(COMERR)/com_err.c + casestrcpy.o: ${UTIL}/casestrcpy.c - ${CCRULE} ${UTIL}/casestrcpy.c + $(AFS_CCRULE) $(UTIL)/casestrcpy.c assert.o: ${UTIL}/assert.c - ${CCRULE} ${UTIL}/assert.c + $(AFS_CCRULE) $(UTIL)/assert.c base64.o: ${UTIL}/base64.c - ${CCRULE} ${UTIL}/base64.c + $(AFS_CCRULE) $(UTIL)/base64.c strlcat.o: ${UTIL}/strlcat.c - ${CCRULE} ${UTIL}/strlcat.c + $(AFS_CCRULE) $(UTIL)/strlcat.c strlcpy.o: ${UTIL}/strlcpy.c - ${CCRULE} ${UTIL}/strlcpy.c + $(AFS_CCRULE) $(UTIL)/strlcpy.c fasttime.o: ${LWP}/fasttime.c - ${CCRULE} ${LWP}/fasttime.c + $(AFS_CCRULE) $(LWP)/fasttime.c lock.o: ${LWP}/lock.c - ${CCRULE} ${LWP}/lock.c + $(AFS_CCRULE) $(LWP)/lock.c syscall.o: ${SYS}/syscall.s case "$(SYS_NAME)" in \ @@ -388,9 +393,9 @@ syscall.o: ${SYS}/syscall.s as -o syscall.o syscall.ss; \ $(RM) syscall.ss;; \ sgi_* | *_darwin_* ) \ - ${CC} ${CFLAGS} -c ${SYS}/syscall.s;; \ + ${CC} ${AFS_CFLAGS} -c ${SYS}/syscall.s;; \ alpha_dux?? ) \ - ${AS} -P ${CFLAGS} -D_NO_PROTO -DMACH -DOSF -nostdinc -traditional -DASSEMBLER ${SYS}/syscall.s; \ + ${AS} -P ${AFS_CFLAGS} -D_NO_PROTO -DMACH -DOSF -nostdinc -traditional -DASSEMBLER ${SYS}/syscall.s; \ ${AS} -o syscall.o syscall.i; \ $(RM) -f syscall.ss syscall.i;; \ *bsd* ) \ @@ -402,31 +407,31 @@ syscall.o: ${SYS}/syscall.s esac rxstat.o: ${RXSTAT}/rxstat.c - ${CCRULE} ${RXSTAT}/rxstat.c + $(AFS_CCRULE) $(RXSTAT)/rxstat.c rxstat.cs.o: ${TOP_OBJDIR}/src/rxstat/rxstat.cs.c - ${CCRULE} ${TOP_OBJDIR}/src/rxstat/rxstat.cs.c + $(AFS_CCRULE) ${TOP_OBJDIR}/src/rxstat/rxstat.cs.c rxstat.ss.o: ${TOP_OBJDIR}/src/rxstat/rxstat.ss.c - ${CCRULE} ${TOP_OBJDIR}/src/rxstat/rxstat.ss.c + $(AFS_CCRULE) ${TOP_OBJDIR}/src/rxstat/rxstat.ss.c rxstat.xdr.o: ${TOP_OBJDIR}/src/rxstat/rxstat.xdr.c - ${CCRULE} ${TOP_OBJDIR}/src/rxstat/rxstat.xdr.c + $(AFS_CCRULE) ${TOP_OBJDIR}/src/rxstat/rxstat.xdr.c afsint.cs.o: ${TOP_OBJDIR}/src/fsint/afsint.cs.c - ${CCRULE} ${TOP_OBJDIR}/src/fsint/afsint.cs.c + $(AFS_CCRULE) ${TOP_OBJDIR}/src/fsint/afsint.cs.c afsint.xdr.o: ${TOP_OBJDIR}/src/fsint/afsint.xdr.c - ${CCRULE} ${TOP_OBJDIR}/src/fsint/afsint.xdr.c + $(AFS_CCRULE) ${TOP_OBJDIR}/src/fsint/afsint.xdr.c afscbint.cs.o: ${TOP_OBJDIR}/src/fsint/afscbint.cs.c - ${CCRULE} ${TOP_OBJDIR}/src/fsint/afscbint.cs.c + $(AFS_CCRULE) ${TOP_OBJDIR}/src/fsint/afscbint.cs.c afscbint.xdr.o: ${TOP_OBJDIR}/src/fsint/afscbint.xdr.c - ${CCRULE} ${TOP_OBJDIR}/src/fsint/afscbint.xdr.c + $(AFS_CCRULE) ${TOP_OBJDIR}/src/fsint/afscbint.xdr.c afsaux.o: ${FSINT}/afsaux.c - ${CCRULE} -I../fsint ${FSINT}/afsaux.c + $(AFS_CCRULE) -I../fsint ${FSINT}/afsaux.c install: libafsrpc.a ${INSTALL} -d ${DESTDIR}${libdir} diff --git a/src/log/Makefile.in b/src/log/Makefile.in index 6a720b0819..aed9ac6dcd 100644 --- a/src/log/Makefile.in +++ b/src/log/Makefile.in @@ -7,6 +7,8 @@ srcdir=@srcdir@ include @TOP_OBJDIR@/src/config/Makefile.config +include @TOP_OBJDIR@/src/config/Makefile.lwp + INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -42,16 +44,16 @@ all: unlog tokens tokens.krb # Build targets # kseal: kseal.o ${LIBRARIES} - ${CC} -o kseal kseal.o ${LIBRARIES} ${XLIBS} ${CFLAGS} + $(AFS_LDRULE) kseal.o ${LIBRARIES} ${XLIBS} unlog: unlog.o ${LIBRARIES} - ${CC} -o unlog unlog.o ${LIBRARIES} ${XLIBS} ${CFLAGS} + $(AFS_LDRULE) unlog.o ${LIBRARIES} ${XLIBS} tokens: tokens.o ${LIBRARIES} - ${CC} -o tokens tokens.o ${LIBRARIES} ${XLIBS} ${CFLAGS} + $(AFS_LDRULE) tokens.o ${LIBRARIES} ${XLIBS} tokens.krb: tokens.o ${KLIBRARIES} - ${CC} -o tokens.krb tokens.o ${KLIBRARIES} ${XLIBS} ${CFLAGS} + $(AFS_LDRULE) tokens.o ${KLIBRARIES} ${XLIBS} kseal.o: kseal.c ${INCLS} AFS_component_version_number.c unlog.o: unlog.c AFS_component_version_number.c diff --git a/src/log/test/Makefile.in b/src/log/test/Makefile.in index 902cfc7350..65daaaaf1e 100644 --- a/src/log/test/Makefile.in +++ b/src/log/test/Makefile.in @@ -7,19 +7,16 @@ srcdir=@srcdir@ include @TOP_OBJDIR@/src/config/Makefile.config +include @TOP_OBJDIR@/src/config/Makefile.lwp + INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ - - -INCDIRS=-I${TOP_INCDIR} -I.. -I${TOP_INCDIR}/afs LDIRS=-L${TOP_LIBDIR} -L${DESTDIR}/lib/afs -L.. LIBS= -lauth -lrxkad -ldes -lsys -lrx -llwp -lcmd -lafsutil ${XLIBS} -CFLAGS = ${OPTIMIZE} ${INCDIRS} ${LDIRS} ${LIBS} ${XCFLAGS} ${ARCHFLAGS} - all: testlog gettoktest install: @@ -28,10 +25,10 @@ install: # Build targets # testlog: testlog.o - ${CC} -o testlog testlog.o ${CFLAGS} + $(AFS_LDRULE) testlog.o ${LDIRS} ${LIBS} gettoktest: gettoktest.o - ${CC} -o gettoktest gettoktest.o ${CFLAGS} + $(AFS_LDRULE) gettoktest.o ${LDIRS} ${LIBS} # # Misc. targets diff --git a/src/lwp/Makefile.in b/src/lwp/Makefile.in index 19b24f59b4..b58fa27387 100644 --- a/src/lwp/Makefile.in +++ b/src/lwp/Makefile.in @@ -9,12 +9,17 @@ srcdir=@srcdir@ include @TOP_OBJDIR@/src/config/Makefile.config +include @TOP_OBJDIR@/src/config/Makefile.lwp + INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ -CFLAGS=${LWP_DBG} ${LWP_OPTMZ} ${XCFLAGS} ${ARCHFLAGS} ${COMMON_INCL} +# Override the global COMMON_CFLAGS, as we want to be able to override +# debug and optimization settings for this module + +COMMON_CFLAGS = ${CFLAGS} ${LWP_DBG} ${LWP_OPTMZ} ${COMMON_INCL} LIBOBJS=lwp.o process.o lock.o iomgr.o timer.o fasttime.o preempt.o \ waitkey.o threadname.o AFS_component_version_number.o @@ -132,12 +137,12 @@ process.o : process.s process.i386.s process.c lwp.o ${AS} -o process.o process.ss; \ $(RM) process.ss ;; \ hp* | *_linux* | *_umlinux* | sgi_64 | sgi_65 ) \ - ${CCOBJ} ${CFLAGS} -c ${srcdir}/process.c;; \ + $(AFS_CCRULE) -c ${srcdir}/process.c;; \ alpha_osf1 | alpha_osf20 | alpha_osf30 | alpha_osf32 | alpha_osf32c | alpha_dux?? ) \ ${AS} -v -P -DOSF -I${TOP_INCDIR} -DASSEMBLER ${srcdir}/process.s; \ ${AS} -v process.i -o process.o;; \ ia64_hpux11* | hp_ux11* ) \ - ${CC} ${CFLAGS} -c ${srcdir}/process.c;; \ + $(AFS_CCRULE) -c ${srcdir}/process.c;; \ i386_*) \ $(PATH_CPP) -P -I${TOP_INCDIR} -I${srcdir} ${srcdir}/process.i386.s > process.ss; \ ${AS} process.ss -o process.o; \ @@ -149,15 +154,13 @@ process.o : process.s process.i386.s process.c lwp.o esac iomgr.o : iomgr.c lwp.h timer.h - ${CCOBJ} -c ${CFLAGS} ${srcdir}/iomgr.c - preempt.o : preempt.c lwp.h preempt.h lwp.o : lwp.c lwp.h case "$(SYS_NAME)" in \ rs_aix*) \ $(CCOBJ) ${LWP_DBG} ${LWP_OPTMZ} -I${srcdir} -I. -I${TOP_OBJDIR}/src/config -I${TOP_INCDIR} -c ${srcdir}/lwp.c;; \ *) \ - $(CCOBJ) ${CFLAGS} -c ${srcdir}/lwp.c;; \ + $(AFS_CCRULE) ${srcdir}/lwp.c;; \ esac lock.o : lock.c lock.h lwp.h timer.o : timer.c @@ -170,11 +173,7 @@ exc_handling.o : exc_handling.c # tests # rw: rw.o liblwp.a $(TOP_LIBDIR)/util.a - ${CC} ${CFLAGS} -o rw rw.o liblwp.a $(TOP_LIBDIR)/util.a - -rw.o: rw.c - ${CC} ${CFLAGS} -c ${srcdir}/rw.c - + $(AFS_LDRULE) rw.o liblwp.a $(TOP_LIBDIR)/util.a # # Install targets diff --git a/src/lwp/test/Makefile.in b/src/lwp/test/Makefile.in index 9d2f8a16ba..e492fcb1de 100644 --- a/src/lwp/test/Makefile.in +++ b/src/lwp/test/Makefile.in @@ -7,6 +7,8 @@ srcdir=@srcdir@ include @TOP_OBJDIR@/src/config/Makefile.config +include @TOP_OBJDIR@/src/config/Makefile.lwp + INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -15,8 +17,6 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INCDIRS= -I.. -I${DESTDIR}/include LIBS= ../liblwp.a -CFLAGS = ${OPTIMIZE} ${INCDIRS} ${LDIRS} ${XCFLAGS} ${ARCHFLAGS} - system noversion: test test: test.c liblwp.a @@ -27,26 +27,19 @@ testlwp.o : testlwp.c selclient.o: selclient.c seltest.h - ${CC} ${CFLAGS} -c -g selclient.c selclient: selclient.o selsubs.o ${LIBS} - ${CC} ${CFLAGS} -g -o selclient selclient.o selsubs.o ${LIBS} + $(AFS_LDRULE) selclient.o selsubs.o ${LIBS} selserver.o: selserver.c seltest.h - ${CC} ${CFLAGS} -c -g selserver.c selserver: selserver.o selsubs.o ${LIBS} - ${CC} ${CFLAGS} -g -o selserver selserver.o selsubs.o ${LIBS} + $(AFS_LDRULE) selserver.o selsubs.o ${LIBS} selsubs.o: selsubs.c seltest.h - ${CC} ${CFLAGS} -g -c selsubs.c - test_key: test_key.o - ${CC} ${CFLAGS} -g -o test_key test_key.o \ - ../liblwp.a $(DESTDIR)/lib/afs/util.a - - + $(AFS_LDRULE) test_key.o ../liblwp.a $(DESTDIR)/lib/afs/util.a clean: -$(RM) -f *.o *.a test testlwp selclient selserver core diff --git a/src/pam/Makefile.in b/src/pam/Makefile.in index de6166f986..82e62a47ef 100644 --- a/src/pam/Makefile.in +++ b/src/pam/Makefile.in @@ -12,7 +12,6 @@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ -LDFLAGS = ${SHLIB_LDFLAGS} LIBS = ${TOP_LIBDIR}/libafsauthent_pic.a ${TOP_LIBDIR}/libafsrpc_pic.a \ ${PAM_LIBS} @LIB_AFSDB@ ${MT_LIBS} KLIBS = ktc_krb.o ${TOP_LIBDIR}/libafsauthent_pic.a \ @@ -21,32 +20,41 @@ LDFLAGS = ${SHLIB_LDFLAGS} afs_pam_msg.o afs_message.o AFS_component_version_number.o OBJS = $(SHOBJS) test_pam.o INCLUDES=-I${TOP_OBJDIR}/src/config -I${TOP_INCDIR} -CFLAGS = ${PAM_DBG} ${PAM_OPTMZ} ${INCLUDES} ${PAM_CFLAGS} + + +AFS_CCRULE= $(CC) $(CPPFLAGS) $(CFLAGS) $(CFLAGS_$(@)) \ + ${PAM_DBG} ${PAM_OPTMZ} \ + ${INCLUDES} ${PAM_CFLAGS} -c -o $@ + +.c.o: + $(AFS_CCRULE) $< all: test_pam pam_afs.so.1 pam_afs.krb.so.1 +CFLAGS_afs_setcred_krb.o = -DAFS_KERBEROS_ENV +CFLAGS_afs_auth_krb.o = -DAFS_KERBEROS_ENV +CFLAGS_afs_util_krb.o = -DAFS_KERBEROS_ENV +CFLAGS_ktc_krb.o = -DAFS_KERBEROS_ENV -I../auth + afs_setcred.o: afs_setcred.c afs_pam_msg.h afs_message.h afs_util.h - ${CC} ${CFLAGS} -c ${srcdir}/afs_setcred.c -o afs_setcred.o afs_setcred_krb.o: afs_setcred.c afs_pam_msg.h afs_message.h afs_util.h - ${CC} ${CFLAGS} -DAFS_KERBEROS_ENV -c ${srcdir}/afs_setcred.c -o afs_setcred_krb.o + $(AFS_CCRULE) $(srcdir)/afs_setcred.c afs_auth.o: afs_auth.c afs_pam_msg.h afs_message.h afs_util.h - ${CC} ${CFLAGS} -c ${srcdir}/afs_auth.c -o afs_auth.o afs_auth_krb.o: afs_auth.c afs_pam_msg.h afs_message.h afs_util.h - ${CC} ${CFLAGS} -DAFS_KERBEROS_ENV -c ${srcdir}/afs_auth.c -o afs_auth_krb.o + $(AFS_CCRULE) $(srcdir)/afs_auth.c afs_util.o: afs_util.c afs_pam_msg.h afs_message.h afs_util.h - ${CC} ${CFLAGS} -c ${srcdir}/afs_util.c -o afs_util.o afs_util_krb.o: afs_util.c afs_pam_msg.h afs_message.h afs_util.h - ${CC} ${CFLAGS} -DAFS_KERBEROS_ENV -c ${srcdir}/afs_util.c -o afs_util_krb.o + $(AFS_CCRULE) $(srcdir)/afs_util.c ktc_krb.o: ${srcdir}/../auth/ktc.c ${TOP_INCDIR}/afs/cellconfig.h \ ${TOP_INCDIR}/afs/auth.h ${srcdir}/../auth/keys.h \ ${TOP_INCDIR}/afs/vice.h - ${CC} ${CFLAGS} -DAFS_KERBEROS_ENV -c ${srcdir}/../auth/ktc.c -I../auth -o $@ + $(AFS_CCRULE) $(srcdir)/../auth/ktc.c pam_afs.so.1: $(SHOBJS) afs_setcred.o afs_auth.o afs_util.o \ ${TOP_LIBDIR}/libafsauthent_pic.a \ @@ -67,13 +75,13 @@ test_pam: test_pam.o set -x; \ case "$(SYS_NAME)" in \ hp_ux* | ia64_hpux*) \ - $(CC) $(CFLAGS) -o $@ test_pam.o ${PAM_LIBS};; \ + $(AFS_LDRULE) test_pam.o ${PAM_LIBS};; \ sun*_5*) \ - $(CC) $(CFLAGS) -o $@ test_pam.o ${PAM_LIBS};; \ + $(AFS_LDRULE) test_pam.o ${PAM_LIBS};; \ *linux*) \ - $(CC) $(CFLAGS) -rdynamic -o $@ test_pam.o -lpam -ldl;; \ + $(AFS_LDRULE) -rdynamic test_pam.o -lpam -ldl;; \ *fbsd*| *nbsd*) \ - $(CC) $(CFLAGS) -rdynamic -o $@ test_pam.o -lpam ;; \ + $(AFS_LDRULE) -rdynamic test_pam.o -lpam ;; \ *) \ echo No link line for system $(SYS_NAME). ;; \ esac diff --git a/src/platform/DARWIN/Makefile.in b/src/platform/DARWIN/Makefile.in index c52d4fe98c..7ab42b2eb5 100644 --- a/src/platform/DARWIN/Makefile.in +++ b/src/platform/DARWIN/Makefile.in @@ -7,6 +7,8 @@ srcdir=@srcdir@ include @TOP_OBJDIR@/src/config/Makefile.config +include @TOP_OBJDIR@/src/config/Makefile.pthread + INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -39,7 +41,7 @@ afscell: xcodebuild -project ${srcdir}/afscell/afscell.xcodeproj SYMROOT=`pwd`/afscell/build afssettings: afssettings.m - ${CC} ${CFLAGS} -o afssettings $? -framework Foundation + ${CC} ${AFS_CFLAGS} -o afssettings $? -framework Foundation install: \ ${DESTDIR}${sbindir}/afssettings diff --git a/src/platform/DARWIN/growlagent/Makefile.in b/src/platform/DARWIN/growlagent/Makefile.in index 3d71b6c67a..1bede45557 100644 --- a/src/platform/DARWIN/growlagent/Makefile.in +++ b/src/platform/DARWIN/growlagent/Makefile.in @@ -1,5 +1,6 @@ srcdir=@srcdir@ include @TOP_OBJDIR@/src/config/Makefile.config +include @TOP_OBJDIR@/src/config/Makefile.pthread INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -10,7 +11,8 @@ OBJS=main.o CFGrowlAdditions.o all: growlagent-openafs growlagent-openafs: ${OBJS} - ${CC} ${CFLAGS} -o $@ ${OBJS} -framework Security -framework AppKit -framework CoreFoundation + $(AFS_LDRULE) ${OBJS} -framework Security \ + -framework AppKit -framework CoreFoundation CFGrowlAdditions.o: CFGrowlAdditions.h main.o: GrowlDefines.h GrowlPathway.h CFGrowlAdditions.h diff --git a/src/platform/SOLARIS/Makefile.in b/src/platform/SOLARIS/Makefile.in index 42db2d5799..7468da3d71 100644 --- a/src/platform/SOLARIS/Makefile.in +++ b/src/platform/SOLARIS/Makefile.in @@ -7,6 +7,8 @@ srcdir=@srcdir@ include @TOP_OBJDIR@/src/config/Makefile.config +include @TOP_OBJDIR@/src/config/Makefile.lwp + INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -25,8 +27,7 @@ all: fs_conv_sol26 # Build targets # fs_conv_sol26: fs_conv_sol26.o ${LIBS} - ${CC} ${CFLAGS} -o fs_conv_sol26 fs_conv_sol26.o \ - ${TOP_LIBDIR}/libcmd.a ${LIBS} ${XLIBS} + $(AFS_LDRULE) fs_conv_sol26.o ${TOP_LIBDIR}/libcmd.a ${LIBS} ${XLIBS} fs_conv_sol26: ${INCLS} AFS_component_version_number.c diff --git a/src/procmgmt/Makefile.in b/src/procmgmt/Makefile.in index 9482b34fe3..d230f74c67 100644 --- a/src/procmgmt/Makefile.in +++ b/src/procmgmt/Makefile.in @@ -7,6 +7,8 @@ srcdir=@srcdir@ include @TOP_OBJDIR@/src/config/Makefile.config +include @TOP_OBJDIR@/src/config/Makefile.lwp + INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -31,7 +33,6 @@ libprocmgmt.a: procmgmt_unix.o AFS_component_version_number.o $(RANLIB) $@ procmgmt_unix.o: ${srcdir}/procmgmt_unix.c ${srcdir}/procmgmt.h - $(CC) $(CFLAGS) -c ${srcdir}/procmgmt_unix.c # # Install targets diff --git a/src/procmgmt/test/Makefile.in b/src/procmgmt/test/Makefile.in index 1b894aeca0..771a24b858 100644 --- a/src/procmgmt/test/Makefile.in +++ b/src/procmgmt/test/Makefile.in @@ -7,6 +7,8 @@ srcdir=@srcdir@ include @TOP_OBJDIR@/src/config/Makefile.config +include @TOP_OBJDIR@/src/config/Makefile.lwp + INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -21,7 +23,7 @@ CFLAGS = $(DBUG) -I${SRCDIR}/include ${XCFLAGS} ${ARCHFLAGS} LIBPMGT=DEST/lib/afs/libprocmgmt.a pmgttest: pmgttest.o $(LIBPMGT) - $(CC) $(CFLAGS) -o pmgttest pmgttest.o $(LIBPMGT) -lm $(XLIBS) + $(AFS_LDRULE) pmgttest.o $(LIBPMGT) -lm $(XLIBS) ####################################################################### test tests: pmgttest diff --git a/src/ptserver/Makefile.in b/src/ptserver/Makefile.in index 1c237c7a40..30918e5d4e 100644 --- a/src/ptserver/Makefile.in +++ b/src/ptserver/Makefile.in @@ -6,6 +6,8 @@ # directory or online at http://www.openafs.org/dl/license10.html srcdir=@srcdir@ include @TOP_OBJDIR@/src/config/Makefile.config +include @TOP_OBJDIR@/src/config/Makefile.lwp + INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -96,22 +98,20 @@ ${TOP_INCDIR}/afs/ptserver.h: ptserver.h # Build targets # ptserver: ptserver.o ptutils.o ptprocs.o ptint.ss.o ptint.xdr.o utils.o $(LIBS) ${TOP_LIBDIR}/libaudit.a map.o - $(CC) ${CFLAGS} -o ptserver ptserver.o ptutils.o ptprocs.o ptint.ss.o ptint.xdr.o utils.o map.o $(LIBS) ${XLIBS} ${TOP_LIBDIR}/libaudit.a + $(AFS_LDRULE) ptserver.o ptutils.o ptprocs.o ptint.ss.o ptint.xdr.o \ + utils.o map.o $(LIBS) ${XLIBS} ${TOP_LIBDIR}/libaudit.a ptserver.o: ptserver.c ${INCLS} AFS_component_version_number.c # When supergroups is enabled, some parts of ptserver cast between # incompatible structs. +CFLAGS_ptutils.o = @CFLAGS_NOSTRICT@ +CFLAGS_ptprocs.o = @CFLAGS_NOSTRICT@ + ptutils.o: ptutils.c ${INCLS} - $(CCOBJ) $(CFLAGS) @CFLAGS_NOSTRICT@ -c ${srcdir}/ptutils.c - ptprocs.o: ptprocs.c ${INCLS} - $(CCOBJ) $(CFLAGS) @CFLAGS_NOSTRICT@ -c ${srcdir}/ptprocs.c - utils.o: utils.c ${INCLS} - map.o: map.c ${INCLS} - ptint.ss.o: ptint.ss.c ptint.xdr.c ptint.xg ptint.cs.o: ptint.cs.c ptint.xdr.c ptint.xg ptint.xdr.o: ptint.xdr.c ptint.h ptint.xg @@ -146,10 +146,10 @@ display.o: display.c ${INCLS} db_verify.o: db_verify.c ${INCLS} AFS_component_version_number.c db_verify: db_verify.o pterror.o display.o $(LIBS) - $(CC) ${CFLAGS} -o db_verify db_verify.o display.o pterror.o $(LIBS) ${XLIBS} + $(AFS_LDRULE) db_verify.o display.o pterror.o $(LIBS) ${XLIBS} ptclient: ptclient.o display.o libprot.a $(LIBS) - $(CC) ${CFLAGS} -o ptclient ptclient.o display.o libprot.a $(LIBS) ${XLIBS} + $(AFS_LDRULE) ptclient.o display.o libprot.a $(LIBS) ${XLIBS} ptclient.o: ptclient.c ${INCLS} AFS_component_version_number.c @@ -165,32 +165,35 @@ libprot.a: ptuser.o pterror.o ptint.cs.o ptint.xdr.o AFS_component_version_numbe $(RANLIB) $@ pts: pts.o libprot.a ${TOP_LIBDIR}/libcmd.a $(LIBS) - $(CC) ${CFLAGS} -o pts pts.o ${TOP_LIBDIR}/libcmd.a libprot.a ${LIBS} ${XLIBS} + $(AFS_LDRULE) pts.o ${TOP_LIBDIR}/libcmd.a libprot.a ${LIBS} ${XLIBS} pts.o: pts.c ${LINCLS} ${TOP_INCDIR}/afs/cmd.h AFS_component_version_number.c readgroup: readgroup.o libprot.a $(LIBS) - $(CC) ${CFLAGS} -o readgroup readgroup.o libprot.a ${LIBS} ${XLIBS} + $(AFS_LDRULE) readgroup.o libprot.a ${LIBS} ${XLIBS} readgroup.o: readgroup.c ${LINCLS} AFS_component_version_number.c readpwd: readpwd.o libprot.a $(LIBS) - $(CC) ${CFLAGS} -o readpwd readpwd.o libprot.a ${LIBS} ${XLIBS} + $(AFS_LDRULE) readpwd.o libprot.a ${LIBS} ${XLIBS} readpwd.o: readpwd.c ${LINCLS} AFS_component_version_number.c testpt: testpt.o libprot.a ${TOP_LIBDIR}/libcmd.a $(LIBS) case "$(SYS_NAME)" in \ *_darwin_12 ) \ - $(CC) ${CFLAGS} -o testpt testpt.o ${TOP_LIBDIR}/libcmd.a libprot.a $(LIBS) ;; \ + $(AFS_LDRULE) testpt.o ${TOP_LIBDIR}/libcmd.a \ + libprot.a $(LIBS) ;; \ * ) \ - $(CC) ${CFLAGS} -o testpt testpt.o -lm ${TOP_LIBDIR}/libcmd.a libprot.a $(LIBS) ${XLIBS} ;; \ + $(AFS_LDRULE) testpt.o -lm ${TOP_LIBDIR}/libcmd.a \ + libprot.a $(LIBS) ${XLIBS} ;; \ esac testpt.o: testpt.c ${INCLS} ${TOP_INCDIR}/afs/cmd.h AFS_component_version_number.c pt_util: pt_util.o ptutils.o ubik.o utils.o map.o libprot.a $(LIBS) - $(CC) ${CFLAGS} -o pt_util pt_util.o ptutils.o ubik.o utils.o map.o libprot.a ${TOP_LIBDIR}/libcmd.a $(LIBS) ${XLIBS} + $(AFS_LDRULE) pt_util.o ptutils.o ubik.o utils.o map.o libprot.a \ + ${TOP_LIBDIR}/libcmd.a $(LIBS) ${XLIBS} ubik.o: ubik.c ${INCLS} diff --git a/src/rx/Makefile.in b/src/rx/Makefile.in index ca93fcae34..1c8fef0d6f 100644 --- a/src/rx/Makefile.in +++ b/src/rx/Makefile.in @@ -7,12 +7,14 @@ srcdir=@srcdir@ include @TOP_OBJDIR@/src/config/Makefile.config +include @TOP_OBJDIR@/src/config/Makefile.lwp + INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ -CFLAGS=${COMMON_CFLAGS} ${XCFLAGS} ${ARCHFLAGS} ${RXDEBUG} +MODULE_CFLAGS=$(RXDEBUG) # # Generic xdr objects (or, at least, xdr stuff that's not newly defined for rx). diff --git a/src/rx/bulk.example/Makefile.in b/src/rx/bulk.example/Makefile.in index ce4ce0d4ed..49ee8f4e64 100644 --- a/src/rx/bulk.example/Makefile.in +++ b/src/rx/bulk.example/Makefile.in @@ -7,6 +7,8 @@ srcdir=@srcdir@ include @TOP_OBJDIR@/src/config/Makefile.config +include @TOP_OBJDUR@/src/config/Makefile.lwp + INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -17,15 +19,16 @@ SRCDIR=@srcdir@ LIBRX=@TOP_OBJDIR@/lib/librx.a DESTDIR=@srcdir@ LIBS=${LIBRX} ${TOP_OBJDIR}/lib/liblwp.a ${TOP_OBJDIR}/lib/libafsutil.a -CFLAGS=-g ${COMMON_INCL} -DDEBUG ${XCFLAGS} ${ARCHFLAGS} + +MODULE_CFLAGS=-DDEBUG all: bulk_client bulk_server bulk_client: bulk_client.o bulk_io.o ${LIBS} bulk.cs.o - ${CC} ${CFLAGS} -o bulk_client bulk_client.o bulk_io.o bulk.cs.o ${LIBS} + $(AFS_LDRULE) bulk_client.o bulk_io.o bulk.cs.o ${LIBS} bulk_server: bulk_server.o bulk_io.o bulk.ss.o ${LIBS} - ${CC} ${CFLAGS} -o bulk_server bulk_server.o bulk_io.o bulk.ss.o ${LIBS} + $(AFS_LDRULE) bulk_server.o bulk_io.o bulk.ss.o ${LIBS} bulk_client.o bulk_server.o bulk_io.o: bulk.h diff --git a/src/rx/bulktest/Makefile.in b/src/rx/bulktest/Makefile.in index c4312c807f..d9a3412f00 100644 --- a/src/rx/bulktest/Makefile.in +++ b/src/rx/bulktest/Makefile.in @@ -7,6 +7,8 @@ srcdir=@srcdir@ include @TOP_OBJDIR@/src/config/Makefile.config +include @TOP_OBJDIR@/src/config/Makefile.lwp + INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -18,15 +20,16 @@ LIBRX=${SRCDIR}/lib/librx.a DESTDIR=/usr/andy/ INSTALL=${SRCDIR}/bin/install LIBS=${LIBRX} ${SRCDIR}/lib/liblwp.a -CFLAGS=${DBG} -I.. -I. -I${SRCDIR}/include -DDEBUG ${XCFLAGS} ${ARCHFLAGS} + +MODULE_CFLAGS = -DDEBUG all: bulk_client bulk_server bulk_client: bulk_client.o bulk_io.o ${LIBS} bulk.cs.o - ${CC} ${CFLAGS} -o bulk_client bulk_client.o bulk_io.o bulk.cs.o ${LIBS} + $(AFS_LDRULE) bulk_client.o bulk_io.o bulk.cs.o ${LIBS} bulk_server: bulk_server.o bulk_io.o bulk.ss.o ${LIBS} - ${CC} ${CFLAGS} -o bulk_server bulk_server.o bulk_io.o bulk.ss.o ${LIBS} + $(AFS_LDRULE) bulk_server.o bulk_io.o bulk.ss.o ${LIBS} bulk_client.o bulk_server.o bulk_io.o: bulk.h diff --git a/src/rx/multi.example/Makefile.in b/src/rx/multi.example/Makefile.in index c328217996..ea85563fdb 100644 --- a/src/rx/multi.example/Makefile.in +++ b/src/rx/multi.example/Makefile.in @@ -7,6 +7,8 @@ srcdir=@srcdir@ include @TOP_OBJDIR@/src/config/Makefile.config +include @TOP_OBJDIR@/src/config/Makefile.lwp + INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -23,10 +25,10 @@ CFLAGS=${DBG} -I.. -I. -I${SRCDIR}/include -DDEBUG ${XCFLAGS} ${ARCHFLAGS} all: sample_client sample_server sample_client: sample_client.o ${LIBS} sample.cs.o - ${CC} ${CFLAGS} -o sample_client sample_client.o sample.cs.o ${LIBS} + $(AFS_LDRULE) sample_client.o sample.cs.o ${LIBS} sample_server: sample_server.o sample.ss.o ${LIBS} - ${CC} ${CFLAGS} -o sample_server sample_server.o sample.ss.o ${LIBS} + $(AFS_LDRULE) sample_server.o sample.ss.o ${LIBS} sample_client.o: sample.h sample_server.o: sample.h diff --git a/src/rx/simple.example/Makefile.in b/src/rx/simple.example/Makefile.in index 2575c50ba2..1054d01b61 100644 --- a/src/rx/simple.example/Makefile.in +++ b/src/rx/simple.example/Makefile.in @@ -9,21 +9,21 @@ srcdir=@srcdir@ include @TOP_OBJDIR@/src/config/Makefile.config # This set of definitions tests the lwp RX library -#CFLAGS=$(COMMON_CFLAGS) $(XCFLAGS) $(ARCHFLAGS) -#LIBS=${TOP_LIBDIR}/librx.a ${TOP_LIBDIR}/liblwp.a +# include @TOP_OBJDIR@/src/config/Makefile.lwp +# LIBS=${TOP_LIBDIR}/librx.a ${TOP_LIBDIR}/liblwp.a # This set of definitions tests the pthread one -CFLAGS=$(COMMON_CFLAGS) $(MT_CFLAGS) +include @TOP_OBJDIR@/src/config/Makefile.pthread LIBS=$(TOP_LIBDIR)/libafsauthent.a $(TOP_LIBDIR)/libafsrpc.a \ $(TOP_LIBDIR)/util.a all: sample_client sample_server sample_client: sample_client.o ${LIBS} sample.cs.o - ${CC} ${CFLAGS} -o sample_client sample_client.o sample.cs.o ${LIBS} + $(AFS_LDRULE) sample_client.o sample.cs.o ${LIBS} sample_server: sample_server.o sample.ss.o ${LIBS} - ${CC} ${CFLAGS} -o sample_server sample_server.o sample.ss.o ${LIBS} + $(AFS_LDRULE) sample_server.o sample.ss.o ${LIBS} sample_client.o: sample.h sample_server.o: sample.h diff --git a/src/rx/test/Makefile.in b/src/rx/test/Makefile.in index 562d98b849..fec24450a4 100644 --- a/src/rx/test/Makefile.in +++ b/src/rx/test/Makefile.in @@ -7,25 +7,26 @@ srcdir=@srcdir@ include @TOP_OBJDIR@/src/config/Makefile.config +include @TOP_OBJDIR@/src/config/Makefile.lwp + INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ - - -INCDIRS= -I${TOP_INCDIR} -I.. -I. -I${srcdir} -I${srcdir}/.. -I${TOP_OBJDIR}/src/config LDIRS= -L.. -L${TOP_LIBDIR} LIBS= ${TOP_LIBDIR}/libcmd.a ../librx.a ${TOP_LIBDIR}/liblwp.a \ ${TOP_LIBDIR}/util.a ${TOP_LIBDIR}/libsys.a ${XLIBS} -CFLAGS = ${OPTIMIZE} ${INCDIRS} -DRXDEBUG ${LDIRS} ${XCFLAGS} ${ARCHFLAGS} +MODULE_CFLAGS=-DRXDEBUG RXTESTOBJS = testclient.o testserver.o kstest.o kctest.o BASICINCLS = ../rx_clock.h ../rx_queue.h ../rx_event.h -LINK = ${CC} ${CFLAGS} -o $@ $@.o ${LIBS} +LINK = $(AFS_LDRULE) $@.o ${LIBS} +MT_LINK = $(CC) $(MT_CFLAGS) $(COMMON_CFLAGS) $(AFS_LDFLAGS) -o $@ \ + $@.o $(TOP_LIBDIR)/libafsrpc.a $(MT_LIBS) $(XLIBS) TESTS = testclient testserver kstest kctest testqueue tableGen generator @@ -40,47 +41,44 @@ test tests: ${TESTS} th_test th_tests: ${TH_TESTS} testclient: ../librx.a testclient.o - -${LINK} + ${LINK} testserver: ../librx.a testserver.o - -${LINK} + ${LINK} kstest: ../librx.a kstest.o - -${LINK} + ${LINK} kctest: ../librx.a kctest.o - -${LINK} + ${LINK} rxperf: rxperf.o ../librx.a - -${LINK} + ${LINK} # th_ versions only have link lines for Solaris now. -th_testclient: th_testclient.o ../../libafsrpc/libafsrpc.so - ${CC} ${CFLAGS} -mt -o th_testclient th_testclient.o \ - ../../libafsrpc/libafsrpc.so -lpthread +th_testclient: th_testclient.o $(TOP_LIBDIR)/libafsrpc.a + $(MT_LINK) th_testclient.o: testclient.c - ${CC} ${CFLAGS} -DAFS_PTHREAD_ENV -mt -c -o th_testclient.o \ + $(MT_CC) $(COMMON_CFLAGS) $(MT_CFLAGS) -c -o th_testclient.o \ ${srcdir}/testclient.c -th_testserver: th_testserver.o ../../libafsrpc/libafsrpc.so - ${CC} ${CFLAGS} -mt -o th_testserver th_testserver.o \ - ../../libafsrpc/libafsrpc.so -lpthread +th_testserver: th_testserver.o $(TOP_LIBDIR)/libafsrpc.a + $(MT_LINK) th_testserver.o: testserver.c - ${CC} ${CFLAGS} -DAFS_PTHREAD_ENV -mt -c -o th_testserver.o \ + $(MT_CC) $(COMMON_CFLAGS) $(MT_CFLAGS) -c -o th_testserver.o \ ${srcdir}/testserver.c th_rxperf: th_rxperf.o ${TOP_LIBDIR}/libafsrpc.a - ${MT_CC} ${MT_CFLAGS} -o th_rxperf th_rxperf.o \ - ${TOP_LIBDIR}/libafsrpc.a ${MT_LIBS} ${XLIBS} + $(MT_LINK) th_rxperf.o: rxperf.c - ${MT_CC} ${MT_CFLAGS} ${CFLAGS} -c $(srcdir)/rxperf.c \ + $(MT_CC) $(COMMON_CFLAGS) $(MT_CFLAGS) -c $(srcdir)/rxperf.c \ -o th_rxperf.o testqueue: ../librx.a testqueue.o - -${LINK} + ${LINK} ${RXTESTOBJS}: ${BASICINCLS} ../rx.h diff --git a/src/rxdebug/Makefile.in b/src/rxdebug/Makefile.in index e06e534a33..0995b5e544 100644 --- a/src/rxdebug/Makefile.in +++ b/src/rxdebug/Makefile.in @@ -7,13 +7,13 @@ srcdir=@srcdir@ include @TOP_OBJDIR@/src/config/Makefile.config +include @TOP_OBJDIR@/src/config/Makefile.lwp + INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ -CFLAGS=${COMMON_CFLAGS} ${XCFLAGS} ${ARCHFLAGS} - LIBS=${TOP_LIBDIR}/librx.a ${TOP_LIBDIR}/liblwp.a ${TOP_LIBDIR}/libcmd.a \ ${TOP_LIBDIR}/libsys.a ${TOP_LIBDIR}/libafsutil.a @@ -21,15 +21,15 @@ all: rxdebug rxdumptrace rxdebug.o: rxdebug.c +CFLAGS_rxdumptrace.o=-DDUMPTRACE rxdumptrace.o: ../rx/rx_trace.c - $(CC) $(CFLAGS) -DDUMPTRACE -c -o rxdumptrace.o ${srcdir}/../rx/rx_trace.c + $(AFS_CCRULE) $(srcdir)/../rx/rx_trace.c rxdumptrace: rxdumptrace.o ${LIBS} - $(RM) -f rxdumptrace - $(CC) $(CFLAGS) -o rxdumptrace rxdumptrace.o ${LIBS} ${XLIBS} + $(AFS_LDRULE) rxdumptrace.o ${LIBS} ${XLIBS} rxdebug: rxdebug.o ${LIBS} - ${CC} ${CFLAGS} -o $@ $@.o ${LIBS} ${XLIBS} + $(AFS_LDRULE) rxdebug.o ${LIBS} ${XLIBS} # # Install targets diff --git a/src/rxgen/Makefile.in b/src/rxgen/Makefile.in index 89146bc60c..28918610bc 100644 --- a/src/rxgen/Makefile.in +++ b/src/rxgen/Makefile.in @@ -6,6 +6,8 @@ # srcdir=@srcdir@ include @TOP_OBJDIR@/src/config/Makefile.config +include @TOP_OBJDIR@/src/config/Makefile.lwp + INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -25,10 +27,9 @@ ${TOP_INCDIR}/afs/rxgen_consts.h: rxgen_consts.h ${INSTALL_DATA} $? $@ rxgen: $(OBJS) AFS_component_version_number.c $(HDRS) - $(CC) $(CFLAGS) $(OBJS) $(XLIBS) -o $@ + $(AFS_LDRULE) $(OBJS) $(XLIBS) -rpc_main.o: rpc_main.c - $(CCOBJ) $(CFLAGS) -c ${srcdir}/rpc_main.c -DPATH_CPP="\"$(PATH_CPP)\"" +CFLAGS_rpc_main.o= -DPATH_CPP="\"$(PATH_CPP)\"" # # Install targets diff --git a/src/rxkad/Makefile.in b/src/rxkad/Makefile.in index 625b179ad1..8194022bdb 100644 --- a/src/rxkad/Makefile.in +++ b/src/rxkad/Makefile.in @@ -9,6 +9,8 @@ srcdir=@srcdir@ include @TOP_OBJDIR@/src/config/Makefile.config +include @TOP_OBJDIR@/src/config/Makefile.lwp + INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -70,7 +72,6 @@ librxkad.a: ${OBJS} AFS_component_version_number.o rxkad_client.o: fcrypt.h private_data.h rxkad_client.c ${INCLS} rxkad_server.o: rxkad_server.c fcrypt.h private_data.h ${INCLS} - $(CC) $(CFLAGS) -c ${srcdir}/rxkad_server.c rxkad_common.o: fcrypt.h private_data.h rxkad_common.c ${INCLS} @@ -81,10 +82,8 @@ rxkad_errs.c rxkad.h: rxkad_errs.et rxkad.p.h ${COMPILE_ET} -p ${srcdir} rxkad_errs -h rxkad ticket.o: ticket.c lifetimes.h ${INCLS} - $(CC) $(CFLAGS) -c ${srcdir}/ticket.c ticket5.o: ticket5.c v5gen.c v5der.c v5gen-rewrite.h ${INCLS} - $(CC) -I${srcdir} $(CFLAGS) -c ${srcdir}/ticket5.c crc.o: crc.c ${INCLS} @@ -99,10 +98,10 @@ crypt_conn.o: crypt_conn.c fcrypt.h private_data.h ${INCLS} tcrypt.o: tcrypt.c AFS_component_version_number.o tcrypt: tcrypt.o librxkad.a - ${CC} -o tcrypt tcrypt.o librxkad.a + $(AFS_LDRULE) tcrypt.o librxkad.a fc_test: ${fc_test_OBJS} ${fc_test_LIBS} - ${CC} ${CFLAGS} -o fc_test ${fc_test_OBJS} ${fc_test_LIBS} ${XLIBS} + $(AFS_LDRULE) ${fc_test_OBJS} ${fc_test_LIBS} ${XLIBS} fc_test.o: ${INCLS} diff --git a/src/rxkad/test/Makefile.in b/src/rxkad/test/Makefile.in index 7f6ed11ecf..97ce973623 100644 --- a/src/rxkad/test/Makefile.in +++ b/src/rxkad/test/Makefile.in @@ -7,6 +7,8 @@ srcdir=@srcdir@ include @TOP_OBJDIR@/src/config/Makefile.config +include @TOP_OBJDIR@/src/config/Makefile.lwp + INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -32,7 +34,7 @@ THLIBS= ${TOP_LIBDIR}/libcmd.a ${TOP_LIBDIR}/libcom_err.a \ ${TOP_LIBDIR}/libafsauthent.a ${TOP_LIBDIR}/libafsrpc.a \ ${MT_LIBS} ${ULIBS} ${XLIBS} ${LIBRPC} -lpthread -THRULE = ${MT_CC} ${CFLAGS} ${MT_CFLAGS} +THRULE = ${MT_CC} $(COMMON_CFLAGS) $(MT_CFLAGS) noversion all test system: stress @@ -88,13 +90,14 @@ th_stress_s.o: stress_s.c ${HEADERS} stress: stress.o stress.xdr.o stress_c.o stress_s.o stress.cs.o \ stress.ss.o stress_errs.o - $(CC) $(CFLAGS) -o stress stress.o stress.xdr.o stress_c.o \ - stress_s.o stress.cs.o stress.ss.o stress_errs.o ${LIBS} ${XLIBS} + $(AFS_LDRULE) stress.o stress.xdr.o stress_c.o \ + stress_s.o stress.cs.o stress.ss.o stress_errs.o \ + ${LIBS} ${XLIBS} th_stress: th_stress.o th_stress.xdr.o th_stress_c.o th_stress_s.o \ th_stress.cs.o th_stress.ss.o stress_errs.o \ ${LIBRPC} - ${CC} ${CFLAGS} ${THFLAGS} -o th_stress th_stress.o th_stress.xdr.o \ - th_stress_c.o th_stress_s.o th_stress.cs.o th_stress.ss.o \ - stress_errs.o ${THLIBS} ${XLIBS} + $(AFS_LDRULE) th_stress.o th_stress.xdr.o th_stress_c.o \ + th_stress_s.o th_stress.cs.o th_stress.ss.o stress_errs.o \ + ${THLIBS} ${XLIBS} diff --git a/src/rxstat/Makefile.in b/src/rxstat/Makefile.in index 052deebf94..fe65193dd0 100644 --- a/src/rxstat/Makefile.in +++ b/src/rxstat/Makefile.in @@ -7,6 +7,8 @@ srcdir=@srcdir@ include @TOP_OBJDIR@/src/config/Makefile.config +include @TOP_OBJDIR@/src/config/Makefile.lwp + INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ diff --git a/src/scout/Makefile.in b/src/scout/Makefile.in index acfd43c309..75290b12ea 100644 --- a/src/scout/Makefile.in +++ b/src/scout/Makefile.in @@ -7,6 +7,8 @@ srcdir=@srcdir@ include @TOP_OBJDIR@/src/config/Makefile.config +include @TOP_OBJDIR@/src/config/Makefile.lwp + INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -53,7 +55,7 @@ all: scout scout.o: scout.c ${INCLS} AFS_component_version_number.c scout: scout.o $(LIBS) - ${CC} ${LDFLAGS} -o scout scout.o $(LIBS) ${TXLIBS} ${XLIBS} + $(AFS_LDRULE) scout.o $(LIBS) ${TXLIBS} ${XLIBS} # # Installation targets diff --git a/src/sgistuff/Makefile.in b/src/sgistuff/Makefile.in index 44eec28502..09a03d1e3b 100644 --- a/src/sgistuff/Makefile.in +++ b/src/sgistuff/Makefile.in @@ -7,6 +7,8 @@ srcdir=@srcdir@ include @TOP_OBJDIR@/src/config/Makefile.config +include @TOP_OBJDIR@/src/config/Makefile.lwp + INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -19,8 +21,6 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ # Note that if afskauthlib.so gets installed on a client # machine then that will be used .. # -CFLAGS=${OPTIMIZE} -I${TOP_OBJDIR}/src/config -I${TOP_INCDIR} ${XCFLAGS} ${ARCHFLAGS} -LDFLAGS = ${OPTIMIZE} ${XLDFLAGS} ${ARCHFLAGS} LIBDIR=${TOP_LIBDIR}/ AFSLIBS=${TOP_LIBDIR}/libkauth.a ${TOP_LIBDIR}/libprot.a ${LIBDIR}/libubik.a \ ${TOP_LIBDIR}/libauth.a ${TOP_LIBDIR}/librxkad.a ${TOP_LIBDIR}/libsys.a \ @@ -58,19 +58,15 @@ clean: $(RM) -f $(AUTHLIBS) $(AUTHFILES) afsauthlib.so: sgi_auth.o ${AFSLIBS} ${AUTHFILES} - $(LD) ${LDFLAGS} -shared -all -o afsauthlib.so sgi_auth.o $(AFSLIBS) ${AUTHFILES} + $(LD) ${AFS_LDFLAGS} -shared -all -o afsauthlib.so sgi_auth.o $(AFSLIBS) ${AUTHFILES} afskauthlib.so: sgi_auth.o ${KAFSLIBS} ${AUTHFILES} - $(LD) ${LDFLAGS} -shared -all -o afskauthlib.so sgi_auth.o $(KAFSLIBS) ${AUTHFILES} + $(LD) ${AFS_LDFLAGS} -shared -all -o afskauthlib.so sgi_auth.o $(KAFSLIBS) ${AUTHFILES} ta-rauth.o: ta-rauth.c - ${CC} ${CFLAGS} -c ta-rauth.c rcmd.o: rcmd.c - ${CC} ${CFLAGS} -c rcmd.c herror.o: herror.c - ${CC} ${CFLAGS} -c herror.c sgi_auth.o: sgi_auth.c - ${CC} ${CFLAGS} -c sgi_auth.c diff --git a/src/shlibafsauthent/Makefile.in b/src/shlibafsauthent/Makefile.in index 0ff87ce632..4d4e1fff22 100644 --- a/src/shlibafsauthent/Makefile.in +++ b/src/shlibafsauthent/Makefile.in @@ -14,23 +14,23 @@ LIBAFSAUTHENTMINOR=1 srcdir=@srcdir@ include @TOP_OBJDIR@/src/config/Makefile.config +include @TOP_OBJDIR@/src/config/Makefile.shared + INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ -CC=${MT_CC} -CFLAGS=${COMMON_CFLAGS} ${MT_CFLAGS} ${SHLIB_CFLAGS} -I../auth -I../kauth -I../ptserver -I../sys -CCRULE = ${CC} ${CFLAGS} -c $? +MODULE_CFLAGS=-I../auth -I../kauth -I../ptserver -I../sys -AUDIT= ../audit -AUTH = ../auth -KAUTH = ../kauth -UBIK = ../ubik -UTIL = ../util -RXKAD = ../rxkad -PTSERVER = ../ptserver -SYS = ../sys +AUDIT= $(srcdir)/../audit +AUTH = $(srcdir)/../auth +KAUTH = $(srcdir)/../kauth +UBIK = $(srcdir)/../ubik +UTIL = $(srcdir)/../util +RXKAD = $(srcdir)/../rxkad +PTSERVER = $(srcdir)/../ptserver +SYS = $(srcdir)/../sys AUDITOBJS = audit.o audit-file.o audit-sysvmq.o @@ -143,173 +143,158 @@ libafsauthent_pic.a: ${LIBOBJS} $(RANLIB) $@ audit.o: ${AUDIT}/audit.c - ${CCRULE} + ${AFS_CCRULE} ${AUDIT}/audit.c audit-file.o: ${AUDIT}/audit-file.c - ${CCRULE} + ${AFS_CCRULE} ${AUDIT}/audit-file.c audit-sysvmq.o: ${AUDIT}/audit-sysvmq.c - ${CCRULE} + ${AFS_CCRULE} ${AUDIT}/audit-sysvmq.c cellconfig.o: ${AUTH}/cellconfig.c - ${CCRULE} + ${AFS_CCRULE} -I../auth ${AUTH}/cellconfig.c ktc.o: ${AUTH}/ktc.c - ${CCRULE} + ${AFS_CCRULE} -I../auth ${AUTH}/ktc.c + +token.o: ${AUTH}/token.c + ${AFS_CCRULE} -I../auth ${AUTH}/token.c + +token.xdr.o: ../auth/token.xdr.c + ${AFS_CCRULE} -I../auth ../auth/token.xdr.c userok.o: ${AUTH}/userok.c - ${CCRULE} + ${AFS_CCRULE} -I../auth ${AUTH}/userok.c writeconfig.o: ${AUTH}/writeconfig.c - ${CCRULE} + ${AFS_CCRULE} -I../auth ${AUTH}/writeconfig.c authcon.o: ${AUTH}/authcon.c - ${CCRULE} + ${AFS_CCRULE} -I../auth ${AUTH}/authcon.c -ktc_errors.o: ${AUTH}/ktc_errors.c - ${CCRULE} +ktc_errors.o: ../auth/ktc_errors.c + ${AFS_CCRULE} ../auth/ktc_errors.c -acfg_errors.o: ${AUTH}/acfg_errors.c - ${CCRULE} +acfg_errors.o: ../auth/acfg_errors.c + ${AFS_CCRULE} ../auth/acfg_errors.c -token.xdr.o: ${AUTH}/token.xdr.c - ${CCRULE} +kauth.xdr.o: ../kauth/kauth.xdr.c + ${AFS_CCRULE} ../kauth/kauth.xdr.c -token.o :${AUTH}/token.c - ${CCRULE} - -kauth.xdr.o: ${KAUTH}/kauth.xdr.c - ${CCRULE} - -kauth.cs.o: ${KAUTH}/kauth.cs.c - ${CCRULE} +kauth.cs.o: ../kauth/kauth.cs.c + ${AFS_CCRULE} ../kauth/kauth.cs.c kaaux.o: ${KAUTH}/kaaux.c - ${CCRULE} + ${AFS_CCRULE} -I../kauth ${KAUTH}/kaaux.c client.o: ${KAUTH}/client.c - ${CCRULE} + ${AFS_CCRULE} -I../kauth ${KAUTH}/client.c authclient.o: ${KAUTH}/authclient.c - ${CCRULE} + ${AFS_CCRULE} -I../kauth ${KAUTH}/authclient.c katoken.o: ${KAUTH}/katoken.c - ${CCRULE} + ${AFS_CCRULE} -I../kauth ${KAUTH}/katoken.c kautils.o: ${KAUTH}/kautils.c - ${CCRULE} + ${AFS_CCRULE} -I../kauth ${KAUTH}/kautils.c kalocalcell.o: ${KAUTH}/kalocalcell.c - ${CCRULE} + ${AFS_CCRULE} -I ../kauth ${KAUTH}/kalocalcell.c -kaerrors.o: ${KAUTH}/kaerrors.c - ${CCRULE} +kaerrors.o: ../kauth/kaerrors.c + ${AFS_CCRULE} ../kauth/kaerrors.c user.o: ${KAUTH}/user.c - ${CCRULE} + ${AFS_CCRULE} -I ../kauth ${KAUTH}/user.c read_passwd.o: ${KAUTH}/read_passwd.c - ${CCRULE} + ${AFS_CCRULE} ${KAUTH}/read_passwd.c ubikclient.o: ${UBIK}/ubikclient.c - ${CCRULE} + ${AFS_CCRULE} ${UBIK}/ubikclient.c uinit.o: ${UBIK}/uinit.c - ${CCRULE} + ${AFS_CCRULE} ${UBIK}/uinit.c -uerrors.o: ${UBIK}/uerrors.c - ${CCRULE} +uerrors.o: ../ubik/uerrors.c + ${AFS_CCRULE} ../ubik/uerrors.c -ubik_int.cs.o: ${UBIK}/ubik_int.cs.c - ${CCRULE} +ubik_int.cs.o: ../ubik/ubik_int.cs.c + ${AFS_CCRULE} ../ubik/ubik_int.cs.c + +ubik_int.xdr.o: ../ubik/ubik_int.xdr.c + ${AFS_CCRULE} ../ubik/ubik_int.xdr.c -ubik_int.xdr.o: ${UBIK}/ubik_int.xdr.c - ${CCRULE} get_krbrlm.o: ${UTIL}/get_krbrlm.c - ${CCRULE} + ${AFS_CCRULE} ${UTIL}/get_krbrlm.c dirpath.o: ${UTIL}/dirpath.c - ${CCRULE} + ${AFS_CCRULE} ${UTIL}/dirpath.c serverLog.o: ${UTIL}/serverLog.c - ${CCRULE} + ${AFS_CCRULE} ${UTIL}/serverLog.c snprintf.o: ${UTIL}/snprintf.c - ${CCRULE} + ${AFS_CCRULE} ${UTIL}/snprintf.c strlcat.o: ${UTIL}/strlcat.c - ${CCRULE} + ${AFS_CCRULE} ${UTIL}/strlcat.c strlcpy.o: ${UTIL}/strlcpy.c - ${CCRULE} + ${AFS_CCRULE} ${UTIL}/strlcpy.c fileutil.o: ${UTIL}/fileutil.c - ${CCRULE} + ${AFS_CCRULE} ${UTIL}/fileutil.c pthread_glock.o: ${UTIL}/pthread_glock.c - ${CCRULE} + ${AFS_CCRULE} ${UTIL}/pthread_glock.c -rxkad_errs.o: ${RXKAD}/rxkad_errs.c - ${CCRULE} +rxkad_errs.o: ../rxkad/rxkad_errs.c + ${AFS_CCRULE} ../rxkad/rxkad_errs.c ptclient.o: ${PTSERVER}/ptclient.c - ${CCRULE} + ${AFS_CCRULE} -I../ptserver ${PTSERVER}/ptclient.c -# The special treatment of this file for hp_ux110 is because of a bug -# in version A.11.01.00 of the HP C compiler. This bug appears to be -# fixed in version A.11.01.02 of the HP C compiler, however this version -# of the compiler is not installed on all of our build machines. -# The symptom of the problem is an error when linking the pthread fileserver: -# /usr/ccs/bin/ld: TP override with DATA_ONE_SYM fixup for non thread local -# storage symbol pr_Initialize in file DEST/lib/libafsauthent.a(ptuser.o) ptuser.o: ${PTSERVER}/ptuser.c - set -x; \ - case ${SYS_NAME} in \ - hp_ux11*) \ - set X `echo ${CCRULE} | sed s/-g//`; shift; \ - "$$@" \ - ;; \ - *) \ - ${CCRULE} \ - ;; \ - esac + ${AFS_CCRULE} -I../ptserver ${PTSERVER}/ptuser.c display.o: ${PTSERVER}/display.c - ${CCRULE} + ${AFS_CCRULE} -I../ptserver ${PTSERVER}/display.c -ptint.cs.o: ${PTSERVER}/ptint.cs.c - ${CCRULE} +ptint.cs.o: ../ptserver/ptint.cs.c + ${AFS_CCRULE} ../ptserver/ptint.cs.c -ptint.xdr.o: ${PTSERVER}/ptint.xdr.c - ${CCRULE} +ptint.xdr.o: ../ptserver/ptint.xdr.c + ${AFS_CCRULE} ../ptserver/ptint.xdr.c -pterror.o: ${PTSERVER}/pterror.c - ${CCRULE} +pterror.o: ../ptserver/pterror.c + ${AFS_CCRULE} ../ptserver/pterror.c rmtsysc.o: ${SYS}/rmtsysc.c - ${CCRULE} + ${AFS_CCRULE} -I../sys ${SYS}/rmtsysc.c -rmtsys.xdr.o: ${SYS}/rmtsys.xdr.c - ${CCRULE} +rmtsys.xdr.o: ../sys/rmtsys.xdr.c + ${AFS_CCRULE} ../sys/rmtsys.xdr.c -rmtsys.cs.o: ${SYS}/rmtsys.cs.c - ${CCRULE} +rmtsys.cs.o: ../sys/rmtsys.cs.c + ${AFS_CCRULE} ../sys/rmtsys.cs.c afssyscalls.o: ${SYS}/afssyscalls.c - ${CCRULE} + ${AFS_CCRULE} ${SYS}/afssyscalls.c rmtsysnet.o: ${SYS}/rmtsysnet.c - ${CCRULE} + ${AFS_CCRULE} -I../sys ${SYS}/rmtsysnet.c glue.o: ${SYS}/glue.c - ${CCRULE} + ${AFS_CCRULE} ${SYS}/glue.c setpag.o: ${SYS}/setpag.c - ${CCRULE} + ${AFS_CCRULE} ${SYS}/setpag.c pioctl.o: ${SYS}/pioctl.c - ${CCRULE} + ${AFS_CCRULE} ${SYS}/pioctl.c clean: $(RM) -f *.o *.a libafsauthent.a* libafsauthent.sl* libafsauthent.so* \ diff --git a/src/shlibafsrpc/Makefile.in b/src/shlibafsrpc/Makefile.in index 1b73b962f4..925183137b 100644 --- a/src/shlibafsrpc/Makefile.in +++ b/src/shlibafsrpc/Makefile.in @@ -16,23 +16,24 @@ LIBAFSRPCMINOR=3 srcdir=@srcdir@ include @TOP_OBJDIR@/src/config/Makefile.config +include @TOP_OBJDIR@/src/config/Makefile.shared + INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ -CC=${MT_CC} -CFLAGS = ${COMMON_CFLAGS} -DRXDEBUG ${MT_CFLAGS} ${SHLIB_CFLAGS} +MODULE_CFLAGS=-DRXDEBUG + SFLAGS=-P -I${TOP_INCDIR} -RX = ../rx -CCRULE = ${CC} ${CFLAGS} -c $? +RX = $(srcdir)/../rx RXKAD = $(srcdir)/../rxkad -RXSTAT = ../rxstat -FSINT = ../fsint -DES = ../des -COMERR = ../comerr -UTIL = ../util +RXSTAT = $(srcdir)/../rxstat +FSINT = $(srcdir)/../fsint +DES = $(srcdir)/../des +COMERR = $(srcdir)/../comerr +UTIL = $(srcdir)/../util SYS = ${srcdir}/../sys LWP = ${srcdir}/../lwp @@ -173,124 +174,125 @@ libafsrpc_pic.a: ${LIBOBJS} $(RANLIB) $@ rx_event.o: ${RX}/rx_event.c - ${CCRULE} + $(AFS_CCRULE) $(RX)/rx_event.c rx_user.o: ${RX}/rx_user.c - ${CCRULE} + $(AFS_CCRULE) $(RX)/rx_user.c rx_pthread.o: ${RX}/rx_pthread.c - ${CCRULE} + $(AFS_CCRULE) $(RX)/rx_pthread.c +CFLAGS_rx.o = @CFLAGS_NOERROR@ rx.o: ${RX}/rx.c - ${CCRULE} @CFLAGS_NOERROR@ + $(AFS_CCRULE) $(RX)/rx.c rx_conncache.o: ${RX}/rx_conncache.c - ${CCRULE} + $(AFS_CCRULE) $(RX)/rx_conncache.c rx_null.o: ${RX}/rx_null.c - ${CCRULE} + $(AFS_CCRULE) $(RX)/rx_null.c rx_opaque.o: ${RX}/rx_opaque.c - ${CCRULE} + $(AFS_CCRULE) $(RX)/rx_opaque.c -rx_globals.o: ${RX}/rx_globals.c - ${CCRULE} - -rx_getaddr.o: ${RX}/rx_getaddr.c - ${CCRULE} +rx_globals.o: ${RX}/rx_globals.c + $(AFS_CCRULE) $(RX)/rx_globals.c rx_identity.o: ${RX}/rx_identity.c - ${CCRULE} + $(AFS_CCRULE) $(RX)/rx_identity.c + +rx_getaddr.o: ${RX}/rx_getaddr.c + $(AFS_CCRULE) $(RX)/rx_getaddr.c rx_misc.o: ${RX}/rx_misc.c - ${CCRULE} + $(AFS_CCRULE) $(RX)/rx_misc.c rx_packet.o: ${RX}/rx_packet.c - ${CCRULE} - -rx_rdwr.o: ${RX}/rx_rdwr.c - ${CCRULE} + $(AFS_CCRULE) $(RX)/rx_packet.c rx_stats.o: ${RX}/rx_stats.c - ${CCRULE} + $(AFS_CCRULE) $(RX)/rx_stats.c + +rx_rdwr.o: ${RX}/rx_rdwr.c + $(AFS_CCRULE) $(RX)/rx_rdwr.c rx_trace.o: ${RX}/rx_trace.c - ${CCRULE} + $(AFS_CCRULE) $(RX)/rx_trace.c rx_multi.o: ${RX}/rx_multi.c - ${CCRULE} + $(AFS_CCRULE) $(RX)/rx_multi.c rxkad_client.o: ${RXKAD}/rxkad_client.c - ${CCRULE} -I../rxkad + $(AFS_CCRULE) -I../rxkad $(RXKAD)/rxkad_client.c rxkad_server.o: ${RXKAD}/rxkad_server.c - ${CCRULE} -I../rxkad + $(AFS_CCRULE) -I../rxkad $(RXKAD)/rxkad_server.c rxkad_common.o: ${RXKAD}/rxkad_common.c - ${CCRULE} -I../rxkad + $(AFS_CCRULE) -I../rxkad $(RXKAD)/rxkad_common.c ticket.o: ${RXKAD}/ticket.c - ${CCRULE} -I ../rxkad + $(AFS_CCRULE) -I../rxkad $(RXKAD)/ticket.c ticket5.o: ${RXKAD}/ticket5.c - ${CCRULE} -I../rxkad -I${RXKAD} + $(AFS_CCRULE) -I../rxkad -I$(RXKAD) $(RXKAD)/ticket5.c crc.o: ${RXKAD}/crc.c - ${CCRULE} + $(AFS_CCRULE) -I../rxkad $(RXKAD)/crc.c md4.o: ${RXKAD}/md4.c - ${CCRULE} + $(AFS_CCRULE) -I../rxkad $(RXKAD)/md4.c md5.o: ${RXKAD}/md5.c - ${CCRULE} + $(AFS_CCRULE) -I../rxkad $(RXKAD)/md5.c fcrypt.o: ${RXKAD}/fcrypt.c - ${CCRULE} -I../rxkad -I${RXKAD} + $(AFS_CCRULE) -I../rxkad $(RXKAD)/fcrypt.c crypt_conn.o: ${RXKAD}/crypt_conn.c - ${CCRULE} -I../rxkad -I${RXKAD} + $(AFS_CCRULE) -I../rxkad $(RXKAD)/crypt_conn.c -AFS_component_version_number.o: ${RX}/AFS_component_version_number.c - ${CCRULE} +AFS_component_version_number.o: ${TOP_OBJDIR}/src/rx/AFS_component_version_number.c + $(AFS_CCRULE) ${TOP_OBJDIR}/src/rx/AFS_component_version_number.c xdr.o: ${RX}/xdr.c - ${CCRULE} + $(AFS_CCRULE) $(RX)/xdr.c xdr_int32.o: ${RX}/xdr_int32.c - ${CCRULE} + $(AFS_CCRULE) $(RX)/xdr_int32.c xdr_int64.o: ${RX}/xdr_int64.c - ${CCRULE} + $(AFS_CCRULE) $(RX)/xdr_int64.c xdr_array.o: ${RX}/xdr_array.c - ${CCRULE} + $(AFS_CCRULE) $(RX)/xdr_array.c xdr_arrayn.o: ${RX}/xdr_arrayn.c - ${CCRULE} + $(AFS_CCRULE) $(RX)/xdr_arrayn.c xdr_float.o: ${RX}/xdr_float.c - ${CCRULE} - -xdr_mem.o: ${RX}/xdr_mem.c - ${CCRULE} + $(AFS_CCRULE) $(RX)/xdr_float.c xdr_len.o: ${RX}/xdr_len.c - ${CCRULE} + $(AFS_CCRULE) $(RX)/xdr_len.c + +xdr_mem.o: ${RX}/xdr_mem.c + $(AFS_CCRULE) $(RX)/xdr_mem.c xdr_rec.o: ${RX}/xdr_rec.c - ${CCRULE} + $(AFS_CCRULE) $(RX)/xdr_rec.c xdr_refernce.o: ${RX}/xdr_refernce.c - ${CCRULE} + $(AFS_CCRULE) $(RX)/xdr_refernce.c xdr_rx.o: ${RX}/xdr_rx.c - ${CCRULE} + $(AFS_CCRULE) $(RX)/xdr_rx.c xdr_update.o: ${RX}/xdr_update.c - ${CCRULE} + $(AFS_CCRULE) $(RX)/xdr_update.c xdr_afsuuid.o: ${RX}/xdr_afsuuid.c - ${CCRULE} + $(AFS_CCRULE) $(RX)/xdr_afsuuid.c # Note that the special case statement for compiling des.c is present # simply to work around a compiler bug on HP-UX 11.0. The symptom of @@ -322,79 +324,80 @@ des.o: ${DES}/des.c set -x; \ case ${SYS_NAME} in \ hp_ux11*) \ - set X `echo ${CCRULE} | sed s/-g//`; shift; \ + set X `echo ${AFS_CCRULE} ${DES}/des.c | sed s/-g//`; shift; \ "$$@" -I../des \ ;; \ *) \ - ${CCRULE} -I../des \ + ${AFS_CCRULE} -I../des ${DES}/des.c \ ;; \ esac + crypt.o: ${DES}/crypt.c - ${CCRULE} + $(AFS_CCRULE) $(DES)/crypt.c cbc_encrypt.o: ${DES}/cbc_encrypt.c - ${CCRULE} + $(AFS_CCRULE) $(DES)/cbc_encrypt.c pcbc_encrypt.o: ${DES}/pcbc_encrypt.c - ${CCRULE} + $(AFS_CCRULE) $(DES)/pcbc_encrypt.c cksum.o: ${DES}/cksum.c - ${CCRULE} + $(AFS_CCRULE) $(DES)/cksum.c new_rnd_key.o: ${DES}/new_rnd_key.c - ${CCRULE} + $(AFS_CCRULE) $(DES)/new_rnd_key.c key_sched.o: ${DES}/key_sched.c - ${CCRULE} -I../des + $(AFS_CCRULE) -I../des $(DES)/key_sched.c debug_decl.o: ${DES}/debug_decl.c - ${CCRULE} + $(AFS_CCRULE) $(DES)/debug_decl.c quad_cksum.o: ${DES}/quad_cksum.c - ${CCRULE} + $(AFS_CCRULE) $(DES)/quad_cksum.c key_parity.o: ${DES}/key_parity.c - ${CCRULE} -I../des + $(AFS_CCRULE) -I../des $(DES)/key_parity.c weak_key.o: ${DES}/weak_key.c - ${CCRULE} + $(AFS_CCRULE) $(DES)/weak_key.c strng_to_key.o: ${DES}/strng_to_key.c - ${CCRULE} + $(AFS_CCRULE) $(DES)/strng_to_key.c misc.o: ${DES}/misc.c - ${CCRULE} + $(AFS_CCRULE) $(DES)/misc.c util.o: ${DES}/util.c - ${CCRULE} + $(AFS_CCRULE) $(DES)/util.c error_msg.o: ${COMERR}/error_msg.c - ${CCRULE} + $(AFS_CCRULE) $(COMERR)/error_msg.c et_name.o: ${COMERR}/et_name.c - ${CCRULE} + $(AFS_CCRULE) $(COMERR)/et_name.c com_err.o: ${COMERR}/com_err.c - ${CCRULE} + $(AFS_CCRULE) $(COMERR)/com_err.c casestrcpy.o: ${UTIL}/casestrcpy.c - ${CCRULE} + $(AFS_CCRULE) $(UTIL)/casestrcpy.c assert.o: ${UTIL}/assert.c - ${CCRULE} + $(AFS_CCRULE) $(UTIL)/assert.c base64.o: ${UTIL}/base64.c - ${CCRULE} + $(AFS_CCRULE) $(UTIL)/base64.c strlcat.o: ${UTIL}/strlcat.c - ${CCRULE} + $(AFS_CCRULE) $(UTIL)/strlcat.c strlcpy.o: ${UTIL}/strlcpy.c - ${CCRULE} + $(AFS_CCRULE) $(UTIL)/strlcpy.c fasttime.o: ${LWP}/fasttime.c - ${CCRULE} ${LWP}/fasttime.c + $(AFS_CCRULE) $(LWP)/fasttime.c syscall.o: ${SYS}/syscall.s case "$(SYS_NAME)" in \ @@ -403,14 +406,14 @@ syscall.o: ${SYS}/syscall.s as -o syscall.o syscall.ss; \ $(RM) syscall.ss;; \ sgi_* | *_darwin_* ) \ - ${CC} ${CFLAGS} -c ${SYS}/syscall.s;; \ + ${CC} ${AFS_CFLAGS} -c ${SYS}/syscall.s;; \ alpha_dux?? ) \ - ${AS} -P ${CFLAGS} -D_NO_PROTO -DMACH -DOSF -nostdinc -traditional -DASSEMBLER ${SYS}/syscall.s; \ + ${AS} -P ${AFS_CFLAGS} -D_NO_PROTO -DMACH -DOSF -nostdinc -traditional -DASSEMBLER ${SYS}/syscall.s; \ ${AS} -o syscall.o syscall.i; \ $(RM) -f syscall.ss syscall.i;; \ *fbsd* ) \ touch syscall.c ; \ - ${CC} ${CFLAGS} -c syscall.c;; \ + ${CC} ${AFS_CFLAGS} -c syscall.c;; \ *) \ $(PATH_CPP) ${SFLAGS} ${SYS}/syscall.s > syscall.ss; \ as -o syscall.o syscall.ss; \ @@ -418,31 +421,31 @@ syscall.o: ${SYS}/syscall.s esac rxstat.o: ${RXSTAT}/rxstat.c - ${CCRULE} + $(AFS_CCRULE) $(RXSTAT)/rxstat.c -rxstat.cs.o: ${RXSTAT}/rxstat.cs.c - ${CCRULE} +rxstat.cs.o: ${TOP_OBJDIR}/src/rxstat/rxstat.cs.c + $(AFS_CCRULE) ${TOP_OBJDIR}/src/rxstat/rxstat.cs.c -rxstat.ss.o: ${RXSTAT}/rxstat.ss.c - ${CCRULE} +rxstat.ss.o: ${TOP_OBJDIR}/src/rxstat/rxstat.ss.c + $(AFS_CCRULE) ${TOP_OBJDIR}/src/rxstat/rxstat.ss.c -rxstat.xdr.o: ${RXSTAT}/rxstat.xdr.c - ${CCRULE} +rxstat.xdr.o: ${TOP_OBJDIR}/src/rxstat/rxstat.xdr.c + $(AFS_CCRULE) ${TOP_OBJDIR}/src/rxstat/rxstat.xdr.c -afsint.cs.o: ${FSINT}/afsint.cs.c - ${CCRULE} +afsint.cs.o: ${TOP_OBJDIR}/src/fsint/afsint.cs.c + $(AFS_CCRULE) ${TOP_OBJDIR}/src/fsint/afsint.cs.c -afsint.xdr.o: ${FSINT}/afsint.xdr.c - ${CCRULE} +afsint.xdr.o: ${TOP_OBJDIR}/src/fsint/afsint.xdr.c + $(AFS_CCRULE) ${TOP_OBJDIR}/src/fsint/afsint.xdr.c -afscbint.cs.o: ${FSINT}/afscbint.cs.c - ${CCRULE} +afscbint.cs.o: ${TOP_OBJDIR}/src/fsint/afscbint.cs.c + $(AFS_CCRULE) ${TOP_OBJDIR}/src/fsint/afscbint.cs.c -afscbint.xdr.o: ${FSINT}/afscbint.xdr.c - ${CCRULE} +afscbint.xdr.o: ${TOP_OBJDIR}/src/fsint/afscbint.xdr.c + $(AFS_CCRULE) ${TOP_OBJDIR}/src/fsint/afscbint.xdr.c afsaux.o: ${FSINT}/afsaux.c - ${CCRULE} -I../fsint + $(AFS_CCRULE) -I../fsint ${FSINT}/afsaux.c clean: $(RM) -f *.o libafsrpc.a* libafsrpc.sl* libafsrpc.so* \ diff --git a/src/sys/Makefile.in b/src/sys/Makefile.in index 64e7e0747d..3239b769d7 100644 --- a/src/sys/Makefile.in +++ b/src/sys/Makefile.in @@ -9,12 +9,13 @@ srcdir=@srcdir@ include @TOP_OBJDIR@/src/config/Makefile.config +include @TOP_OBJDIR@/src/config/Makefile.lwp + INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ -CFLAGS=${DBUG} ${COMMON_INCL} ${XCFLAGS} ${ARCHFLAGS} SFLAGS=-I${TOP_INCDIR} LIBS=libsys.a ${TOP_LIBDIR}/librx.a libsys.a ${TOP_LIBDIR}/liblwp.a ${TOP_LIBDIR}/util.a ${XLIBS} @@ -106,7 +107,7 @@ tests: pagsh pagsh.krb fixit iinc idec icreate iopen istat rmtsysd syscall.o: syscall.s @set -e; set -x; case "$(SYS_NAME)" in \ sgi_*) \ - ${CC} ${CFLAGS} -c ${srcdir}/syscall.s; \ + ${CC} ${AFS_CFLAGS} -c ${srcdir}/syscall.s; \ ;; \ rs_aix* | hp_ux10*) \ $(PATH_CPP) -P ${SFLAGS} ${srcdir}/syscall.s > syscall.ss; \ @@ -119,16 +120,9 @@ syscall.o: syscall.s esac afssyscalls.o: afssyscalls.c afssyscalls.h - ${CCOBJ} ${CFLAGS} -c ${srcdir}/afssyscalls.c - glue.o: glue.c afssyscalls.h - ${CCOBJ} ${CFLAGS} -c ${srcdir}/glue.c - setpag.o: setpag.c afssyscalls.h - ${CCOBJ} ${CFLAGS} -c ${srcdir}/setpag.c - pioctl.o: pioctl.c afssyscalls.h - ${CCOBJ} ${CFLAGS} -c ${srcdir}/pioctl.c rmtsysnet.o rmtsysc.o rmtsyss.o rmtsysd.o: rmtsys.h rmtsysd: AFS_component_version_number.o afs.exp afsl.exp @@ -155,49 +149,52 @@ Krmtsys.h: rmtsys.xg ${RXGEN} -A -k -h -o Krmtsys.h ${srcdir}/rmtsys.xg rmtsysd: rmtsysd.o libsys.a - ${CC} ${CFLAGS} -o rmtsysd rmtsysd.o ${LIBS} + $(AFS_LDRULE) rmtsysd.o ${LIBS} -pagsh: libsys.a AFS_component_version_number.o pagsh.c - ${CC} ${CFLAGS} -c ${srcdir}/pagsh.c - ${CC} ${CFLAGS} -o pagsh pagsh.o ${LIBS} +pagsh: pagsh.o libsys.a AFS_component_version_number.o + $(AFS_LDRULE) pagsh.o ${LIBS} -pagsh.krb: libsys.a pagsh.c ${TOP_LIBDIR}/libauth.krb.a ${TOP_LIBDIR}/librxkad.a ${TOP_LIBDIR}/libdes.a - ${CC} ${CFLAGS} -o pagsh.krb.o -c ${srcdir}/pagsh.c -DAFS_KERBEROS_ENV - ${CC} ${CFLAGS} -o pagsh.krb pagsh.krb.o ${TOP_LIBDIR}/libauth.krb.a ${TOP_LIBDIR}/librxkad.a ${TOP_LIBDIR}/libdes.a ${LIBS} +CFLAGS_pagsh.krb.o = -DAFS_KERBEROS_ENV +pagsh.krb.o: pagsh.c + $(AFS_CCRULE) $(srcdir)/pagsh.c + +pagsh.krb: libsys.a pagsh.krb.o ${TOP_LIBDIR}/libauth.krb.a ${TOP_LIBDIR}/librxkad.a ${TOP_LIBDIR}/libdes.a + $(AFS_LDRULE) pagsh.krb.o ${TOP_LIBDIR}/libauth.krb.a \ + ${TOP_LIBDIR}/librxkad.a ${TOP_LIBDIR}/libdes.a ${LIBS} # # Test programs. # iinc: iinc.c - $(CC) -o iinc ${CFLAGS} ${srcdir}/iinc.c ${LIBS} + $(CC) -o iinc $(AFS_CFLAGS) ${srcdir}/iinc.c ${LIBS} idec: idec.c AFS_component_version_number.c - $(CC) -o idec ${CFLAGS} ${srcdir}/idec.c ${LIBS} + $(CC) -o idec $(AFS_CFLAGS) ${srcdir}/idec.c ${LIBS} icreate:icreate.c AFS_component_version_number.c - $(CC) -o icreate ${CFLAGS} ${srcdir}/icreate.c ${LIBS} + $(CC) -o icreate $(AFS_CFLAGS) ${srcdir}/icreate.c ${LIBS} iopen: iopen.c AFS_component_version_number.c - $(CC) -o iopen ${CFLAGS} ${srcdir}/iopen.c ${LIBS} + $(CC) -o iopen $(AFS_CFLAGS) ${srcdir}/iopen.c ${LIBS} iread: iread.c AFS_component_version_number.c - ${CC} -o iread ${CFLAGS} ${srcdir}/iread.c ${LIBS} + ${CC} -o iread $(AFS_CFLAGS) ${srcdir}/iread.c ${LIBS} iwrite: iwrite.c AFS_component_version_number.c - ${CC} -o iwrite ${CFLAGS} ${srcdir}/iwrite.c ${LIBS} + ${CC} -o iwrite $(AFS_CFLAGS) ${srcdir}/iwrite.c ${LIBS} istat: istat.c AFS_component_version_number.c - $(CC) -o istat ${CFLAGS} ${srcdir}/istat.c ${LIBS} + $(CC) -o istat $(AFS_CFLAGS) ${srcdir}/istat.c ${LIBS} fixit: fixit.c AFS_component_version_number.c - $(CC) -o fixit ${CFLAGS} ${srcdir}/fixit.c ${LIBS} + $(CC) -o fixit $(AFS_CFLAGS) ${srcdir}/fixit.c ${LIBS} xfsinode: xfsinode.c AFS_component_version_number.c @set -x; case "${SYS_NAME}" in \ sgi_62 | sgi_64 ) \ - $(CC) -o xfsinode ${CFLAGS} ${srcdir}/xfsinode.c ${LIBS} + $(CC) -o xfsinode $(AFS_CFLAGS) ${srcdir}/xfsinode.c ${LIBS} esac afs.exp: ${srcdir}/afs4.exp ${srcdir}/afs5.exp diff --git a/src/tbudb/Makefile.in b/src/tbudb/Makefile.in index 039494128f..cc1ea811dd 100644 --- a/src/tbudb/Makefile.in +++ b/src/tbudb/Makefile.in @@ -8,17 +8,17 @@ srcdir=@srcdir@ include @TOP_OBJDIR@/src/config/Makefile.config +include @TOP_OBJDIR@/src/config/Makefile.pthread + INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ HELPER_SPLINT=@HELPER_SPLINT@ -CCRULE=${MT_CC} ${CFLAGS} ${MT_CFLAGS} -c - -RX=../rx -UTIL=../util -BUDB=../budb +RX=$(srcdir)/../rx +UTIL=$(srcdir)/../util +BUDB=$(srcdir)/../budb RXOBJS= rx_pthread.o rxkad_errs.o @@ -73,10 +73,10 @@ budb_errs.h: ${BUDB}/budb_errs.et # rx_pthread.o: ${RX}/rx_pthread.c - ${CCRULE} ${srcdir}/${RX}/rx_pthread.c + $(AFS_CCRULE) $(RX)/rx_pthread.c rxkad_errs.o: ../rxkad/rxkad_errs.c - ${CCRULE} ../rxkad/rxkad_errs.c + $(AFS_CCRULE) ../rxkad/rxkad_errs.c # get the pthreaded util stuff compiled here. we do this instead of # using the non-pthreaded libutil.a. There probably should be a @@ -84,78 +84,76 @@ rxkad_errs.o: ../rxkad/rxkad_errs.c # assert.o: ${UTIL}/assert.c - ${CCRULE} ${srcdir}/${UTIL}/assert.c + $(AFS_CCRULE) $(UTIL)/assert.c uuid.o: ${UTIL}/uuid.c - ${CCRULE} ${srcdir}/${UTIL}/uuid.c + $(AFS_CCRULE) $(UTIL)/uuid.c serverLog.o: ${UTIL}/serverLog.c - ${CCRULE} ${srcdir}/${UTIL}/serverLog.c + $(AFS_CCRULE) $(UTIL)/serverLog.c fileutil.o: ${UTIL}/fileutil.c - ${CCRULE} ${srcdir}/${UTIL}/fileutil.c + $(AFS_CCRULE) $(UTIL)/fileutil.c volparse.o: ${UTIL}/volparse.c - ${CCRULE} ${srcdir}/${UTIL}/volparse.c + $(AFS_CCRULE) $(UTIL)/volparse.c flipbase64.o: ${UTIL}/flipbase64.c - ${CCRULE} ${srcdir}/${UTIL}/flipbase64.c + $(AFS_CCRULE) $(UTIL)/flipbase64.c netutils.o: ${UTIL}/netutils.c - ${CCRULE} ${srcdir}/${UTIL}/netutils.c + $(AFS_CCRULE) $(UTIL)/netutils.c dirpath.o: ${UTIL}/dirpath.c - ${CCRULE} ${srcdir}/${UTIL}/dirpath.c + $(AFS_CCRULE) $(UTIL)/dirpath.c softsig.o: ${UTIL}/softsig.c - ${CCRULE} ${srcdir}/${UTIL}/softsig.c + $(AFS_CCRULE) $(UTIL)/softsig.c hostparse.o: ${UTIL}/hostparse.c - ${CCRULE} ${srcdir}/${UTIL}/hostparse.c + $(AFS_CCRULE) $(UTIL)/hostparse.c snprintf.o: ${UTIL}/snprintf.c - ${CCRULE} ${srcdir}/${UTIL}/snprintf.c + $(AFS_CCRULE) $(UTIL)/snprintf.c pthread_glock.o: ${UTIL}/pthread_glock.c - ${CCRULE} ${srcdir}/${UTIL}/pthread_glock.c - + $(AFS_CCRULE) $(UTIL)/pthread_glock.c database.o: ${BUDB}/database.c budb_errs.h ${INCLS} - ${CCRULE} ${srcdir}/${BUDB}/database.c + $(AFS_CCRULE) $(BUDB)/database.c db_alloc.o: ${BUDB}/db_alloc.c budb_errs.h ${INCLS} - ${CCRULE} ${srcdir}/${BUDB}/db_alloc.c + $(AFS_CCRULE) $(BUDB)/db_alloc.c db_dump.o: ${BUDB}/db_dump.c - ${CCRULE} ${srcdir}/${BUDB}/db_dump.c + $(AFS_CCRULE) $(BUDB)/db_dump.c dbs_dump.o: ${BUDB}/dbs_dump.c budb_errs.h ${INCLS} - ${CCRULE} ${srcdir}/${BUDB}/dbs_dump.c + $(AFS_CCRULE) $(BUDB)/dbs_dump.c db_lock.o: ${BUDB}/db_lock.c budb_errs.h ${INCLS} - ${CCRULE} ${srcdir}/${BUDB}/db_lock.c + $(AFS_CCRULE) $(BUDB)/db_lock.c db_text.o: ${BUDB}/db_text.c budb_errs.h ${INCLS} - ${CCRULE} ${srcdir}/${BUDB}/db_text.c + $(AFS_CCRULE) $(BUDB)/db_text.c db_hash.o: ${BUDB}/db_hash.c budb_errs.h ${INCLS} - ${CCRULE} ${srcdir}/${BUDB}/db_hash.c + $(AFS_CCRULE) $(BUDB)/db_hash.c ol_verify.o: ${BUDB}/ol_verify.c budb_errs.h ${INCLS} - ${CCRULE} ${srcdir}/${BUDB}/ol_verify.c + $(AFS_CCRULE) $(BUDB)/ol_verify.c procs.o: ${BUDB}/procs.c budb_errs.h ${INCLS} - ${CCRULE} ${srcdir}/${BUDB}/procs.c + $(AFS_CCRULE) $(BUDB)/procs.c struct_ops.o: ${BUDB}/struct_ops.c budb_errs.h ${TOP_INCDIR}/afs/budb_client.h - ${CCRULE} ${srcdir}/${BUDB}/struct_ops.c + $(AFS_CCRULE) $(BUDB)/struct_ops.c server.o: ${BUDB}/server.c budb_errs.h ${INCLS} - ${CCRULE} ${srcdir}/${BUDB}/server.c - + $(AFS_CCRULE) $(BUDB)/server.c budb_server: $(SERVER_OBJS) ${LIBS} - ${CC} ${LDFLAGS} -o budb_server $(SERVER_OBJS) ${LIBS} ${MT_LIBS} ${XLIBS} + $(AFS_LDRULE) $(SERVER_OBJS) ${LIBS} ${MT_LIBS} ${XLIBS} budb.cs.c: ${BUDB}/budb.rg ${RXGEN} -u -C -o $@ ${srcdir}/${BUDB}/budb.rg diff --git a/src/tbutc/Makefile.in b/src/tbutc/Makefile.in index 43f36c9a63..010d3281bc 100644 --- a/src/tbutc/Makefile.in +++ b/src/tbutc/Makefile.in @@ -7,6 +7,8 @@ srcdir=@srcdir@ include @TOP_OBJDIR@/src/config/Makefile.config +include @TOP_OBJDIR@/src/config/Makefile.pthread + INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -16,8 +18,7 @@ BUTMOBJS =file_tm.o BUTMLIBS =libbutm.a BUTMINCLS =${TOP_INCDIR}/afs/com_err.h ${TOP_INCDIR}/afs/butm.h -CC = ${MT_CC} -CFLAGS = ${COMMON_CFLAGS} -I${TOP_SRCDIR}/volser ${MT_CFLAGS} @XBSA_CFLAGS@ -I${BUCOORD} -I${VOLSER} -I../bucoord -I../volser +MODULE_CFLAGS = @XBSA_CFLAGS@ -I${BUCOORD} -I${VOLSER} -I../bucoord -I../volser LWP = ${srcdir}/../lwp BUTM = ${srcdir}/../butm @@ -70,7 +71,7 @@ BUTCLIBS=${TOP_LIBDIR}/libbudb.a \ all: butc butc: ${BUTCOBJS} ${BUTCLIBS} - ${CC} ${CFLAGS} ${BUTCOBJS} ${BUTCLIBS} ${MT_LIBS} ${XLIBS} -o butc + $(AFS_LDRULE) ${BUTCOBJS} ${BUTCLIBS} ${MT_LIBS} ${XLIBS} libbutm.a: ${BUTMOBJS} AFS_component_version_number.o -$(RM) -f libbutm.a @@ -78,58 +79,58 @@ libbutm.a: ${BUTMOBJS} AFS_component_version_number.o ${RANLIB} libbutm.a afsxbsa.o: ${BUTC}/afsxbsa.c ${BUTC}/afsxbsa.h ${BUTCINCLS} - ${CC} ${CFLAGS} -c ${BUTC}/afsxbsa.c + $(AFS_CCRULE) ${BUTC}/afsxbsa.c dbentries.o: ${BUTC}/dbentries.c ${BUTCINCLS} - ${CC} ${CFLAGS} -c ${BUTC}/dbentries.c + $(AFS_CCRULE) ${BUTC}/dbentries.c tcprocs.o: ${BUTC}/tcprocs.c ${BUTCINCLS} - ${CC} ${CFLAGS} -c ${BUTC}/tcprocs.c + $(AFS_CCRULE) ${BUTC}/tcprocs.c lwps.o: ${BUTC}/lwps.c ${BUTCINCLS} - ${CC} ${CFLAGS} -c ${BUTC}/lwps.c + $(AFS_CCRULE) ${BUTC}/lwps.c tcmain.o: ${BUTC}/tcmain.c ${BUTCINCLS} AFS_component_version_number.c - ${CC} ${CFLAGS} -c ${BUTC}/tcmain.c + $(AFS_CCRULE) ${BUTC}/tcmain.c list.o: ${BUTC}/list.c ${BUTCINCLS} - ${CC} ${CFLAGS} -c ${BUTC}/list.c + $(AFS_CCRULE) ${BUTC}/list.c recoverDb.o: ${BUTC}/recoverDb.c ${BUTCINCLS} - ${CC} ${CFLAGS} -c ${BUTC}/recoverDb.c + $(AFS_CCRULE) ${BUTC}/recoverDb.c tcudbprocs.o: ${BUTC}/tcudbprocs.c ${BUTCINCLS} - ${CC} ${CFLAGS} -c ${BUTC}/tcudbprocs.c + $(AFS_CCRULE) ${BUTC}/tcudbprocs.c dump.o: ${BUTC}/dump.c ${BUTCINCLS} - ${CC} ${CFLAGS} -c ${BUTC}/dump.c + $(AFS_CCRULE) ${BUTC}/dump.c tcstatus.o: ${BUTC}/tcstatus.c ${BUTCINCLS} - ${CC} ${CFLAGS} -c ${BUTC}/tcstatus.c + $(AFS_CCRULE) ${BUTC}/tcstatus.c butc_xbsa.o: ${BUTC}/butc_xbsa.c ${BUTC}/butc_xbsa.h ${BUTCINCLS} - ${CC} ${CFLAGS} -c ${BUTC}/butc_xbsa.c + $(AFS_CCRULE) ${BUTC}/butc_xbsa.c ubik_db_if.o: ${BUCOORD}/ubik_db_if.c - ${CC} ${CFLAGS} -c ${BUCOORD}/ubik_db_if.c + $(AFS_CCRULE) ${BUCOORD}/ubik_db_if.c status.o: ${BUCOORD}/status.c - ${CC} ${CFLAGS} -c ${BUCOORD}/status.c + $(AFS_CCRULE) ${BUCOORD}/status.c vsutils.o: ${VOLSER}/vsutils.c - ${CC} ${CFLAGS} -c ${VOLSER}/vsutils.c + $(AFS_CCRULE) ${VOLSER}/vsutils.c vsprocs.o: ${VOLSER}/vsprocs.c - ${CC} ${CFLAGS} -c ${VOLSER}/vsprocs.c + $(AFS_CCRULE) ${VOLSER}/vsprocs.c lockprocs.o: ${VOLSER}/lockprocs.c - ${CC} ${CFLAGS} -c ${VOLSER}/lockprocs.c + $(AFS_CCRULE) ${VOLSER}/lockprocs.c lock.o: ${LWP}/lock.c - ${CC} ${CFLAGS} -c ${LWP}/lock.c + $(AFS_CCRULE) ${LWP}/lock.c file_tm.o: ${BUTM}/file_tm.c ${BUTMINCLS} - ${CC} ${CFLAGS} -c ${BUTM}/file_tm.c + $(AFS_CCRULE) ${BUTM}/file_tm.c # # Install targets diff --git a/src/tests/Makefile.in b/src/tests/Makefile.in index cf36bec5a4..220087c485 100644 --- a/src/tests/Makefile.in +++ b/src/tests/Makefile.in @@ -1,5 +1,7 @@ srcdir = @srcdir@ include @TOP_OBJDIR@/src/config/Makefile.config +include @TOP_OBJDIR@/src/config/Makefile.lwp + INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -7,9 +9,6 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ SHELL = /bin/sh -CFLAGS = ${DBG} ${OPTMZ} -I. -I${srcdir} -I${TOP_OBJDIR}/src/config -I${TOP_INCDIR} ${XCFLAGS} ${ARCHFLAGS} -LDFLAGS=${XLDFLAGS} ${ARCHFLAGS} - INCDIRS=-I${TOP_OBJDIR}/src/config -I${TOP_INCDIR}/afs -I${TOP_INCDIR} INCLIBS=-L${SRCDIR}/lib/afs -L${TOP_LIBDIR} @@ -47,22 +46,23 @@ all: run-tests OpenAFS/Dirpath.pm libxfiles.a libdumpscan.a $(TEST_PROGRAMS)\ generated: xf_errs.c xf_errs.h dumpscan_errs.c dumpscan_errs.h afsdump_scan: libxfiles.a libdumpscan.a $(OBJS_afsdump_scan) - $(CC) $(CFLAGS) $(LDFLAGS) -o afsdump_scan $(OBJS_afsdump_scan) $(LIBS) + $(AFS_LDRULE) $(OBJS_afsdump_scan) $(LIBS) + afsdump_xsed: libxfiles.a libdumpscan.a $(OBJS_afsdump_xsed) - $(CC) $(CFLAGS) $(LDFLAGS) -o afsdump_xsed $(OBJS_afsdump_xsed) $(LIBS) + $(AFS_LDRULE) $(OBJS_afsdump_xsed) $(LIBS) afsdump_dirlist: libxfiles.a libdumpscan.a afsdump_dirlist.o - $(CC) $(CFLAGS) $(LDFLAGS) -o afsdump_dirlist afsdump_dirlist.o $(LIBS) + $(AFS_LDRULE) afsdump_dirlist.o $(LIBS) afsdump_extract: libxfiles.a libdumpscan.a afsdump_extract.o - $(CC) $(CFLAGS) $(LDFLAGS) -o afsdump_extract afsdump_extract.o $(LIBS) + $(AFS_LDRULE) afsdump_extract.o $(LIBS) null-search: libxfiles.a libdumpscan.a null-search.c - $(CC) $(CFLAGS) $(LDFLAGS) -o null-search null-search.c $(LIBS) + $(AFS_LDRULE) null-search.c $(LIBS) dumptool: dumptool.c - $(CC) $(CFLAGS) $(LDFLAGS) -o dumptool dumptool.c + $(AFS_LDRULE) dumptool dumptool.c libxfiles.a: $(OBJS_libxfiles.a) -rm -f libxfiles.a @@ -87,8 +87,8 @@ util.o: dumpscan_errs.h # repair addresses the same storage as two different types of structs at the # same time. +CFLAGS_repair.o = @CFLAGS_NOSTRICT@ repair.o: repair.c dumpscan_errs.h - $(CCOBJ) $(CFLAGS) @CFLAGS_NOSTRICT@ -c ${srcdir}/repair.c ${TOP_LIBDIR}/libxfiles.a: libxfiles.a ${INSTALL_DATA} $? $@ @@ -156,185 +156,182 @@ TEST_SRCS = write-ro-file.c read-vs-mmap.c read-vs-mmap2.c \ 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) - $(CC) $(LDFLAGS) -o $@ fsx.o $(EXTRA_OBJS) $(LIBS) + $(AFS_LDRULE) fsx.o $(EXTRA_OBJS) $(LIBS) write-rand: write-rand.o $(EXTRA_OBJS) - $(CC) $(LDFLAGS) -o $@ write-rand.o $(EXTRA_OBJS) $(LIBS) + $(AFS_LDRULE) write-rand.o $(EXTRA_OBJS) $(LIBS) write-ro-file: write-ro-file.o $(EXTRA_OBJS) - $(CC) $(LDFLAGS) -o $@ write-ro-file.o $(EXTRA_OBJS) $(LIBS) + $(AFS_LDRULE) write-ro-file.o $(EXTRA_OBJS) $(LIBS) write-large: write-large.o $(EXTRA_OBJS) - $(CC) $(LDFLAGS) -o $@ write-large.o $(EXTRA_OBJS) $(LIBS) + $(AFS_LDRULE) write-large.o $(EXTRA_OBJS) $(LIBS) read-vs-mmap: read-vs-mmap.o $(EXTRA_OBJS) - $(CC) $(LDFLAGS) -o $@ read-vs-mmap.o $(EXTRA_OBJS) $(LIBS) + $(AFS_LDRULE) read-vs-mmap.o $(EXTRA_OBJS) $(LIBS) read-vs-mmap2: read-vs-mmap2.o $(EXTRA_OBJS) - $(CC) $(LDFLAGS) -o $@ read-vs-mmap2.o $(EXTRA_OBJS) $(LIBS) + $(AFS_LDRULE) read-vs-mmap2.o $(EXTRA_OBJS) $(LIBS) mmap-vs-read: mmap-vs-read.o $(EXTRA_OBJS) - $(CC) $(LDFLAGS) -o $@ mmap-vs-read.o $(EXTRA_OBJS) $(LIBS) + $(AFS_LDRULE) mmap-vs-read.o $(EXTRA_OBJS) $(LIBS) mmap-vs-read2: mmap-vs-read2.o $(EXTRA_OBJS) - $(CC) $(LDFLAGS) -o $@ mmap-vs-read2.o $(EXTRA_OBJS) $(LIBS) + $(AFS_LDRULE) mmap-vs-read2.o $(EXTRA_OBJS) $(LIBS) read-write: read-write.o $(EXTRA_OBJS) - $(CC) $(LDFLAGS) -o $@ read-write.o $(EXTRA_OBJS) $(LIBS) + $(AFS_LDRULE) read-write.o $(EXTRA_OBJS) $(LIBS) mmap-and-read: mmap-and-read.o $(EXTRA_OBJS) - $(CC) $(LDFLAGS) -o $@ mmap-and-read.o $(EXTRA_OBJS) $(LIBS) + $(AFS_LDRULE) mmap-and-read.o $(EXTRA_OBJS) $(LIBS) large-dir: large-dir.o $(EXTRA_OBJS) - $(CC) $(LDFLAGS) -o $@ large-dir.o $(EXTRA_OBJS) $(LIBS) + $(AFS_LDRULE) large-dir.o $(EXTRA_OBJS) $(LIBS) large-dir2: large-dir2.o $(EXTRA_OBJS) - $(CC) $(LDFLAGS) -o $@ large-dir2.o $(EXTRA_OBJS) $(LIBS) + $(AFS_LDRULE) large-dir2.o $(EXTRA_OBJS) $(LIBS) large-dir3: large-dir3.o $(EXTRA_OBJS) - $(CC) $(LDFLAGS) -o $@ large-dir3.o $(EXTRA_OBJS) $(LIBS) + $(AFS_LDRULE) large-dir3.o $(EXTRA_OBJS) $(LIBS) fchmod: fchmod.o $(EXTRA_OBJS) - $(CC) $(LDFLAGS) -o $@ fchmod.o $(EXTRA_OBJS) $(LIBS) + $(AFS_LDRULE) fchmod.o $(EXTRA_OBJS) $(LIBS) truncate: truncate.o $(EXTRA_OBJS) - $(CC) $(LDFLAGS) -o $@ truncate.o $(EXTRA_OBJS) $(LIBS) + $(AFS_LDRULE) truncate.o $(EXTRA_OBJS) $(LIBS) make-page: make-page.o $(EXTRA_OBJS) - $(CC) $(LDFLAGS) -o $@ make-page.o $(EXTRA_OBJS) $(LIBS) + $(AFS_LDRULE) make-page.o $(EXTRA_OBJS) $(LIBS) still-there-p: still-there-p.o $(EXTRA_OBJS) - $(CC) $(LDFLAGS) -o $@ still-there-p.o $(EXTRA_OBJS) $(LIBS) + $(AFS_LDRULE) still-there-p.o $(EXTRA_OBJS) $(LIBS) intr-read: intr-read.o $(EXTRA_OBJS) - $(CC) $(LDFLAGS) -o $@ intr-read.o $(EXTRA_OBJS) $(LIBS) + $(AFS_LDRULE) intr-read.o $(EXTRA_OBJS) $(LIBS) blocks-new-file: blocks-new-file.o $(EXTRA_OBJS) - $(CC) $(LDFLAGS) -o $@ blocks-new-file.o $(EXTRA_OBJS) $(LIBS) + $(AFS_LDRULE) blocks-new-file.o $(EXTRA_OBJS) $(LIBS) asu: asu.o $(EXTRA_OBJS) - $(CC) $(LDFLAGS) -o $@ asu.o $(EXTRA_OBJS) $(LIBS) + $(AFS_LDRULE) asu.o $(EXTRA_OBJS) $(LIBS) test-setgroups: test-setgroups.o $(EXTRA_OBJS) - $(CC) $(LDFLAGS) -o $@ test-setgroups.o $(EXTRA_OBJS) $(SYS_LIBS) $(LIBS) + $(AFS_LDRULE) test-setgroups.o $(EXTRA_OBJS) $(SYS_LIBS) $(LIBS) test-setpag: test-setpag.o $(EXTRA_OBJS) - $(CC) $(LDFLAGS) -o $@ test-setpag.o $(EXTRA_OBJS) $(SYS_LIBS) $(LIBS) + $(AFS_LDRULE) test-setpag.o $(EXTRA_OBJS) $(SYS_LIBS) $(LIBS) hardlink1: hardlink1.o $(EXTRA_OBJS) - $(CC) $(LDFLAGS) -o $@ hardlink1.o $(EXTRA_OBJS) $(LIBS) + $(AFS_LDRULE) hardlink1.o $(EXTRA_OBJS) $(LIBS) hardlink2: hardlink2.o $(EXTRA_OBJS) - $(CC) $(LDFLAGS) -o $@ hardlink2.o $(EXTRA_OBJS) $(LIBS) + $(AFS_LDRULE) hardlink2.o $(EXTRA_OBJS) $(LIBS) hardlink4: hardlink4.o $(EXTRA_OBJS) - $(CC) $(LDFLAGS) -o $@ hardlink4.o $(EXTRA_OBJS) $(LIBS) + $(AFS_LDRULE) hardlink4.o $(EXTRA_OBJS) $(LIBS) mkdir2: mkdir2.o $(EXTRA_OBJS) - $(CC) $(LDFLAGS) -o $@ mkdir2.o $(EXTRA_OBJS) $(LIBS) + $(AFS_LDRULE) mkdir2.o $(EXTRA_OBJS) $(LIBS) mkdir3: mkdir3.o $(EXTRA_OBJS) - $(CC) $(LDFLAGS) -o $@ mkdir3.o $(EXTRA_OBJS) $(LIBS) + $(AFS_LDRULE) mkdir3.o $(EXTRA_OBJS) $(LIBS) create-files: create-files.o $(EXTRA_OBJS) - $(CC) $(LDFLAGS) -o $@ create-files.o $(EXTRA_OBJS) $(LIBS) + $(AFS_LDRULE) create-files.o $(EXTRA_OBJS) $(LIBS) create-symlinks: create-symlinks.o $(EXTRA_OBJS) - $(CC) $(LDFLAGS) -o $@ create-symlinks.o $(EXTRA_OBJS) $(LIBS) + $(AFS_LDRULE) create-symlinks.o $(EXTRA_OBJS) $(LIBS) create-dirs: create-dirs.o $(EXTRA_OBJS) - $(CC) $(LDFLAGS) -o $@ create-dirs.o $(EXTRA_OBJS) $(LIBS) + $(AFS_LDRULE) create-dirs.o $(EXTRA_OBJS) $(LIBS) create-remove: create-remove.o $(EXTRA_OBJS) - $(CC) $(LDFLAGS) -o $@ create-remove.o $(EXTRA_OBJS) $(LIBS) + $(AFS_LDRULE) create-remove.o $(EXTRA_OBJS) $(LIBS) dup2-and-unlog: dup2-and-unlog.o $(EXTRA_OBJS) - $(CC) $(LDFLAGS) -o $@ dup2-and-unlog.o $(EXTRA_OBJS) $(AUTH_LIBS) $(LIBS) + $(AFS_LDRULE) dup2-and-unlog.o $(EXTRA_OBJS) $(AUTH_LIBS) $(LIBS) readdir-vs-lstat: readdir-vs-lstat.o $(EXTRA_OBJS) - $(CC) $(LDFLAGS) -o $@ readdir-vs-lstat.o $(EXTRA_OBJS) $(LIBS) + $(AFS_LDRULE) readdir-vs-lstat.o $(EXTRA_OBJS) $(LIBS) symlink: symlink.o $(EXTRA_OBJS) - $(CC) $(LDFLAGS) -o $@ symlink.o $(EXTRA_OBJS) $(LIBS) + $(AFS_LDRULE) symlink.o $(EXTRA_OBJS) $(LIBS) echo-n: echo-n.o $(EXTRA_OBJS) - $(CC) $(LDFLAGS) -o $@ echo-n.o $(EXTRA_OBJS) + $(AFS_LDRULE) echo-n.o $(EXTRA_OBJS) test-parallel1: test-parallel1.o $(EXTRA_OBJS) - $(CC) $(LDFLAGS) -o $@ test-parallel1.o $(EXTRA_OBJS) $(LIBS) + $(AFS_LDRULE) test-parallel1.o $(EXTRA_OBJS) $(LIBS) test-parallel2: test-parallel2.o $(EXTRA_OBJS) - $(CC) $(LDFLAGS) -o $@ test-parallel2.o $(EXTRA_OBJS) $(LIBS) + $(AFS_LDRULE) test-parallel2.o $(EXTRA_OBJS) $(LIBS) create-stat: create-stat.o fs_lib.o $(EXTRA_OBJS) - $(CC) $(LDFLAGS) -o $@ create-stat.o fs_lib.o $(EXTRA_OBJS) $(SYS_LIBS) $(LIBS) + $(AFS_LDRULE) create-stat.o fs_lib.o $(EXTRA_OBJS) $(SYS_LIBS) $(LIBS) kill-softly: kill-softly.o $(EXTRA_OBJS) - $(CC) $(LDFLAGS) -o $@ kill-softly.o $(EXTRA_OBJS) $(LIBS) + $(AFS_LDRULE) kill-softly.o $(EXTRA_OBJS) $(LIBS) kill-softer: kill-softer.o $(EXTRA_OBJS) - $(CC) $(LDFLAGS) -o $@ kill-softer.o $(EXTRA_OBJS) $(LIBS) + $(AFS_LDRULE) kill-softer.o $(EXTRA_OBJS) $(LIBS) rm-rf: rm-rf.o fs_lib.o $(EXTRA_OBJS) - $(CC) $(LDFLAGS) -o $@ rm-rf.o fs_lib.o $(EXTRA_OBJS) $(SYS_LIBS) $(LIBS) + $(AFS_LDRULE) rm-rf.o fs_lib.o $(EXTRA_OBJS) $(SYS_LIBS) $(LIBS) exit-wo-close: exit-wo-close.o $(EXTRA_OBJS) - $(CC) $(LDFLAGS) -o $@ exit-wo-close.o $(EXTRA_OBJS) $(LIBS) + $(AFS_LDRULE) exit-wo-close.o $(EXTRA_OBJS) $(LIBS) strange-characters-c: strange-characters-c.o $(EXTRA_OBJS) - $(CC) $(LDFLAGS) -o $@ strange-characters-c.o $(EXTRA_OBJS) $(LIBS) + $(AFS_LDRULE) strange-characters-c.o $(EXTRA_OBJS) $(LIBS) pine: pine.o $(EXTRA_OBJS) - $(CC) $(LDFLAGS) -o $@ pine.o $(EXTRA_OBJS) $(LIBS) + $(AFS_LDRULE) pine.o $(EXTRA_OBJS) $(LIBS) append-over-page: append-over-page.o $(EXTRA_OBJS) - $(CC) $(LDFLAGS) -o $@ append-over-page.o $(EXTRA_OBJS) $(LIBS) + $(AFS_LDRULE) append-over-page.o $(EXTRA_OBJS) $(LIBS) write-ucc: write-ucc.o $(EXTRA_OBJS) - $(CC) $(LDFLAGS) -o $@ write-ucc.o $(EXTRA_OBJS) $(LIBS) + $(AFS_LDRULE) write-ucc.o $(EXTRA_OBJS) $(LIBS) utime-dir: utime-dir.o $(EXTRA_OBJS) - $(CC) $(LDFLAGS) -o $@ utime-dir.o $(EXTRA_OBJS) $(LIBS) + $(AFS_LDRULE) utime-dir.o $(EXTRA_OBJS) $(LIBS) utime-file: utime-file.o $(EXTRA_OBJS) - $(CC) $(LDFLAGS) -o $@ utime-file.o $(EXTRA_OBJS) $(LIBS) + $(AFS_LDRULE) utime-file.o $(EXTRA_OBJS) $(LIBS) mmap-shared-write: mmap-shared-write.o $(EXTRA_OBJS) - $(CC) $(LDFLAGS) -o $@ mmap-shared-write.o $(EXTRA_OBJS) $(LIBS) + $(AFS_LDRULE) mmap-shared-write.o $(EXTRA_OBJS) $(LIBS) rename5: rename5.o $(EXTRA_OBJS) - $(CC) $(LDFLAGS) -o $@ rename5.o $(EXTRA_OBJS) $(LIBS) + $(AFS_LDRULE) rename5.o $(EXTRA_OBJS) $(LIBS) rename6: rename6.o $(EXTRA_OBJS) - $(CC) $(LDFLAGS) -o $@ rename6.o $(EXTRA_OBJS) $(LIBS) + $(AFS_LDRULE) rename6.o $(EXTRA_OBJS) $(LIBS) write3: write3.o $(EXTRA_OBJS) - $(CC) $(LDFLAGS) -o $@ write3.o $(EXTRA_OBJS) $(LIBS) + $(AFS_LDRULE) write3.o $(EXTRA_OBJS) $(LIBS) rename-under-feet: rename-under-feet.o $(EXTRA_OBJS) - $(CC) $(LDFLAGS) -o $@ rename-under-feet.o $(EXTRA_OBJS) $(LIBS) + $(AFS_LDRULE) rename-under-feet.o $(EXTRA_OBJS) $(LIBS) write-closed: write-closed.o $(EXTRA_OBJS) - $(CC) $(LDFLAGS) -o $@ write-closed.o $(EXTRA_OBJS) $(LIBS) + $(AFS_LDRULE) write-closed.o $(EXTRA_OBJS) $(LIBS) write-closed2: write-closed2.o $(EXTRA_OBJS) - $(CC) $(LDFLAGS) -o $@ write-closed2.o $(EXTRA_OBJS) $(SYS_LIBS) $(LIBS) + $(AFS_LDRULE) write-closed2.o $(EXTRA_OBJS) $(SYS_LIBS) $(LIBS) truncate-files: truncate-files.o $(EXTRA_OBJS) - $(CC) $(LDFLAGS) -o $@ truncate-files.o $(EXTRA_OBJS) $(LIBS) + $(AFS_LDRULE) truncate-files.o $(EXTRA_OBJS) $(LIBS) mmap-cat: mmap-cat.o $(EXTRA_OBJS) - $(CC) $(LDFLAGS) -o $@ mmap-cat.o $(EXTRA_OBJS) $(LIBS) + $(AFS_LDRULE) mmap-cat.o $(EXTRA_OBJS) $(LIBS) run-tests: run-tests.in (cd ../..; CONFIG_FILES=src/tests/run-tests CONFIG_HEADERS= $(SHELL) @TOP_OBJDIR@/config.status) @chmod +x run-tests -#.c.o: -# $(CC) -c $(CPPFLAGS) $(DEFS) -I$(srcdir) -I. $(REALCFLAGS) $< - afscp: afscp.o afscp_callback.o $(EXTRA_OBJS) - $(CC) $(LDFLAGS) -o $@ afscp.o afscp_callback.o $(EXTRA_OBJS) $(INT_LIBS) ${XLIBS} + $(AFS_LDRULE) afscp.o afscp_callback.o $(EXTRA_OBJS) $(INT_LIBS) ${XLIBS} hello-world: hello-world.in sed -e "s!%CC%!$(CC)!" $(srcdir)/hello-world.in > $@ diff --git a/src/tptserver/Makefile.in b/src/tptserver/Makefile.in index 379dc61d3e..623315c3ea 100644 --- a/src/tptserver/Makefile.in +++ b/src/tptserver/Makefile.in @@ -7,6 +7,8 @@ srcdir=@srcdir@ include @TOP_OBJDIR@/src/config/Makefile.config +include @TOP_OBJDIR@/src/config/Makefile.pthread + INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -14,11 +16,9 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ HELPER_SPLINT=@HELPER_SPLINT@ ENABLE_PTHREADED_UBIK=@ENABLE_PTHREADED_UBIK@ -CCRULE=${MT_CC} ${CFLAGS} ${MT_CFLAGS} -c - -RX=../rx -UTIL=../util -PTSERVER=../ptserver +RX=$(srcdir)/../rx +UTIL=$(srcdir)/../util +PTSERVER=$(srcdir)/../ptserver RXOBJS= rx_pthread.o rxkad_errs.o @@ -54,10 +54,10 @@ depinstall: # rx_pthread.o: ${RX}/rx_pthread.c - ${CCRULE} ${srcdir}/${RX}/rx_pthread.c + $(AFS_CCRULE) $(RX)/rx_pthread.c rxkad_errs.o: ../rxkad/rxkad_errs.c - ${CCRULE} ../rxkad/rxkad_errs.c + $(AFS_CCRULE) ../rxkad/rxkad_errs.c # # get the pthreaded util stuff compiled here. we do this instead of @@ -66,65 +66,59 @@ rxkad_errs.o: ../rxkad/rxkad_errs.c # assert.o: ${UTIL}/assert.c - ${CCRULE} ${srcdir}/${UTIL}/assert.c + $(AFS_CCRULE) $(UTIL)/assert.c uuid.o: ${UTIL}/uuid.c - ${CCRULE} ${srcdir}/${UTIL}/uuid.c + $(AFS_CCRULE) $(UTIL)/uuid.c serverLog.o: ${UTIL}/serverLog.c - ${CCRULE} ${srcdir}/${UTIL}/serverLog.c + $(AFS_CCRULE) $(UTIL)/serverLog.c fileutil.o: ${UTIL}/fileutil.c - ${CCRULE} ${srcdir}/${UTIL}/fileutil.c + $(AFS_CCRULE) $(UTIL)/fileutil.c volparse.o: ${UTIL}/volparse.c - ${CCRULE} ${srcdir}/${UTIL}/volparse.c + $(AFS_CCRULE) $(UTIL)/volparse.c flipbase64.o: ${UTIL}/flipbase64.c - ${CCRULE} ${srcdir}/${UTIL}/flipbase64.c + $(AFS_CCRULE) $(UTIL)/flipbase64.c netutils.o: ${UTIL}/netutils.c - ${CCRULE} ${srcdir}/${UTIL}/netutils.c + $(AFS_CCRULE) $(UTIL)/netutils.c dirpath.o: ${UTIL}/dirpath.c - ${CCRULE} ${srcdir}/${UTIL}/dirpath.c + $(AFS_CCRULE) $(UTIL)/dirpath.c softsig.o: ${UTIL}/softsig.c - ${CCRULE} ${srcdir}/${UTIL}/softsig.c + $(AFS_CCRULE) $(UTIL)/softsig.c hostparse.o: ${UTIL}/hostparse.c - ${CCRULE} ${srcdir}/${UTIL}/hostparse.c + $(AFS_CCRULE) $(UTIL)/hostparse.c snprintf.o: ${UTIL}/snprintf.c - ${CCRULE} ${srcdir}/${UTIL}/snprintf.c + $(AFS_CCRULE) $(UTIL)/snprintf.c pthread_glock.o: ${UTIL}/pthread_glock.c - ${CCRULE} ${srcdir}/${UTIL}/pthread_glock.c - + $(AFS_CCRULE) $(UTIL)/pthread_glock.c ptserver.o: ${PTSERVER}/ptserver.c ${INCLS} - ${CCRULE} ${srcdir}/${PTSERVER}/ptserver.c + $(AFS_CCRULE) $(PTSERVER)/ptserver.c ptutils.o: ${PTSERVER}/ptutils.c ${INCLS} - ${CCRULE} ${srcdir}/${PTSERVER}/ptutils.c + $(AFS_CCRULE) $(PTSERVER)/ptutils.c ptprocs.o: ${PTSERVER}/ptprocs.c ${INCLS} - ${CCRULE} ${srcdir}/${PTSERVER}/ptprocs.c + $(AFS_CCRULE) $(PTSERVER)/ptprocs.c utils.o: ${PTSERVER}/utils.c ${INCLS} - ${CCRULE} ${srcdir}/${PTSERVER}/utils.c + $(AFS_CCRULE) $(PTSERVER)/utils.c map.o: ${PTSERVER}/map.c ${INCLS} - ${CCRULE} ${srcdir}/${PTSERVER}/map.c + $(AFS_CCRULE) $(PTSERVER)/map.c ptint.ss.o: ptint.ss.c - ${CCRULE} ptint.ss.c - ptint.cs.o: ptint.cs.c - ${CCRULE} ptint.cs.c - ptint.xdr.o: ptint.xdr.c - ${CCRULE} ptint.xdr.c ptint.cs.c: ${PTSERVER}/ptint.xg ${RXGEN} -A -x -C -u -o $@ ${srcdir}/${PTSERVER}/ptint.xg @@ -152,62 +146,70 @@ Kptint.h: ${PTSERVER}/ptint.xg ${RXGEN} -A -x -k -h -o Kptint.h ${srcdir}/${PTSERVER}/ptint.xg display.o: ${PTSERVER}/display.c ${INCLS} - ${CCRULE} ${srcdir}/${PTSERVER}/display.c + ${AFS_CCRULE} ${PTSERVER}/display.c ptserver: ptserver.o ptutils.o ptprocs.o ptint.ss.o ptint.xdr.o utils.o $(LIBS) ${TOP_LIBDIR}/libaudit.a map.o - ${CC} ${LDFLAGS} -o ptserver ptserver.o ptutils.o ptprocs.o ptint.ss.o ptint.xdr.o utils.o map.o $(LIBS) ${MT_LIBS} ${XLIBS} ${TOP_LIBDIR}/libaudit.a + $(AFS_LDRULE) ptserver.o ptutils.o ptprocs.o \ + ptint.ss.o ptint.xdr.o utils.o map.o $(LIBS) ${MT_LIBS} \ + ${XLIBS} ${TOP_LIBDIR}/libaudit.a db_verify.o: ${PTSERVER}/db_verify.c ${INCLS} - ${CCRULE} ${srcdir}/${PTSERVER}/db_verify.c + $(AFS_CCRULE) $(PTSERVER)/db_verify.c db_verify: db_verify.o pterror.o display.o $(LIBS) - $(CC) ${LDFLAGS} -o db_verify db_verify.o display.o pterror.o $(LIBS) ${MT_LIBS} ${XLIBS} + $(AFS_LDRULE) db_verify.o display.o pterror.o \ + $(LIBS) ${MT_LIBS} ${XLIBS} -ptclient: ptclient.o display.o ptuser.o pterror.o ptint.cs.o ptint.xdr.o AFS_component_version_number.o $(LIBS) - $(CC) ${LDFLAGS} -o ptclient ptclient.o display.o $(PTOBJS) $(LIBS) ${MT_LIBS} ${XLIBS} +ptclient: ptclient.o display.o ptuser.o pterror.o ptint.cs.o ptint.xdr.o \ + AFS_component_version_number.o $(LIBS) + $(AFS_LDRULE) ptclient.o display.o $(PTOBJS) \ + $(LIBS) ${MT_LIBS} ${XLIBS} ptclient.o: ${PTSERVER}/ptclient.c ${INCLS} - ${CCRULE} ${srcdir}/${PTSERVER}/ptclient.c + $(AFS_CCRULE) $(PTSERVER)/ptclient.c ptuser.o: ${PTSERVER}/ptuser.c ${INCLS} - ${CCRULE} ${srcdir}/${PTSERVER}/ptuser.c + $(AFS_CCRULE) $(PTSERVER)/ptuser.c pterror.h pterror.c: ${PTSERVER}/pterror.et $(RM) -f pterror.h pterror.c ${COMPILE_ET} -p ${srcdir}/${PTSERVER} pterror pts: pts.o $(PTOBJS) ${TOP_LIBDIR}/libcmd.a $(LIBS) ${INCLS} - $(CC) ${LDFLAGS} -o pts pts.o ${TOP_LIBDIR}/libcmd.a $(PTOBJS) ${LIBS} ${MT_LIBS} ${XLIBS} + $(AFS_LDRULE) pts.o ${TOP_LIBDIR}/libcmd.a \ + $(PTOBJS) ${LIBS} ${MT_LIBS} ${XLIBS} pts.o: ${PTSERVER}/pts.c - ${CCRULE} ${srcdir}/${PTSERVER}/pts.c + $(AFS_CCRULE) $(PTSERVER)/pts.c readgroup: readgroup.o $(PTOBJS) $(LIBS) - $(CC) ${CFLAGS} -o readgroup readgroup.o $(PTOBJS) ${LIBS} ${MT_LIBS} ${XLIBS} + $(AFS_LDRULE) readgroup.o $(PTOBJS) ${LIBS} ${MT_LIBS} ${XLIBS} readgroup.o: ${PTSERVER}/readgroup.c ${INCLS} - ${CCRULE} ${srcdir}/${PTSERVER}/readgroup.c + $(AFS_CCRULE) $(PTSERVER)/readgroup.c readpwd: readpwd.o $(PTOBJS) $(LIBS) - $(CC) ${CFLAGS} -o readpwd readpwd.o $(PTOBJS) ${LIBS} ${MT_LIBS} ${XLIBS} + $(AFS_LDRULE) readpwd.o $(PTOBJS) ${LIBS} ${MT_LIBS} ${XLIBS} readpwd.o: ${PTSERVER}/readpwd.c ${INCLS} - ${CCRULE} ${srcdir}/${PTSERVER}/readpwd.c + $(AFS_CCRULE) $(PTSERVER)/readpwd.c testpt: testpt.o $(PTOBJS) ${TOP_LIBDIR}/libcmd.a $(LIBS) - $(CC) ${CFLAGS} -o testpt testpt.o -lm ${TOP_LIBDIR}/libcmd.a $(PTOBJS) $(LIBS) ${MT_LIBS} ${XLIBS} + $(AFS_LDRULE) testpt.o -lm ${TOP_LIBDIR}/libcmd.a \ + $(PTOBJS) $(LIBS) ${MT_LIBS} ${XLIBS} testpt.o: ${PTSERVER}/testpt.c ${INCLS} - ${CCRULE} ${srcdir}/${PTSERVER}/testpt.c + $(AFS_CCRULE) $(PTSERVER)/testpt.c pt_util: pt_util.o ptutils.o ubik.o utils.o map.o $(PTOBJS) $(LIBS) - $(CC) ${CFLAGS} -o pt_util pt_util.o ptutils.o ubik.o utils.o map.o $(PTOBJS) ${TOP_LIBDIR}/libcmd.a $(LIBS) ${MT_LIBS} ${XLIBS} + $(AFS_LDRULE) pt_util.o ptutils.o ubik.o utils.o map.o $(PTOBJS) \ + ${TOP_LIBDIR}/libcmd.a $(LIBS) ${MT_LIBS} ${XLIBS} pt_util.o: ${PTSERVER}/pt_util.c - ${CCRULE} ${srcdir}/${PTSERVER}/pt_util.c + $(AFS_CCRULE) $(PTSERVER)/pt_util.c ubik.o: ${PTSERVER}/ubik.c ${INCLS} - ${CCRULE} ${srcdir}/${PTSERVER}/ubik.c + $(AFS_CCRULE) $(PTSERVER)/ubik.c prerror.h: pterror.h ${INSTALL} $? $@ diff --git a/src/tsalvaged/Makefile.in b/src/tsalvaged/Makefile.in index f0f57cfe37..a8b7dcb348 100644 --- a/src/tsalvaged/Makefile.in +++ b/src/tsalvaged/Makefile.in @@ -10,27 +10,25 @@ srcdir=@srcdir@ include @TOP_OBJDIR@/src/config/Makefile.config +include @TOP_OBJDIR@/src/config/Makefile.pthread + INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ -CC=${MT_CC} -CFLAGS=${COMMON_CFLAGS} -I.. -DNINTERFACE ${MT_CFLAGS} -DRXDEBUG -DFSSYNC_BUILD_CLIENT \ - -DSALVSYNC_BUILD_SERVER -DSALVSYNC_BUILD_CLIENT -DAFS_DEMAND_ATTACH_FS -SCFLAGS=${COMMON_CFLAGS} -I.. -DNINTERFACE ${XCFLAGS} ${ARCHFLAGS} -DRXDEBUG -DFSSYNC_BUILD_CLIENT +MODULE_CFLAGS = -DNINTERFACE -DRXDEBUG -DFSSYNC_BUILD_CLIENT \ + -DSALVSYNC_BUILD_SERVER -DSALVSYNC_BUILD_CLIENT \ + -DAFS_DEMAND_ATTACH_FS -CCRULE=${CC} ${CFLAGS} -c $? -SCCRULE=${CC} ${SCFLAGS} -c $? -o $@ +SCFLAGS=$(COMMON_CFLAGS) -I.. -DNINTERFACE ${XCFLAGS} ${ARCHFLAGS} -DRXDEBUG -DFSSYNC_BUILD_CLIENT -VICED=../viced -VLSERVER=../vlserver -LWP=../lwp -LIBACL=../libacl -UTIL=../util -DIR=../dir -VOL=../vol -FSINT=../fsint +SCCRULE=${MT_CC} ${SCFLAGS} -c $? -o $@ + +LWP=$(srcdir)/../lwp +UTIL=$(srcdir)/../util +DIR=$(srcdir)/../dir +VOL=$(srcdir)/../vol SALVAGEDOBJS=salvaged.o vol-salvage.o physio.o SALVAGEROBJS=salvager.o svol-salvage.o sphysio.o @@ -60,132 +58,130 @@ SLIBS=${TOP_LIBDIR}/libcmd.a ${TOP_LIBDIR}/libsys.a ${TOP_LIBDIR}/libdir.a \ all: salvageserver dafssync-debug salvsync-debug dasalvager -salvaged.o: ${VOL}/salvaged.c - ${CCRULE} - salvager.o: ${VOL}/salvager.c ${SCCRULE} -vol-salvage.o: ${VOL}/vol-salvage.c - ${CCRULE} - svol-salvage.o: ${VOL}/vol-salvage.c ${SCCRULE} -physio.o: ${VOL}/physio.c - ${CCRULE} - sphysio.o: ${VOL}/physio.c ${SCCRULE} -fssync-debug.o: ${VOL}/fssync-debug.c - ${CCRULE} -salvsync-debug.o: salvsync-debug.c - ${CCRULE} +salvaged.o: ${VOL}/salvaged.c + $(AFS_CCRULE) $(VOL)/salvaged.c + +vol-salvage.o: ${VOL}/vol-salvage.c + $(AFS_CCRULE) $(VOL)/vol-salvage.c + +physio.o: ${VOL}/physio.c + $(AFS_CCRULE) $(VOL)/physio.c + +fssync-debug.o: ${VOL}/fssync-debug.c + $(AFS_CCRULE) $(VOL)/fssync-debug.c assert.o: ${UTIL}/assert.c - ${CCRULE} + $(AFS_CCRULE) $(UTIL)/assert.c uuid.o: ${UTIL}/uuid.c - ${CCRULE} + $(AFS_CCRULE) $(UTIL)/uuid.c serverLog.o: ${UTIL}/serverLog.c - ${CCRULE} + $(AFS_CCRULE) $(UTIL)/serverLog.c fileutil.o: ${UTIL}/fileutil.c - ${CCRULE} + $(AFS_CCRULE) $(UTIL)/fileutil.c volparse.o: ${UTIL}/volparse.c - ${CCRULE} + $(AFS_CCRULE) $(UTIL)/volparse.c flipbase64.o: ${UTIL}/flipbase64.c - ${CCRULE} + $(AFS_CCRULE) $(UTIL)/flipbase64.c netutils.o: ${UTIL}/netutils.c - ${CCRULE} -I ../util + $(AFS_CCRULE) -I../util $(UTIL)/netutils.c dirpath.o: ${UTIL}/dirpath.c - ${CCRULE} + $(AFS_CCRULE) $(UTIL)/dirpath.c softsig.o: ${UTIL}/softsig.c - ${CCRULE} + $(AFS_CCRULE) $(UTIL)/softsig.c buffer.o: ${DIR}/buffer.c - ${CCRULE} + $(AFS_CCRULE) $(DIR)/buffer.c dir.o: ${DIR}/dir.c - ${CCRULE} + $(AFS_CCRULE) $(DIR)/dir.c salvage.o: ${DIR}/salvage.c - ${CCRULE} + $(AFS_CCRULE) $(DIR)/salvage.c lock.o: ${LWP}/lock.c - ${CCRULE} + $(AFS_CCRULE) $(LWP)/lock.c threadname.o: ${LWP}/threadname.c - ${CCRULE} + $(AFS_CCRULE) $(LWP)/threadname.c vnode.o: ${VOL}/vnode.c - ${CCRULE} + $(AFS_CCRULE) $(VOL)/vnode.c volume.o: ${VOL}/volume.c - ${CCRULE} + $(AFS_CCRULE) $(VOL)/volume.c vutil.o: ${VOL}/vutil.c - ${CCRULE} + $(AFS_CCRULE) $(VOL)/vutil.c partition.o: ${VOL}/partition.c - ${CCRULE} + $(AFS_CCRULE) $(VOL)/partition.c fssync-client.o: ${VOL}/fssync-client.c - ${CCRULE} + $(AFS_CCRULE) $(VOL)/fssync-client.c salvsync-server.o: ${VOL}/salvsync-server.c - ${CCRULE} + $(AFS_CCRULE) $(VOL)/salvsync-server.c salvsync-client.o: ${VOL}/salvsync-client.c - ${CCRULE} + $(AFS_CCRULE) $(VOL)/salvsync-client.c daemon_com.o: ${VOL}/daemon_com.c - ${CCRULE} + $(AFS_CCRULE) $(VOL)/daemon_com.c clone.o: ${VOL}/clone.c - ${CCRULE} + $(AFS_CCRULE) $(VOL)/clone.c nuke.o: ${VOL}/nuke.c - ${CCRULE} + $(AFS_CCRULE) $(VOL)/nuke.c devname.o: ${VOL}/devname.c - ${CCRULE} + $(AFS_CCRULE) $(VOL)/devname.c # only for darwin? fstab.o: ${UTIL}/fstab.c - ${CCRULE} + $(AFS_CCRULE) $(UTIL)/fstab.c common.o: ${VOL}/common.c - ${CCRULE} + $(AFS_CCRULE) $(VOL)/common.c listinodes.o: ${VOL}/listinodes.c - ${CCRULE} + $(AFS_CCRULE) $(VOL)/listinodes.c ihandle.o: ${VOL}/ihandle.c - ${CCRULE} + $(AFS_CCRULE) $(VOL)/ihandle.c namei_ops.o: ${VOL}/namei_ops.c - ${CCRULE} + $(AFS_CCRULE) $(VOL)/namei_ops.c salvageserver: ${OBJECTS} ${LIBS} - ${CC} ${LDFLAGS} -o salvageserver ${OBJECTS} ${LIBS} ${MT_LIBS} ${XLIBS} + $(AFS_LDRULE) ${OBJECTS} ${LIBS} ${MT_LIBS} ${XLIBS} dasalvager: ${SOBJECTS} ${SLIBS} - ${CC} ${LDFLAGS} -o dasalvager ${SOBJECTS} ${SLIBS} ${XLIBS} + $(AFS_LDRULE) ${SOBJECTS} ${SLIBS} ${XLIBS} dafssync-debug: ${FSSDEBUG_OBJS} ${LIBS} - ${CC} ${LDFLAGS} -o dafssync-debug ${FSSDEBUG_OBJS} ${LIBS} ${MT_LIBS} ${XLIBS} + $(AFS_LDRULE) ${FSSDEBUG_OBJS} ${LIBS} ${MT_LIBS} ${XLIBS} salvsync-debug: ${SSSDEBUG_OBJS} ${LIBS} - ${CC} ${LDFLAGS} -o salvsync-debug ${SSSDEBUG_OBJS} ${LIBS} ${MT_LIBS} ${XLIBS} + $(AFS_LDRULE) ${SSSDEBUG_OBJS} ${LIBS} ${MT_LIBS} ${XLIBS} install: salvageserver dafssync-debug salvsync-debug dasalvager ${INSTALL} -d ${DESTDIR}${afssrvlibexecdir} diff --git a/src/tsm41/Makefile.in b/src/tsm41/Makefile.in index d1f4b2eb0e..bb85c607ff 100644 --- a/src/tsm41/Makefile.in +++ b/src/tsm41/Makefile.in @@ -7,15 +7,14 @@ srcdir=@srcdir@ include @TOP_OBJDIR@/src/config/Makefile.config +include @TOP_OBJDIR@/src/config/Makefile.lwp + INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ -CFLAGS=${OPTIMIZE} -I${TOP_OBJDIR}/src/config -I${TOP_INCDIR} ${XCFLAGS} ${ARCHFLAGS} -CCRULE=${CC} ${CFLAGS} -c $? -o $@ - AFSLIBS = \ ${TOP_LIBDIR}/libkauth.a \ ${TOP_LIBDIR}/libprot.a \ @@ -85,32 +84,29 @@ afs_dynamic_kerbauth: ${AUTH_KRB_OBJS} ${KAFSLIBS} ${AUTHFILES} $(LD) -o $@ ${AUTH_KRB_OBJS} $(KAFSLIBS) ${AUTHFILES} ${XLIBS} ${LDFLAGS} aix_auth_common.o: ${srcdir}/aix_auth_common.c - ${CCRULE} +CFLAGS_aix_aklog.o = @KRB5_CPPFLAGS@ aix_aklog.o: ${srcdir}/aix_aklog.c - ${CCRULE} @KRB5_CPPFLAGS@ +CFLAGS_aix_ktc_krb.o = -DAFS_KERBEROS_ENV aix_ktc_krb.o: ${srcdir}/aix_ktc.c - ${CCRULE} -DAFS_KERBEROS_ENV aix_ktc_null.o: ${srcdir}/aix_ktc.c - ${CCRULE} aix_auth.o: @set -e; set -x; case "$(SYS_NAME)" in \ rs_aix4*) \ - ${CC} ${CFLAGS} -c ${srcdir}/aix41_auth.c -o $@ ;; \ + ${CC} ${AFS_CFLAGS} -c ${srcdir}/aix41_auth.c -o $@ ;; \ rs_aix5*) \ - ${CC} ${CFLAGS} -c ${srcdir}/aix5_auth.c -o $@ ;; \ + ${CC} ${AFS_CFLAGS} -c ${srcdir}/aix5_auth.c -o $@ ;; \ rs_aix6*) \ - ${CC} ${CFLAGS} -c ${srcdir}/aix5_auth.c -o $@ ;; \ + ${CC} ${AFS_CFLAGS} -c ${srcdir}/aix5_auth.c -o $@ ;; \ *) \ echo "not building aix lam binary for ${SYS_NAME}" ;; \ esac # aix41_ident.c is a null source file for rs_aix5* aix_ident.o: ${srcdir}/aix41_ident.c - ${CCRULE} dest: afs_dynamic_auth afs_dynamic_kerbauth @MAKE_KRB5@ aklog_dynamic_auth ${INSTALL} -d ${DEST}/root.client/usr/vice/etc diff --git a/src/tubik/Makefile.in b/src/tubik/Makefile.in index 4e73de7005..597eddba9d 100644 --- a/src/tubik/Makefile.in +++ b/src/tubik/Makefile.in @@ -5,18 +5,19 @@ # License. For details, see the LICENSE file in the top-level source # directory or online at http://www.openafs.org/dl/license10.html -srcdir=@srcdir@/../ubik +srcdir=@srcdir@ include @TOP_OBJDIR@/src/config/Makefile.config +include @TOP_OBJDIR@/src/config/Makefile.pthread + INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ HELPER_SPLINT=@HELPER_SPLINT@ -CCRULE=${MT_CC} ${CFLAGS} ${MT_CFLAGS} -c $? - -RX=../rx -UTIL=../util +UBIK=$(srcdir)/../ubik +RX=$(srcdir)/../rx +UTIL=$(srcdir)/../util LIBOBJS=disk.o remote.o beacon.o recovery.o ubik.o vote.o lock.o phys.o \ ubik_int.cs.o ubik_int.ss.o ubik_int.xdr.o ubikcmd.o \ @@ -34,8 +35,7 @@ UTILOBJS=assert.o uuid.o serverLog.o fileutil.o netutils.o dirpath.o \ LIBS=${RXOBJS} ${UTILOBJS} ${TOP_LIBDIR}/libafsrpc.a ${TOP_LIBDIR}/liblwp.a \ ${TOP_LIBDIR}/libcom_err.a ${TOP_LIBDIR}/libcmd.a \ - ${TOP_LIBDIR}/libsys.a ${XLIBS} \ - ${LDFLAGS} ${MT_LIBS} + ${TOP_LIBDIR}/libsys.a ${XLIBS} ${MT_LIBS} all: depinstall ${TOP_LIBDIR}/libubik_pthread.a udebug utst_server utst_client @@ -48,8 +48,9 @@ depinstall: \ # get the pthreaded rx stuff compiled here # +CFLAGS_rx_pthread.o = -DDPF_FSLOG rx_pthread.o: ${RX}/rx_pthread.c - ${CCRULE} -DDPF_FSLOG + $(AFS_CCRULE) $(RX)/rx_pthread.c # # get the pthreaded util stuff compiled here. we do this instead of @@ -58,176 +59,161 @@ rx_pthread.o: ${RX}/rx_pthread.c # assert.o: ${UTIL}/assert.c - ${CCRULE} + $(AFS_CCRULE) $(UTIL)/assert.c uuid.o: ${UTIL}/uuid.c - ${CCRULE} + $(AFS_CCRULE) $(UTIL)/uuid.c serverLog.o: ${UTIL}/serverLog.c - ${CCRULE} + $(AFS_CCRULE) $(UTIL)/serverLog.c fileutil.o: ${UTIL}/fileutil.c - ${CCRULE} + $(AFS_CCRULE) $(UTIL)/fileutil.c volparse.o: ${UTIL}/volparse.c - ${CCRULE} + $(AFS_CCRULE) $(UTIL)/volparse.c strlcat.o: ${UTIL}/strlcat.c - ${CCRULE} + $(AFS_CCRULE) $(UTIL)/strlcat.c strlcpy.o: ${UTIL}/strlcpy.c - ${CCRULE} + $(AFS_CCRULE) $(UTIL)/strlcpy.c strnlen.o: ${UTIL}/strnlen.c - ${CCRULE} + $(AFS_CCRULE) $(UTIL)/strnlen.c flipbase64.o: ${UTIL}/flipbase64.c - ${CCRULE} + $(AFS_CCRULE) $(UTIL)/flipbase64.c netutils.o: ${UTIL}/netutils.c - ${CCRULE} + $(AFS_CCRULE) $(UTIL)/netutils.c dirpath.o: ${UTIL}/dirpath.c - ${CCRULE} + $(AFS_CCRULE) $(UTIL)/dirpath.c softsig.o: ${UTIL}/softsig.c - ${CCRULE} + $(AFS_CCRULE) $(UTIL)/softsig.c hostparse.o: ${UTIL}/hostparse.c - ${CCRULE} + $(AFS_CCRULE) $(UTIL)/hostparse.c snprintf.o: ${UTIL}/snprintf.c - ${CCRULE} + $(AFS_CCRULE) $(UTIL)/snprintf.c pthread_glock.o: ${UTIL}/pthread_glock.c - ${CCRULE} - + $(AFS_CCRULE) $(UTIL)/pthread_glock.c # # insert comments here # utst_server: utst_server.o utst_int.ss.o utst_int.xdr.o libubik_pthread.a ${RXOBJS} ${UTILOBJS} - ${CC} ${CFLAGS} -o utst_server utst_server.o utst_int.ss.o utst_int.xdr.o libubik_pthread.a $(LIBS) + $(AFS_LDRULE) utst_server.o utst_int.ss.o utst_int.xdr.o \ + libubik_pthread.a $(LIBS) utst_client: utst_client.o utst_int.cs.o utst_int.xdr.o libubik_pthread.a ${RXOBJS} ${UTILOBJS} - ${CC} ${CFLAGS} -o utst_client utst_client.o utst_int.cs.o utst_int.xdr.o libubik_pthread.a $(LIBS) + $(AFS_LDRULE) utst_client.o utst_int.cs.o utst_int.xdr.o \ + libubik_pthread.a $(LIBS) udebug: udebug.o libubik_pthread.a ${RXOBJS} ${UTILOBJS} - ${CC} ${CFLAGS} -o udebug udebug.o libubik_pthread.a $(LIBS) + $(AFS_LDRULE) udebug.o libubik_pthread.a $(LIBS) -ubik_int.cs.c: ${srcdir}/ubik_int.xg - ${RXGEN} -A -x -C -o $@ ${srcdir}/ubik_int.xg +ubik_int.cs.c: ${UBIK}/ubik_int.xg + ${RXGEN} -A -x -C -o $@ ${UBIK}/ubik_int.xg -ubik_int.ss.c: ${srcdir}/ubik_int.xg - ${RXGEN} -A -x -S -o $@ ${srcdir}/ubik_int.xg +ubik_int.ss.c: ${UBIK}/ubik_int.xg + ${RXGEN} -A -x -S -o $@ ${UBIK}/ubik_int.xg -ubik_int.xdr.c: ${srcdir}/ubik_int.xg - ${RXGEN} -A -x -c -o $@ ${srcdir}/ubik_int.xg +ubik_int.xdr.c: ${UBIK}/ubik_int.xg + ${RXGEN} -A -x -c -o $@ ${UBIK}/ubik_int.xg -ubik_int.h: ${srcdir}/ubik_int.xg - ${RXGEN} -A -x -h -o $@ ${srcdir}/ubik_int.xg +ubik_int.h: ${UBIK}/ubik_int.xg + ${RXGEN} -A -x -h -o $@ ${UBIK}/ubik_int.xg ubik_int.cs.c: ubik_int.h ubik_int.ss.c: ubik_int.h ubik_int.xdr.c: ubik_int.h -Kubik_int.cs.c: ${srcdir}/ubik_int.xg Kubik_int.h - ${RXGEN} -A -x -k -C -o Kubik_int.cs.c ${srcdir}/ubik_int.xg +Kubik_int.cs.c: ${UBIK}/ubik_int.xg Kubik_int.h + ${RXGEN} -A -x -k -C -o Kubik_int.cs.c ${UBIK}/ubik_int.xg -Kubik_int.xdr.c: ${srcdir}/ubik_int.xg - ${RXGEN} -A -x -k -c -o Kubik_int.xdr.c ${srcdir}/ubik_int.xg +Kubik_int.xdr.c: ${UBIK}/ubik_int.xg + ${RXGEN} -A -x -k -c -o Kubik_int.xdr.c ${UBIK}/ubik_int.xg -Kubik_int.h: ${srcdir}/ubik_int.xg - ${RXGEN} -A -x -k -h -o Kubik_int.h ${srcdir}/ubik_int.xg +Kubik_int.h: ${UBIK}/ubik_int.xg + ${RXGEN} -A -x -k -h -o Kubik_int.h ${UBIK}/ubik_int.xg utst_int.ss.o: utst_int.ss.c - ${CCRULE} - utst_int.cs.o: utst_int.cs.c - ${CCRULE} - utst_int.xdr.o: utst_int.xdr.c - ${CCRULE} -utst_int.cs.c: ${srcdir}/utst_int.xg - ${RXGEN} -A -C -u -o $@ ${srcdir}/utst_int.xg +utst_int.cs.c: ${UBIK}/utst_int.xg + ${RXGEN} -A -C -u -o $@ ${UBIK}/utst_int.xg -utst_int.ss.c: ${srcdir}/utst_int.xg - ${RXGEN} -A -S -o $@ ${srcdir}/utst_int.xg +utst_int.ss.c: ${UBIK}/utst_int.xg + ${RXGEN} -A -S -o $@ ${UBIK}/utst_int.xg -utst_int.xdr.c: ${srcdir}/utst_int.xg - ${RXGEN} -A -c -o $@ ${srcdir}/utst_int.xg +utst_int.xdr.c: ${UBIK}/utst_int.xg + ${RXGEN} -A -c -o $@ ${UBIK}/utst_int.xg -utst_int.h: ${srcdir}/utst_int.xg - ${RXGEN} -A -h -u -o $@ ${srcdir}/utst_int.xg +utst_int.h: ${UBIK}/utst_int.xg + ${RXGEN} -A -h -u -o $@ ${UBIK}/utst_int.xg utst_int.cs.c: utst_int.h utst_int.ss.c: utst_int.h utst_int.xdr.c: utst_int.h -utst_server.o: ${srcdir}/utst_server.c - ${CCRULE} +utst_server.o: ${UBIK}/utst_server.c + ${AFS_CCRULE} ${UBIK}/utst_server.c -utst_client.o: ${srcdir}/utst_client.c - ${CCRULE} +utst_client.o: ${UBIK}/utst_client.c + ${AFS_CCRULE} ${UBIK}/utst_client.c -udebug.o: ${srcdir}/udebug.c - ${CCRULE} +udebug.o: ${UBIK}/udebug.c + ${AFS_CCRULE} ${UBIK}/udebug.c -uerrors.o: uerrors.c - ${CCRULE} - -uerrors.c ubik.h: ${srcdir}/uerrors.et ${srcdir}/ubik.p.h +uerrors.c ubik.h: ${UBIK}/uerrors.et ${UBIK}/ubik.p.h $(RM) -f ubik.h uerrors.c - ${COMPILE_ET} -p ${srcdir} uerrors -h ubik + ${COMPILE_ET} -p ${UBIK} uerrors -h ubik libubik_pthread.a: ${INCLS} ${LIBOBJS} AFS_component_version_number.o -$(RM) -f $@ $(AR) crc $@ ${LIBOBJS} AFS_component_version_number.o $(RANLIB) $@ -disk.o: ${srcdir}/disk.c - ${CCRULE} +disk.o: ${UBIK}/disk.c + $(AFS_CCRULE) $(UBIK)/disk.c -uinit.o: ${srcdir}/uinit.c - ${CCRULE} +uinit.o: ${UBIK}/uinit.c + $(AFS_CCRULE) $(UBIK)/uinit.c -remote.o: ${srcdir}/remote.c - ${CCRULE} +remote.o: ${UBIK}/remote.c + $(AFS_CCRULE) $(UBIK)/remote.c -beacon.o: ${srcdir}/beacon.c - ${CCRULE} +beacon.o: ${UBIK}/beacon.c + $(AFS_CCRULE) $(UBIK)/beacon.c -lock.o: ${srcdir}/lock.c - ${CCRULE} +lock.o: ${UBIK}/lock.c + $(AFS_CCRULE) $(UBIK)/lock.c -recovery.o: ${srcdir}/recovery.c - ${CCRULE} +recovery.o: ${UBIK}/recovery.c + $(AFS_CCRULE) $(UBIK)/recovery.c -ubik.o: ${srcdir}/ubik.c - ${CCRULE} +ubik.o: ${UBIK}/ubik.c + $(AFS_CCRULE) $(UBIK)/ubik.c -phys.o: ${srcdir}/phys.c - ${CCRULE} +phys.o: ${UBIK}/phys.c + $(AFS_CCRULE) $(UBIK)/phys.c -vote.o: ${srcdir}/vote.c - ${CCRULE} +vote.o: ${UBIK}/vote.c + $(AFS_CCRULE) $(UBIK)/vote.c -ubikcmd.o: ${srcdir}/ubikcmd.c - ${CCRULE} - -ubikclient.o: ${srcdir}/ubikclient.c - ${CCRULE} - -ubik_int.ss.o: ubik_int.ss.c - ${CCRULE} - -ubik_int.cs.o: ubik_int.cs.c - ${CCRULE} +ubikcmd.o: ${UBIK}/ubikcmd.c + $(AFS_CCRULE) $(UBIK)/ubikcmd.c +ubikclient.o: ${UBIK}/ubikclient.c + $(AFS_CCRULE) $(UBIK)/ubikclient.c ubik_int.xdr.o: ubik_int.xdr.c - ${CCRULE} # # Installation targets diff --git a/src/tviced/Makefile.in b/src/tviced/Makefile.in index e3459631da..09a4497bdb 100644 --- a/src/tviced/Makefile.in +++ b/src/tviced/Makefile.in @@ -9,25 +9,25 @@ srcdir=@srcdir@ include @TOP_OBJDIR@/src/config/Makefile.config +include @TOP_OBJDIR@/src/config/Makefile.pthread + INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ -CC=${MT_CC} -CFLAGS=${COMMON_CFLAGS} -DNINTERFACE ${MT_CFLAGS} -DRXDEBUG -DFSSYNC_BUILD_SERVER -DSALVSYNC_BUILD_CLIENT +MODULE_CFLAGS = -DNINTERFACE -DRXDEBUG -DFSSYNC_BUILD_SERVER \ + -DSALVSYNC_BUILD_CLIENT -CCRULE=${CC} ${CFLAGS} -c $? - -RX=../rx -VICED=../viced -VLSERVER=../vlserver -LWP=../lwp -LIBACL=../libacl -UTIL=../util -DIR=../dir -VOL=../vol -FSINT=../fsint +RX=$(srcdir)/../rx +VICED=$(srcdir)/../viced +VLSERVER=$(srcdir)/../vlserver +LWP=$(srcdir)/../lwp +LIBACL=$(srcdir)/../libacl +UTIL=$(srcdir)/../util +DIR=$(srcdir)/../dir +VOL=$(srcdir)/../vol +FSINT=$(srcdir)/../fsint VICEDOBJS=viced.o afsfileprocs.o host.o physio.o callback.o serialize_state.o @@ -56,157 +56,158 @@ LIBS=${TOP_LIBDIR}/libafsauthent.a ${TOP_LIBDIR}/libafsrpc.a ${TOP_LIBDIR}/util. all: fileserver +CFLAGS_rx_pthread.o = -DDPF_FSLOG rx_pthread.o: ${RX}/rx_pthread.c - ${CCRULE} -DDPF_FSLOG + $(AFS_CCRULE) $(RX)/rx_pthread.c viced.o: ${VICED}/viced.c - ${CCRULE} + $(AFS_CCRULE) $(VICED)/viced.c afsfileprocs.o: ${VICED}/afsfileprocs.c - ${CCRULE} + $(AFS_CCRULE) $(VICED)/afsfileprocs.c host.o: ${VICED}/host.c - ${CCRULE} + $(AFS_CCRULE) $(VICED)/host.c physio.o: ${VICED}/physio.c - ${CCRULE} + $(AFS_CCRULE) $(VICED)/physio.c callback.o: ${VICED}/callback.c - ${CCRULE} + $(AFS_CCRULE) $(VICED)/callback.c -serialize_state.o: serialize_state.c - ${CCRULE} assert.o: ${UTIL}/assert.c - ${CCRULE} + $(AFS_CCRULE) $(UTIL)/assert.c uuid.o: ${UTIL}/uuid.c - ${CCRULE} + $(AFS_CCRULE) $(UTIL)/uuid.c serverLog.o: ${UTIL}/serverLog.c - ${CCRULE} + $(AFS_CCRULE) $(UTIL)/serverLog.c fileutil.o: ${UTIL}/fileutil.c - ${CCRULE} + $(AFS_CCRULE) $(UTIL)/fileutil.c volparse.o: ${UTIL}/volparse.c - ${CCRULE} + $(AFS_CCRULE) $(UTIL)/volparse.c flipbase64.o: ${UTIL}/flipbase64.c - ${CCRULE} + $(AFS_CCRULE) $(UTIL)/flipbase64.c netutils.o: ${UTIL}/netutils.c - ${CCRULE} -I../util + $(AFS_CCRULE) -I../util $(UTIL)/netutils.c dirpath.o: ${UTIL}/dirpath.c - ${CCRULE} + $(AFS_CCRULE) $(UTIL)/dirpath.c softsig.o: ${UTIL}/softsig.c - ${CCRULE} + $(AFS_CCRULE) $(UTIL)/softsig.c lock.o: ${LWP}/lock.c - ${CCRULE} + $(AFS_CCRULE) $(LWP)/lock.c threadname.o: ${LWP}/threadname.c - ${CCRULE} + $(AFS_CCRULE) $(LWP)/threadname.c aclprocs.o: ${LIBACL}/aclprocs.c - ${CCRULE} + $(AFS_CCRULE) $(LIBACL)/aclprocs.c netprocs.o: ${LIBACL}/netprocs.c - ${CCRULE} + $(AFS_CCRULE) $(LIBACL)/netprocs.c -vldbint.cs.o: ${VLSERVER}/vldbint.cs.c - ${CCRULE} -I${srcdir}/../vlserver -vldbint.xdr.o: ${VLSERVER}/vldbint.xdr.c - ${CCRULE} -I${srcdir}/../vlserver +vldbint.cs.o: ../vlserver/vldbint.cs.c + $(AFS_CCRULE) -I$(VLSERVER) ../vlserver/vldbint.cs.c + +vldbint.xdr.o: ../vlserver/vldbint.xdr.c + $(AFS_CCRULE) -I$(VLSERVER) ../vlserver/vldbint.xdr.c + buffer.o: ${DIR}/buffer.c - ${CCRULE} + $(AFS_CCRULE) $(DIR)/buffer.c dir.o: ${DIR}/dir.c - ${CCRULE} + $(AFS_CCRULE) $(DIR)/dir.c salvage.o: ${DIR}/salvage.c - ${CCRULE} + $(AFS_CCRULE) $(DIR)/salvage.c vnode.o: ${VOL}/vnode.c - ${CCRULE} + $(AFS_CCRULE) $(VOL)/vnode.c volume.o: ${VOL}/volume.c - ${CCRULE} + $(AFS_CCRULE) $(VOL)/volume.c vutil.o: ${VOL}/vutil.c - ${CCRULE} + $(AFS_CCRULE) $(VOL)/vutil.c partition.o: ${VOL}/partition.c - ${CCRULE} + $(AFS_CCRULE) $(VOL)/partition.c vg_cache.o: ${VOL}/vg_cache.c - ${CCRULE} + $(AFS_CCRULE) $(VOL)/vg_cache.c vg_scan.o: ${VOL}/vg_scan.c - ${CCRULE} + $(AFS_CCRULE) $(VOL)/vg_scan.c fssync-server.o: ${VOL}/fssync-server.c - ${CCRULE} + $(AFS_CCRULE) $(VOL)/fssync-server.c fssync-client.o: ${VOL}/fssync-client.c - ${CCRULE} + $(AFS_CCRULE) $(VOL)/fssync-client.c salvsync-client.o: ${VOL}/salvsync-client.c - ${CCRULE} + $(AFS_CCRULE) $(VOL)/salvsync-client.c daemon_com.o: ${VOL}/daemon_com.c - ${CCRULE} + $(AFS_CCRULE) $(VOL)/daemon_com.c clone.o: ${VOL}/clone.c - ${CCRULE} + $(AFS_CCRULE) $(VOL)/clone.c nuke.o: ${VOL}/nuke.c - ${CCRULE} + $(AFS_CCRULE) $(VOL)/nuke.c devname.o: ${VOL}/devname.c - ${CCRULE} + $(AFS_CCRULE) $(VOL)/devname.c # only for darwin? fstab.o: ${UTIL}/fstab.c - ${CCRULE} + $(AFS_CCRULE) $(UTIL)/fstab.c common.o: ${VOL}/common.c - ${CCRULE} + $(AFS_CCRULE) $(VOL)/common.c listinodes.o: ${VOL}/listinodes.c - ${CCRULE} + $(AFS_CCRULE) $(VOL)/listinodes.c ihandle.o: ${VOL}/ihandle.c - ${CCRULE} + $(AFS_CCRULE) $(VOL)/ihandle.c namei_ops.o: ${VOL}/namei_ops.c - ${CCRULE} + $(AFS_CCRULE) $(VOL)/namei_ops.c afsaux.o: ${FSINT}/afsaux.c - ${CCRULE} -I../fsint + $(AFS_CCRULE) -I../fsint $(FSINT)/afsaux.c -afscbint.cs.o: ${FSINT}/afscbint.cs.c - ${CCRULE} +afscbint.cs.o: ../fsint/afscbint.cs.c + $(AFS_CCRULE) ../fsint/afscbint.cs.c -afscbint.ss.o: ${FSINT}/afscbint.ss.c - ${CCRULE} +afscbint.ss.o: ../fsint/afscbint.ss.c + $(AFS_CCRULE) ../fsint/afscbint.ss.c -afsint.cs.o: ${FSINT}/afsint.cs.c - ${CCRULE} +afsint.cs.o: ../fsint/afsint.cs.c + $(AFS_CCRULE) ../fsint/afsint.cs.c -afsint.ss.o: ${FSINT}/afsint.ss.c - ${CCRULE} +afsint.ss.o: ../fsint/afsint.ss.c + $(AFS_CCRULE) ../fsint/afsint.ss.c -afsint.xdr.o: ${FSINT}/afsint.xdr.c - ${CCRULE} +afsint.xdr.o: ../fsint/afsint.xdr.c + $(AFS_CCRULE) ../fsint/afsint.xdr.c fileserver: ${objects} ${LIBS} - ${CC} ${LDFLAGS} -o fileserver ${objects} ${LIBS} ${MT_LIBS} ${XLIBS} - + $(AFS_LDRULE) ${objects} ${LIBS} ${MT_LIBS} ${XLIBS} + install: fileserver ${INSTALL} -d ${DESTDIR}${afssrvlibexecdir} ${INSTALL} -d ${DESTDIR}${afssrvsbindir} diff --git a/src/tvlserver/Makefile.in b/src/tvlserver/Makefile.in index 051a8a8b61..e7f5f24344 100644 --- a/src/tvlserver/Makefile.in +++ b/src/tvlserver/Makefile.in @@ -7,6 +7,8 @@ srcdir=@srcdir@ include @TOP_OBJDIR@/src/config/Makefile.config +include @TOP_OBJDIR@/src/config/Makefile.pthread + INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -14,13 +16,9 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ HELPER_SPLINT=@HELPER_SPLINT@ ENABLE_PTHREADED_UBIK=@ENABLE_PTHREADED_UBIK@ -CC=${MT_CC} -CFLAGS=${COMMON_CFLAGS} ${MT_CFLAGS} -CCRULE=${CC} ${CFLAGS} -c - -RX=../rx -UTIL=../util -VLSERVER=../vlserver +RX=$(srcdir)/../rx +UTIL=$(srcdir)/../util +VLSERVER=$(srcdir)/../vlserver RXOBJS= rx_pthread.o rxkad_errs.o @@ -53,10 +51,10 @@ all: \ depinstall: rx_pthread.o: ${RX}/rx_pthread.c - ${CCRULE} ${srcdir}/${RX}/rx_pthread.c + $(AFS_CCRULE) $(RX)/rx_pthread.c rxkad_errs.o: ../rxkad/rxkad_errs.c - ${CCRULE} ../rxkad/rxkad_errs.c + $(AFS_CCRULE) ../rxkad/rxkad_errs.c # # get the pthreaded util stuff compiled here. we do this instead of @@ -65,43 +63,43 @@ rxkad_errs.o: ../rxkad/rxkad_errs.c # assert.o: ${UTIL}/assert.c - ${CCRULE} ${srcdir}/${UTIL}/assert.c + $(AFS_CCRULE) $(UTIL)/assert.c uuid.o: ${UTIL}/uuid.c - ${CCRULE} ${srcdir}/${UTIL}/uuid.c + $(AFS_CCRULE) $(UTIL)/uuid.c serverLog.o: ${UTIL}/serverLog.c - ${CCRULE} ${srcdir}/${UTIL}/serverLog.c + $(AFS_CCRULE) $(UTIL)/serverLog.c fileutil.o: ${UTIL}/fileutil.c - ${CCRULE} ${srcdir}/${UTIL}/fileutil.c + $(AFS_CCRULE) $(UTIL)/fileutil.c volparse.o: ${UTIL}/volparse.c - ${CCRULE} ${srcdir}/${UTIL}/volparse.c + $(AFS_CCRULE) $(UTIL)/volparse.c flipbase64.o: ${UTIL}/flipbase64.c - ${CCRULE} ${srcdir}/${UTIL}/flipbase64.c + $(AFS_CCRULE) $(UTIL)/flipbase64.c netutils.o: ${UTIL}/netutils.c - ${CCRULE} ${srcdir}/${UTIL}/netutils.c + $(AFS_CCRULE) $(UTIL)/netutils.c dirpath.o: ${UTIL}/dirpath.c - ${CCRULE} ${srcdir}/${UTIL}/dirpath.c + $(AFS_CCRULE) $(UTIL)/dirpath.c softsig.o: ${UTIL}/softsig.c - ${CCRULE} ${srcdir}/${UTIL}/softsig.c + $(AFS_CCRULE) $(UTIL)/softsig.c hostparse.o: ${UTIL}/hostparse.c - ${CCRULE} ${srcdir}/${UTIL}/hostparse.c + $(AFS_CCRULE) $(UTIL)/hostparse.c snprintf.o: ${UTIL}/snprintf.c - ${CCRULE} ${srcdir}/${UTIL}/snprintf.c + $(AFS_CCRULE) $(UTIL)/snprintf.c pthread_glock.o: ${UTIL}/pthread_glock.c - ${CCRULE} ${srcdir}/${UTIL}/pthread_glock.c + $(AFS_CCRULE) $(UTIL)/pthread_glock.c get_krbrlm.o: ${UTIL}/get_krbrlm.c - ${CCRULE} ${srcdir}/${UTIL}/get_krbrlm.c + $(AFS_CCRULE) $(UTIL)/get_krbrlm.c # # Other stuff @@ -109,44 +107,41 @@ get_krbrlm.o: ${UTIL}/get_krbrlm.c vldb_check: vldb_check.o ${LIBS} AFS_component_version_number.o - $(CC) ${LDFLAGS} -o vldb_check vldb_check.o AFS_component_version_number.o ${LIBS} ${MT_LIBS} ${XLIBS} + $(AFS_LDRULE) vldb_check.o AFS_component_version_number.o \ + ${LIBS} ${MT_LIBS} ${XLIBS} vldb_check.o: ${VLSERVER}/vldb_check.c - ${CCRULE} ${srcdir}/${VLSERVER}/vldb_check.c + $(AFS_CCRULE) $(VLSERVER)/vldb_check.c cnvldb: cnvldb.o ${LIBS} - $(CC) ${LDFLAGS} -o cnvldb cnvldb.o ${LIBS} ${MT_LIBS} ${XLIBS} + $(AFS_LDRULE) cnvldb.o ${LIBS} ${MT_LIBS} ${XLIBS} cnvldb.o: ${VLSERVER}/cnvldb.c - ${CCRULE} ${srcdir}/${VLSERVER}/cnvldb.c + $(AFS_CCRULE) $(VLSERVER)/cnvldb.c sascnvldb: sascnvldb.o ${LIBS} - $(CC) ${LDFLAGS} -o sascnvldb sascnvldb.o ${LIBS} ${MT_LIBS} ${XLIBS} + $(AFS_LDRULE) sascnvldb.o ${LIBS} ${MT_LIBS} ${XLIBS} sascnvldb.o: ${VLSERVER}/sascnvldb.c - ${CCRULE} ${srcdir}/${VLSERVER}/sascnvldb.c + $(AFS_CCRULE) $(VLSERVER)/sascnvldb.c vlserver: vlserver.o vlutils.o vlprocs.o vldbint.ss.o vldbint.xdr.o $(LIBS) - $(CC) ${LDFLAGS} -o vlserver vlserver.o vlutils.o vlprocs.o vldbint.ss.o \ - vldbint.xdr.o $(LIBS) ${MT_LIBS} ${XLIBS} ${TOP_LIBDIR}/libaudit.a + $(AFS_LDRULE) vlserver.o vlutils.o vlprocs.o vldbint.ss.o \ + vldbint.xdr.o $(LIBS) ${MT_LIBS} ${XLIBS} \ + ${TOP_LIBDIR}/libaudit.a vlserver.o: ${VLSERVER}/vlserver.c ${INCLS} AFS_component_version_number.o - ${CCRULE} ${srcdir}/${VLSERVER}/vlserver.c + $(AFS_CCRULE) $(VLSERVER)/vlserver.c vlutils.o: ${VLSERVER}/vlutils.c ${INCLS} - ${CCRULE} ${srcdir}/${VLSERVER}/vlutils.c + $(AFS_CCRULE) $(VLSERVER)/vlutils.c vlprocs.o: ${VLSERVER}/vlprocs.c ${INCLS} - ${CCRULE} ${srcdir}/${VLSERVER}/vlprocs.c + $(AFS_CCRULE) $(VLSERVER)/vlprocs.c vldbint.ss.o: vldbint.ss.c - ${CCRULE} vldbint.ss.c - vldbint.cs.o: vldbint.cs.c - ${CCRULE} vldbint.cs.c - vldbint.xdr.o: vldbint.xdr.c - ${CCRULE} vldbint.xdr.c vldbint.cs.c: ${VLSERVER}/vldbint.xg ${RXGEN} -A -u -x -C -o $@ ${srcdir}/${VLSERVER}/vldbint.xg @@ -171,13 +166,13 @@ Kvldbint.xdr.c: ${VLSERVER}/vldbint.xg ${RXGEN} -A -x -k -c -o $@ ${srcdir}/${VLSERVER}/vldbint.xg vlclient: vlclient.o $(OBJS) $(LIBS) ${INCLS} - $(CC) ${LDFLAGS} -o vlclient vlclient.o $(OBJS) $(LIBS) ${MT_LIBS} ${XLIBS} ${TOP_LIBDIR}/libcmd.a + $(AFS_LDRULE) vlclient.o $(OBJS) $(LIBS) ${MT_LIBS} ${XLIBS} \ + ${TOP_LIBDIR}/libcmd.a vlclient.o: ${VLSERVER}/vlclient.c - ${CCRULE} ${srcdir}/${VLSERVER}/vlclient.c + $(AFS_CCRULE) $(VLSERVER)/vlclient.c vl_errors.o: vl_errors.c - ${CCRULE} vl_errors.c vlserver.h vl_errors.c: ${VLSERVER}/vl_errors.et ${VLSERVER}/vlserver.p.h $(RM) -f vlserver.h vl_errors.c; ${COMPILE_ET} -p ${srcdir}/${VLSERVER} vl_errors -h vlserver diff --git a/src/tvolser/Makefile.in b/src/tvolser/Makefile.in index 5b65d19889..59bb2a6531 100644 --- a/src/tvolser/Makefile.in +++ b/src/tvolser/Makefile.in @@ -7,27 +7,24 @@ srcdir=@srcdir@ include @TOP_OBJDIR@/src/config/Makefile.config +include @TOP_OBJDIR@/src/config/Makefile.pthread + INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ HELPER_SPLINT=@HELPER_SPLINT@ -CC=${MT_CC} -CFLAGS=${COMMON_CFLAGS} -DNINTERFACE ${MT_CFLAGS} -DRXDEBUG -DFSSYNC_BUILD_CLIENT +MODULE_CFLAGS=-DNINTERFACE -DRXDEBUG -DFSSYNC_BUILD_CLIENT -CCRULE=${CC} ${CFLAGS} -c $? - -VICED=../viced -VLSERVER=../vlserver -LWP=../lwp -LIBACL=../libacl -UTIL=../util -DIR=../dir -VOL=../vol -FSINT=../fsint -VOLSER=../volser -RX=../rx +VLSERVER=$(srcdir)/../vlserver +LWP=$(srcdir)/../lwp +LIBACL=$(srcdir)/../libacl +UTIL=$(srcdir)/../util +DIR=$(srcdir)/../dir +VOL=$(srcdir)/../vol +VOLSER=$(srcdir)/../volser +RX=$(srcdir)/../rx VOLSEROBJS=volmain.o volprocs.o physio.o voltrans.o volerr.o volint.cs.o dumpstuff.o volint.ss.o volint.xdr.o vscommon.o vol_split.o @@ -47,15 +44,13 @@ VOLOBJS= vnode.o volume.o vutil.o partition.o fssync-client.o purge.o \ clone.o devname.o common.o ihandle.o listinodes.o \ namei_ops.o nuke.o salvsync-client.o daemon_com.o -FSINTOBJS=# afsaux.o afscbint.cs.o afsint.ss.o afsint.xdr.o - RXOBJS=rx_pthread.o objects= ${VOLSEROBJS} ${LWPOBJS} ${LIBACLOBJS} \ - ${UTILOBJS} ${DIROBJS} ${VOLOBJS} ${FSINTOBJS} ${RXOBJS} + ${UTILOBJS} ${DIROBJS} ${VOLOBJS} ${RXOBJS} vosobjects= ${VOSOBJS} ${VLSERVEROBJS} ${LIBACLOBJS} ${UTILOBJS} ${DIROBJS} \ - ${VOLOBJS} ${FSINTOBJS} ${RXOBJS} + ${VOLOBJS} ${RXOBJS} LIBS= ${TOP_LIBDIR}/libcmd.a \ ${TOP_LIBDIR}/libafsauthent.a \ @@ -67,171 +62,164 @@ all: volserver all_vos: vos -COMPILE=${CC} ${CFLAGS} -c $? - +CFLAGS_rx_pthread.o = -DDPF_FSLOG rx_pthread.o: ${RX}/rx_pthread.c - ${COMPILE} -DDPF_FSLOG + $(AFS_CCRULE) $(RX)/rx_pthread.c + volmain.o: ${VOLSER}/volmain.c - ${COMPILE} -I../volser + $(AFS_CCRULE) -I../volser $(VOLSER)/volmain.c + vol_split.o: ${VOLSER}/vol_split.c - ${COMPILE} -I../volser + $(AFS_CCRULE) -I../volser $(VOLSER)/vol_split.c + volprocs.o: ${VOLSER}/volprocs.c - ${COMPILE} -I../volser + $(AFS_CCRULE) -I../volser $(VOLSER)/volprocs.c + physio.o: ${VOLSER}/physio.c - ${COMPILE} + $(AFS_CCRULE) $(VOLSER)/physio.c + voltrans.o: ${VOLSER}/voltrans.c - ${COMPILE} -I../volser -volerr.o: ${VOLSER}/volerr.c - ${COMPILE} -volint.cs.o: ${VOLSER}/volint.cs.c - ${COMPILE} + $(AFS_CCRULE) -I../volser $(VOLSER)/voltrans.c + +volerr.o: ../volser/volerr.c + $(AFS_CCRULE) ../volser/volerr.c + +volint.cs.o: ../volser/volint.cs.c + $(AFS_CCRULE) ../volser/volint.cs.c + dumpstuff.o: ${VOLSER}/dumpstuff.c - ${COMPILE} -I../volser -volint.ss.o: ${VOLSER}/volint.ss.c - ${COMPILE} -volint.xdr.o: ${VOLSER}/volint.xdr.c - ${COMPILE} + $(AFS_CCRULE) -I../volser $(VOLSER)/dumpstuff.c + +volint.ss.o: ../volser/volint.ss.c + $(AFS_CCRULE) ../volser/volint.ss.c + +volint.xdr.o: ../volser/volint.xdr.c + $(AFS_CCRULE) ../volser/volint.xdr.c + vsprocs.o: ${VOLSER}/vsprocs.c - ${COMPILE} + $(AFS_CCRULE) $(VOLSER)/vsprocs.c + vsutils.o: ${VOLSER}/vsutils.c - ${COMPILE} + $(AFS_CCRULE) $(VOLSER)/vsutils.c + lockprocs.o: ${VOLSER}/lockprocs.c - ${COMPILE} + $(AFS_CCRULE) $(VOLSER)/lockprocs.c assert.o: ${UTIL}/assert.c - ${COMPILE} + $(AFS_CCRULE) $(UTIL)/assert.c uuid.o: ${UTIL}/uuid.c - ${COMPILE} + $(AFS_CCRULE) $(UTIL)/uuid.c serverLog.o: ${UTIL}/serverLog.c - ${COMPILE} + $(AFS_CCRULE) $(UTIL)/serverLog.c fileutil.o: ${UTIL}/fileutil.c - ${COMPILE} + $(AFS_CCRULE) $(UTIL)/fileutil.c volparse.o: ${UTIL}/volparse.c - ${COMPILE} + $(AFS_CCRULE) $(UTIL)/volparse.c flipbase64.o: ${UTIL}/flipbase64.c - ${COMPILE} + $(AFS_CCRULE) $(UTIL)/flipbase64.c netutils.o: ${UTIL}/netutils.c - ${COMPILE} -I../util + $(AFS_CCRULE) -I../util $(UTIL)/netutils.c dirpath.o: ${UTIL}/dirpath.c - ${COMPILE} + $(AFS_CCRULE) $(UTIL)/dirpath.c softsig.o: ${UTIL}/softsig.c - ${COMPILE} + $(AFS_CCRULE) $(UTIL)/softsig.c lock.o: ${LWP}/lock.c - ${COMPILE} + $(AFS_CCRULE) $(LWP)/lock.c threadname.o: ${LWP}/threadname.c - ${COMPILE} + $(AFS_CCRULE) $(LWP)/threadname.c aclprocs.o: ${LIBACL}/aclprocs.c - ${COMPILE} + $(AFS_CCRULE) $(LIBACL)/aclprocs.c netprocs.o: ${LIBACL}/netprocs.c - ${COMPILE} + $(AFS_CCRULE) $(LIBACL)/netprocs.c vlserver.h vl_errors.c: ${VLSERVER}/vl_errors.et ${VLSERVER}/vlserver.p.h $(RM) -f vlserver.h vl_errors.c; ${COMPILE_ET} -p ${VLSERVER} vl_errors -h vlserver -vl_errors.o: vl_errors.c - ${COMPILE} -vldbint.cs.o: ${VLSERVER}/vldbint.cs.c - ${COMPILE} +vldbint.cs.o: ../vlserver/vldbint.cs.c + $(AFS_CCRULE) -I$(VLSERVER) ../vlserver/vldbint.cs.c -vldbint.xdr.o: ${VLSERVER}/vldbint.xdr.c - ${COMPILE} +vldbint.xdr.o: ../vlserver/vldbint.xdr.c + $(AFS_CCRULE) -I$(VLSERVER) ../vlserver/vldbint.xdr.c buffer.o: ${DIR}/buffer.c - ${COMPILE} + $(AFS_CCRULE) $(DIR)/buffer.c dir.o: ${DIR}/dir.c - ${COMPILE} + $(AFS_CCRULE) $(DIR)/dir.c salvage.o: ${DIR}/salvage.c - ${COMPILE} + $(AFS_CCRULE) $(DIR)/salvage.c vnode.o: ${VOL}/vnode.c - ${COMPILE} + $(AFS_CCRULE) $(VOL)/vnode.c volume.o: ${VOL}/volume.c - ${COMPILE} + $(AFS_CCRULE) $(VOL)/volume.c vutil.o: ${VOL}/vutil.c - ${COMPILE} + $(AFS_CCRULE) $(VOL)/vutil.c partition.o: ${VOL}/partition.c - ${COMPILE} + $(AFS_CCRULE) $(VOL)/partition.c nuke.o: ${VOL}/nuke.c - ${COMPILE} + $(AFS_CCRULE) $(VOL)/nuke.c fssync-client.o: ${VOL}/fssync-client.c - ${COMPILE} + $(AFS_CCRULE) $(VOL)/fssync-client.c salvsync-client.o: ${VOL}/salvsync-client.c - ${COMPILE} + $(AFS_CCRULE) $(VOL)/salvsync-client.c daemon_com.o: ${VOL}/daemon_com.c - ${COMPILE} + $(AFS_CCRULE) $(VOL)/daemon_com.c purge.o: ${VOL}/purge.c - ${COMPILE} + $(AFS_CCRULE) $(VOL)/purge.c clone.o: ${VOL}/clone.c - ${COMPILE} + $(AFS_CCRULE) $(VOL)/clone.c devname.o: ${VOL}/devname.c - ${COMPILE} + $(AFS_CCRULE) $(VOL)/devname.c common.o: ${VOL}/common.c - ${COMPILE} + $(AFS_CCRULE) $(VOL)/common.c vscommon.o: ${VOLSER}/common.c - ${COMPILE} -o vscommon.o + $(AFS_CCRULE) $(VOLSER)/common.c listinodes.o: ${VOL}/listinodes.c - ${COMPILE} + $(AFS_CCRULE) $(VOL)/listinodes.c ihandle.o: ${VOL}/ihandle.c - ${COMPILE} + $(AFS_CCRULE) $(VOL)/ihandle.c namei_ops.o: ${VOL}/namei_ops.c - ${COMPILE} - -afsaux.o: ${FSINT}/afsaux.c - ${COMPILE} - -afscbint.cs.o: ${FSINT}/afscbint.cs.c - ${COMPILE} - -afscbint.ss.o: ${FSINT}/afscbint.ss.c - ${COMPILE} - -afsint.cs.o: ${FSINT}/afsint.cs.c - ${COMPILE} - -afsint.ss.o: ${FSINT}/afsint.ss.c - ${COMPILE} - -afsint.xdr.o: ${FSINT}/afsint.xdr.c - ${COMPILE} + $(AFS_CCRULE) $(VOL)/namei_ops.c vos.o: ${VOLSER}/vos.c - ${COMPILE} + $(AFS_CCRULE) $(VOLSER)/vos.c vos: vos.o ${VOSOBJS} ${VLSERVEROBJS} ${LIBS} ${TOP_LIBDIR}/libubik_pthread.a - ${CC} ${LDFLAGS} -o vos vos.o ${VOSOBJS} ${VLSERVEROBJS} ${LIBS} ${TOP_LIBDIR}/libubik_pthread.a ${MT_LIBS} ${XLIBS} + $(AFS_LDRULE) vos.o ${VOSOBJS} ${VLSERVEROBJS} ${LIBS} \ + ${TOP_LIBDIR}/libubik_pthread.a ${MT_LIBS} ${XLIBS} volserver: ${objects} ${LIBS} - ${CC} ${LDFLAGS} -o volserver ${objects} ${LIBS} ${MT_LIBS} ${XLIBS} + $(AFS_LDRULE) ${objects} ${LIBS} ${MT_LIBS} ${XLIBS} install: volserver ${INSTALL} -d ${DESTDIR}${afssrvlibexecdir} diff --git a/src/ubik/Makefile.in b/src/ubik/Makefile.in index 92ae7897c4..649270f012 100644 --- a/src/ubik/Makefile.in +++ b/src/ubik/Makefile.in @@ -7,6 +7,8 @@ srcdir=@srcdir@ include @TOP_OBJDIR@/src/config/Makefile.config +include @TOP_OBJDIR@/src/config/Makefile.lwp + INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -47,13 +49,15 @@ ${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 - ${CC} ${CFLAGS} -o utst_server utst_server.o utst_int.ss.o utst_int.xdr.o libubik.a $(LIBS) + $(AFS_LDRULE) utst_server.o utst_int.ss.o utst_int.xdr.o \ + libubik.a $(LIBS) utst_client: utst_client.o utst_int.cs.o utst_int.xdr.o libubik.a - ${CC} ${CFLAGS} -o utst_client utst_client.o utst_int.cs.o utst_int.xdr.o libubik.a $(LIBS) + $(AFS_LDRULE) utst_client.o utst_int.cs.o utst_int.xdr.o \ + libubik.a $(LIBS) udebug: udebug.o libubik.a - ${CC} ${CFLAGS} -o udebug udebug.o libubik.a $(LIBS) + $(AFS_LDRULE) udebug.o libubik.a $(LIBS) ubik_int.cs.c: ubik_int.xg ${RXGEN} -A -x -C -o $@ ${srcdir}/ubik_int.xg @@ -104,8 +108,6 @@ utst_server.o: utst_server.c ${INCLS} utst_int.h AFS_component_version_number.c utst_client.o: utst_client.c ${INCLS} utst_int.h AFS_component_version_number.c udebug.o: udebug.c ${INCLS} AFS_component_version_number.c - ${CC} ${CFLAGS} -I${TOP_INCDIR} -I${TOP_INCDIR}/afs -c ${srcdir}/udebug.c - uerrors.o: uerrors.c uerrors.c ubik.h: uerrors.et ubik.p.h diff --git a/src/update/Makefile.in b/src/update/Makefile.in index 03b2530ac4..07fd974a7f 100644 --- a/src/update/Makefile.in +++ b/src/update/Makefile.in @@ -7,6 +7,8 @@ srcdir=@srcdir@ include @TOP_OBJDIR@/src/config/Makefile.config +include @TOP_OBJDIR@/src/config/Makefile.lwp + INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -30,10 +32,10 @@ generated: update.cs.c update.ss.c update.xdr.c update.h # Build targets # upclient: client.o update.cs.o utils.o ${LIBS} - ${CC} ${CFLAGS} -o upclient client.o update.cs.o utils.o ${LIBS} ${XLIBS} + $(AFS_LDRULE) client.o update.cs.o utils.o ${LIBS} ${XLIBS} upserver: server.o utils.o update.ss.o ${LIBS} - ${CC} ${CFLAGS} -o upserver server.o utils.o update.ss.o ${LIBS} ${XLIBS} + $(AFS_LDRULE) server.o utils.o update.ss.o ${LIBS} ${XLIBS} utils.o: utils.c update.h global.h diff --git a/src/usd/Makefile.in b/src/usd/Makefile.in index 3365f76f32..b228449f44 100644 --- a/src/usd/Makefile.in +++ b/src/usd/Makefile.in @@ -7,15 +7,13 @@ srcdir=@srcdir@ include @TOP_OBJDIR@/src/config/Makefile.config +include @TOP_OBJDIR@/src/config/Makefile.lwp + INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ - - -CFLAGS=-I${TOP_OBJDIR}/src/config -I${TOP_INCDIR} ${XCFLAGS} ${ARCHFLAGS} - all: ${TOP_LIBDIR}/libusd.a ${TOP_INCDIR}/afs/usd.h ${TOP_LIBDIR}/libusd.a: libusd.a diff --git a/src/usd/test/Makefile.in b/src/usd/test/Makefile.in index d20d8fdbc5..743de309d7 100644 --- a/src/usd/test/Makefile.in +++ b/src/usd/test/Makefile.in @@ -7,6 +7,8 @@ srcdir=@srcdir@ include @TOP_OBJDIR@/src/config/Makefile.config +include @TOP_OBJDIR@/src/config/Makefile.lwp + INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -24,7 +26,7 @@ INCLS=${SRCDIR}/include/afs/param.h ${SRCDIR}/include/afs/usd.h # build usd_test usd_test: usd_test.o ${LIBUSD} $(INCLS) - $(CC) ${CFLAGS} -o usd_test usd_test.o ${LIBUSD} ${XLIBS} + $(AFS_LDFLAGS) usd_test.o ${LIBUSD} ${XLIBS} usd_test.o: usd_test.c diff --git a/src/uss/Makefile.in b/src/uss/Makefile.in index 08268126bb..774c5fd53c 100644 --- a/src/uss/Makefile.in +++ b/src/uss/Makefile.in @@ -7,6 +7,8 @@ srcdir=@srcdir@ include @TOP_OBJDIR@/src/config/Makefile.config +include @TOP_OBJDIR@/src/config/Makefile.lwp + INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -14,8 +16,6 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ all: uss -CFLAGS=${DBUG} ${COMMON_INCL} ${XCFLAGS} ${ARCHFLAGS} - # # Build targets # @@ -47,40 +47,18 @@ OBJS = uss_procs.o \ y.tab.o uss: uss.o ${OBJS} - ${CC} ${CFLAGS} -o uss uss.o ${OBJS} ${LIBS} + $(AFS_LDRULE) uss.o ${OBJS} ${LIBS} uss.o: uss.c AFS_component_version_number.c - ${CC} -c ${CFLAGS} ${srcdir}/uss.c - -uss_procs.o : uss_procs.c - ${CC} -c ${CFLAGS} ${srcdir}/uss_procs.c - -uss_common.o : uss_common.c - ${CC} -c ${CFLAGS} ${srcdir}/uss_common.c - -uss_vol.o : uss_vol.c - ${CC} -c ${CFLAGS} ${srcdir}/uss_vol.c - -uss_acl.o : uss_acl.c - ${CC} -c ${CFLAGS} ${srcdir}/uss_acl.c - -uss_ptserver.o : uss_ptserver.c - ${CC} -c ${CFLAGS} ${srcdir}/uss_ptserver.c - -uss_kauth.o : uss_kauth.c - ${CC} -c ${CFLAGS} @CFLAGS_NOERROR@ ${srcdir}/uss_kauth.c - -uss_fs.o : uss_fs.c - ${CC} -c ${CFLAGS} ${srcdir}/uss_fs.c +CFLAGS_uss_kauth.o = @CFLAGS_NOERROR@ +CFLAGS_lex.yy.o = @CFLAGS_NOUNUSED@ lex.yy.o : lex.yy.c y.tab.c - ${CC} -c ${CFLAGS} @CFLAGS_NOUNUSED@ lex.yy.c lex.yy.c : lex.l ${LEX} ${srcdir}/lex.l y.tab.o : y.tab.c - ${CC} -c ${CFLAGS} y.tab.c uss.c: uss_common.h uss_procs.h uss_kauth.h uss_fs.h diff --git a/src/util/Makefile.in b/src/util/Makefile.in index 4a811364e5..32e38ccf64 100644 --- a/src/util/Makefile.in +++ b/src/util/Makefile.in @@ -7,6 +7,8 @@ srcdir=@srcdir@ include @TOP_OBJDIR@/src/config/Makefile.config +include @TOP_OBJDIR@/src/config/Makefile.lwp + INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -149,91 +151,17 @@ util.a: ${objects} AFS_component_version_number.o $(RANLIB) util.a pthread_glock.o: ${srcdir}/pthread_glock.c ${includes} - ${MT_CC} ${CFLAGS} ${MT_CFLAGS} -c ${srcdir}/pthread_glock.c + ${MT_CC} $(COMMON_CFLAGS) ${MT_CFLAGS} -c ${srcdir}/pthread_glock.c -assert.o: ${srcdir}/assert.c ${includes} - ${CCOBJ} ${CFLAGS} -c ${srcdir}/assert.c - -casestrcpy.o: ${srcdir}/casestrcpy.c ${includes} - ${CCOBJ} ${CFLAGS} -c ${srcdir}/casestrcpy.c - -hputil.o: ${srcdir}/hputil.c ${includes} - ${CCOBJ} ${CFLAGS} -c ${srcdir}/hputil.c - -flipbase64.o: ${srcdir}/flipbase64.c ${includes} - ${CCOBJ} ${CFLAGS} -c ${srcdir}/flipbase64.c - -volparse.o: ${srcdir}/volparse.c ${includes} - ${CCOBJ} ${CFLAGS} -c ${srcdir}/volparse.c - -snprintf.o: ${srcdir}/snprintf.c ${includes} - ${CCOBJ} ${CFLAGS} -c ${srcdir}/snprintf.c - -fstab.o: ${srcdir}/fstab.c ${includes} - ${CCOBJ} ${CFLAGS} -c ${srcdir}/fstab.c - -base64.o: ${srcdir}/base64.c ${includes} - ${CCOBJ} ${CFLAGS} -c ${srcdir}/base64.c +${objects}: ${includes} config_file.o: ${TOP_SRCDIR}/external/heimdal/krb5/config_file.c krb5_locl.h - ${CCOBJ} ${CFLAGS} -c ${TOP_SRCDIR}/external/heimdal/krb5/config_file.c + $(AFS_CCRULE) -c ${TOP_SRCDIR}/external/heimdal/krb5/config_file.c -hostparse.o: ${srcdir}/hostparse.c ${includes} - ${CCOBJ} ${CFLAGS} -c ${srcdir}/hostparse.c - -exec.o: ${srcdir}/exec.c ${includes} - ${CCOBJ} ${CFLAGS} -c ${srcdir}/exec.c - -ktime.o: ${srcdir}/ktime.c ${includes} - ${CCOBJ} ${CFLAGS} -c ${srcdir}/ktime.c - -kreltime.o: ${srcdir}/kreltime.c ${includes} - ${CCOBJ} ${CFLAGS} -c ${srcdir}/kreltime.c - -get_krbrlm.o: ${srcdir}/get_krbrlm.c ${includes} - ${CCOBJ} ${CFLAGS} -c ${srcdir}/get_krbrlm.c - -uuid.o: ${srcdir}/uuid.c ${includes} - ${CCOBJ} ${CFLAGS} -c ${srcdir}/uuid.c - -sys.o: ${srcdir}/sys.c AFS_component_version_number.c ${includes} - ${CCOBJ} ${CFLAGS} -c ${srcdir}/sys.c +sys.o: sys.c AFS_component_version_number.c ${includes} sys: sys.o - ${CC} ${LDFLAGS} -o sys sys.o - -isathing.o: ${srcdir}/isathing.c ${includes} - ${CCOBJ} ${CFLAGS} -c ${srcdir}/isathing.c - -serverLog.o: ${srcdir}/serverLog.c ${includes} - ${CCOBJ} ${CFLAGS} -c ${srcdir}/serverLog.c - -dirpath.o: ${srcdir}/dirpath.c ${includes} - ${CCOBJ} ${CFLAGS} -c ${srcdir}/dirpath.c - -fileutil.o: ${srcdir}/fileutil.c ${includes} - ${CCOBJ} ${CFLAGS} -c ${srcdir}/fileutil.c - -netutils.o: ${srcdir}/netutils.c ${includes} - ${CCOBJ} ${CFLAGS} -c ${srcdir}/netutils.c - -afs_atomlist.o: ${srcdir}/afs_atomlist.c ${includes} - ${CCOBJ} ${CFLAGS} -c ${srcdir}/afs_atomlist.c - -afs_lhash.o: ${srcdir}/afs_lhash.c ${includes} - ${CCOBJ} ${CFLAGS} -c ${srcdir}/afs_lhash.c - -strlcat.o: ${srcdir}/strlcat.c ${includes} - ${CCOBJ} ${CFLAGS} -c ${srcdir}/strlcat.c - -strlcpy.o: ${srcdir}/strlcpy.c ${includes} - ${CCOBJ} ${CFLAGS} -c ${srcdir}/strlcpy.c - -strnlen.o: ${srcdir}/strnlen.c ${includes} - ${CCOBJ} ${CFLAGS} -c ${srcdir}/strnlen.c - -daemon.o: ${srcdir}/daemon.c ${includes} - ${CCOBJ} ${CFLAGS} -c ${srcdir}/daemon.c + $(AFS_LDRULE) sys.o # # Install targets diff --git a/src/util/test/Makefile.in b/src/util/test/Makefile.in index f59b9f5237..0391393efd 100644 --- a/src/util/test/Makefile.in +++ b/src/util/test/Makefile.in @@ -7,6 +7,8 @@ srcdir=@srcdir@ include @TOP_OBJDIR@/src/config/Makefile.config +include @TOP_OBJDIR@/src/config/Makefile.lwp + INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -18,22 +20,20 @@ CFLAGS = -I. -I.. -I${SRCDIR}/include ${XCFLAGS} ${ARCHFLAGS} ${DBG} tests: test_ktime ktest dirpath_test ktests.o: ktests.c ../ktime.h - ${CC} ${CFLAGS} -c ktests.c ktest: ktest.o ../util.a - ${CC} ${CFLAGS} -o ktest ktest.o ../util.a ${XLIBS} + $(AFS_LDRULE) ktest.o ../util.a ${XLIBS} test_ktime.o: test_ktime.c ../ktime.h - ${CC} ${CFLAGS} -c test_ktime.c test_ktime: test_ktime.o ../util.a - ${CC} ${CFLAGS} -o test_ktime test_ktime.o ../util.a ${XLIBS} + $(AFS_LDRULE) test_ktime.o ../util.a ${XLIBS} dirpath_test: dirpath_test.o ../util.a - ${CC} dirpath_test.o ${CFLAGS} -o dirpath_test ../util.a ${XLIBS} + $(AFS_LDRULE) dirpath_test.o ../util.a ${XLIBS} b64: b64.o ../util.a - ${CC} b64.o ${CFLAGS} -o b64 ../util.a ${XLIBS} + $(AFS_LDRULE) b64.o ../util.a ${XLIBS} fb64: fb64.o ../util.a - ${CC} fb64.o ${CFLAGS} -o fb64 ../util.a ${XLIBS} + $(AFS_LDRULE) fb64.o ../util.a ${XLIBS} diff --git a/src/venus/Makefile.in b/src/venus/Makefile.in index f6ed08ade5..8f01c2ebdc 100644 --- a/src/venus/Makefile.in +++ b/src/venus/Makefile.in @@ -7,6 +7,8 @@ srcdir=@srcdir@ include @TOP_OBJDIR@/src/config/Makefile.config +include @TOP_OBJDIR@/src/config/Makefile.lwp + INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -51,7 +53,7 @@ all: fs up fstrace cmdebug livesys kdump-build cacheout # Build targets # cacheout: cacheout.o - $(CC) ${CFLAGS} -o cacheout cacheout.o ${LIBS} ${XLIBS} ${CMLIBS} + $(AFS_LDRULE) cacheout.o ${LIBS} ${XLIBS} ${CMLIBS} cacheout.o: cacheout.c @@ -59,33 +61,34 @@ cacheout.o: cacheout.c up.o: up.c AFS_component_version_number.c up: up.o - ${CC} ${CFLAGS} -o up up.o ${LIBS} ${XLIBS} + $(AFS_LDRULE) up.o ${LIBS} ${XLIBS} fs.o: fs.c ${INCLS} AFS_component_version_number.c fs: fs.o $(LIBS) - ${CC} ${CFLAGS} -o fs fs.o ${TOP_LIBDIR}/libprot.a $(LIBS) ${XLIBS} + $(AFS_LDRULE) fs.o ${TOP_LIBDIR}/libprot.a $(LIBS) ${XLIBS} afsio.o: afsio.c ${INCLS} AFS_component_version_number.c afsio: afsio.o $(LIBS) - ${CC} ${CFLAGS} -o afsio afsio.o ${TOP_LIBDIR}/libprot.a ${TOP_LIBDIR}/libafsint.a $(LIBS) ${XLIBS} + $(AFS_LDRULE) afsio.o ${TOP_LIBDIR}/libprot.a \ + ${TOP_LIBDIR}/libafsint.a $(LIBS) ${XLIBS} livesys.o: livesys.c ${INCLS} AFS_component_version_number.c -livesys: livesys.c $(LIBS) - ${CC} ${CFLAGS} -o livesys ${srcdir}/livesys.c $(LIBS) ${XLIBS} +livesys: livesys.o $(LIBS) + $(AFS_LDRULE) livesys.o $(LIBS) ${XLIBS} -twiddle: twiddle.c $(LIBS) - ${CC} ${CFLAGS} -o twiddle ${srcdir}/twiddle.c $(LIBS) ${XLIBS} +twiddle: twiddle.o $(LIBS) + $(AFS_LDRULE) twiddle.o $(LIBS) ${XLIBS} -gcpags: gcpags.c $(LIBS) - ${CC} ${CFLAGS} -o gcpags ${srcdir}/gcpags.c $(LIBS) ${XLIBS} +gcpags: gcpags.o $(LIBS) + $(AFS_LDRULE) gcpags.o $(LIBS) ${XLIBS} whatfid.o: whatfid.c ${INCLS} AFS_component_version_number.c whatfid: whatfid.o ${LIBS} - ${CC} ${CFLAGS} -o whatfid whatfid.o ${LIBS} ${XLIBS} + $(AFS_LDRULE) whatfid.o ${LIBS} ${XLIBS} fstrace.o: fstrace.c AFS_component_version_number.c case ${SYS_NAME} in \ @@ -94,30 +97,32 @@ fstrace.o: fstrace.c AFS_component_version_number.c sun*_4* ) \ ${CC} ${DBG} ${OPTMZ} -I/usr/xpg2include -I/usr/5include -g -I${TOP_SRCDIR}/config -I${TOP_INCDIR} -I${TOP_INCDIR} -c fstrace.c ;; \ * ) \ - ${CC} ${CFLAGS} -I${TOP_OBJDIR}/src/config -I${TOP_INCDIR} -I${TOP_INCDIR} -c ${srcdir}/fstrace.c ;; \ + $(AFS_CCRULE) $(srcdir)/fstrace.c ;; \ esac fstrace: fstrace.o case ${SYS_NAME} in \ sun4_411 | sun4c_411 | sun4m_412 ) \ - ${CCXPG2} ${CFLAGS} -o fstrace fstrace.o ${TOP_LIBDIR}/libsys.a ${TOP_LIBDIR}/libcmd.a ${TOP_LIBDIR}/util.a ;; \ + ${CCXPG2} ${AFS_CFLAGS} -o fstrace fstrace.o ${TOP_LIBDIR}/libsys.a ${TOP_LIBDIR}/libcmd.a ${TOP_LIBDIR}/util.a ;; \ sun*_4* ) \ - ${CC} -L/usr/xpg2lib -L/usr/5lib ${CFLAGS} -g -o fstrace fstrace.o ${TOP_LIBDIR}/libsys.a ${TOP_LIBDIR}/libcmd.a ${TOP_LIBDIR}/util.a -lxpg ;; \ + ${CC} -L/usr/xpg2lib -L/usr/5lib ${AFS_CFLAGS} -g -o fstrace fstrace.o ${TOP_LIBDIR}/libsys.a ${TOP_LIBDIR}/libcmd.a ${TOP_LIBDIR}/util.a -lxpg ;; \ hp700_ux100 | hp800_ux100 | hp?00_ux10? | hp_ux10? | hp_ux11?) \ ${CC} -I${TOP_OBJDIR}/src/config -o fstrace fstrace.o ${TOP_LIBDIR}/libsys.a ${TOP_LIBDIR}/libcmd.a ${TOP_LIBDIR}/util.a ;; \ * ) \ - ${CC} ${CFLAGS} -o fstrace fstrace.o ${TOP_LIBDIR}/libsys.a ${TOP_LIBDIR}/libcmd.a ${TOP_LIBDIR}/util.a ${XLIBS} ;; \ + $(AFS_LDRULE) fstrace.o ${TOP_LIBDIR}/libsys.a \ + ${TOP_LIBDIR}/libcmd.a ${TOP_LIBDIR}/util.a \ + ${XLIBS} ;; \ esac cmdebug.o: cmdebug.c ${INCLS} AFS_component_version_number.c cmdebug: cmdebug.o ${CMLIBS} - $(CC) -o cmdebug cmdebug.o ${CFLAGS} ${CMLIBS} ${XLIBS} + $(AFS_LDRULE) cmdebug.o ${CMLIBS} ${XLIBS} dedebug.o: dedebug.c ${INCLS} AFS_component_version_number.c dedebug: dedebug.o ${CMLIBS} - $(CC) -o dedebug dedebug.o ${CFLAGS} ${CMLIBS} ${XLIBS} + $(AFS_LDRULE) dedebug.o ${CMLIBS} ${XLIBS} @@ -194,7 +199,7 @@ kdump.o: kdump.c ${INCLS} AFS_component_version_number.c *linux* ) \ $(MAKE) kdump-linux-${LINUX_VERSION}.o ;; \ alpha_osf1 | alpha_osf20 | alpha_osf30 | alpha_osf32 | alpha_osf32c| alpha_dux?? ) \ - ${CC} ${CFLAGS} -I/usr/sys/include -I/usr/sys/BINARY -I/usr/sys/AFS -DDEBUGGER -c ${srcdir}/kdump.c ;;\ + ${CC} ${AFS_CFLAGS} -I/usr/sys/include -I/usr/sys/BINARY -I/usr/sys/AFS -DDEBUGGER -c ${srcdir}/kdump.c ;;\ sgi_6? ) \ for f in ../libafs/STATIC.IP*/CPU_KDEFS; \ do IP=`expr "$$f" : '../libafs/STATIC.\(IP..\)'`; \ diff --git a/src/venus/test/Makefile.in b/src/venus/test/Makefile.in index d96ef153c1..9856511d6c 100644 --- a/src/venus/test/Makefile.in +++ b/src/venus/test/Makefile.in @@ -7,6 +7,8 @@ srcdir=@srcdir@ include @TOP_OBJDIR@/src/config/Makefile.config +include @TOP_OBJDIR@/src/config/Makefile.lwp + INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -17,21 +19,19 @@ INCDIRS= -I${TOP_OBJDIR}/src/config -I${TOP_INCDIR} -I.. LDIRS= -L${TOP_LIBDIR} -L.. LIBS= -lsys -lubik -lvldb -lauth -lrxkad -ldes -lcom_err -lcmd -lrx -llwp -lafsutil -CFLAGS = ${OPTIMIZE} ${INCDIRS} ${XCFLAGS} ${ARCHFLAGS} - all test: fulltest owntest idtest getinitparams install: dest: fulltest: fulltest.o - $(CC) $(CFLAGS) -o $@ $@.o $(LDIRS) $(LIBS) + $(AFS_LDRULE) $@.o $(LDIRS) $(LIBS) owntest: owntest.o - $(CC) $(CFLAGS) -o $@ $@.o $(LDIRS) $(LIBS) + $(AFS_LDRULE) $@.o $(LDIRS) $(LIBS) idtest: idtest.o - $(CC) $(CFLAGS) -o $@ $@.o $(LDIRS) $(LIBS) + $(AFS_LDRULE) $@.o $(LDIRS) $(LIBS) getinitparams: getinitparams.o - $(CC) $(CFLAGS) -o $@ $@.o $(LDIRS) $(LIBS) + $(AFS_LDRULE) $@.o $(LDIRS) $(LIBS) clean: $(RM) -f *.o fulltest owntest idtest getinitparams diff --git a/src/vfsck/Makefile.in b/src/vfsck/Makefile.in index 0aec7d62cc..7b1e80a7ba 100644 --- a/src/vfsck/Makefile.in +++ b/src/vfsck/Makefile.in @@ -18,12 +18,14 @@ # srcdir=@srcdir@ include @TOP_OBJDIR@/src/config/Makefile.config +include @TOP_OBJDIR@/src/config/Makefile.lwp + INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ -CFLAGS=${COMMON_CFLAGS} ${XCFLAGS} ${ARCHFLAGS} ${VFSCK_CFLAGS} +MODULE_CFLAGS=${VFSCK_CFLAGS} SRCS= dir.c inode.c main.c pass1.c pass1b.c pass2.c pass3.c \ pass4.c pass5.c setup.c utilities.c ufs_subr.c \ @@ -36,7 +38,7 @@ OBJS= dir.o inode.o main.o pass1.o pass1b.o pass2.o pass3.o pass4.o \ all: vfsck vfsck: ${OBJS} - ${CC} -o vfsck ${CFLAGS} ${OBJS} ${NON_SHARED} ${XLIBS} + $(AFS_LDRULE) ${OBJS} ${NON_SHARED} ${XLIBS} main.o: main.c AFS_component_version_number.c diff --git a/src/viced/Makefile.in b/src/viced/Makefile.in index b0be725540..4b6592a0de 100644 --- a/src/viced/Makefile.in +++ b/src/viced/Makefile.in @@ -9,17 +9,14 @@ srcdir=@srcdir@ include @TOP_OBJDIR@/src/config/Makefile.config +include @TOP_OBJDIR@/src/config/Makefile.lwp INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ HELPER_SPLINT=@HELPER_SPLINT@ - -CFLAGS=${DBG} ${OPTMZ} -I${TOP_OBJDIR}/src/config -I${TOP_INCDIR} \ - ${XCFLAGS} ${ARCHFLAGS} -DNINTERFACE - -LDFLAGS = ${DBUG} ${XLDFLAGS} ${ARCHFLAGS} +MODULE_CFLAGS = -DNINTERFACE LIBS=${TOP_LIBDIR}/libacl.a \ ${TOP_LIBDIR}/libvldb.a \ @@ -72,30 +69,32 @@ ${objects}: ${headers} viced.o: AFS_component_version_number.o check_sysid: check_sysid.c - ${CC} ${CFLAGS} -o check_sysid ${srcdir}/check_sysid.c + ${CC} ${AFS_CFLAGS} ${AFS_LDFLAGS} -o check_sysid \ + ${srcdir}/check_sysid.c fileserver: ${objects} ${headers} ${LIBS} set -x; \ case ${SYS_NAME} in \ rs_aix*) \ - ${CC} -K ${LDFLAGS} -o fileserver ${objects} \ - ${TOP_LIBDIR}/libaudit.a ${LIBS} ${XLIBS} ;; \ + ${CC} -K ${AFS_LDFLAGS} -o fileserver ${objects} \ + ${TOP_LIBDIR}/libaudit.a ${LIBS} ${XLIBS} ;; \ *) \ - ${CC} ${LDFLAGS} -o fileserver ${objects} \ - ${TOP_LIBDIR}/libaudit.a ${LIBS} ${XLIBS} ;; \ + $(AFS_LDRULE) ${objects} ${TOP_LIBDIR}/libaudit.a \ + ${LIBS} ${XLIBS} ;; \ esac +CFLAGS_fsprobe.o = @CFLAGS_NOERROR@ -DINTERPRET_DUMP fsprobe.o: fsprobe.c AFS_component_version_number.c - ${CC} ${CFLAGS} @CFLAGS_NOERROR@ -DINTERPRET_DUMP -c ${srcdir}/fsprobe.c fsprobe: fsprobe.o - ${CC} ${CFLAGS} -o fsprobe fsprobe.o ${LIBS} ${XLIBS} + $(AFS_LDRULE) fsprobe.o ${LIBS} ${XLIBS} +CFLAGS_cbd.o = -DINTERPRET_DUMP cbd.o: callback.c AFS_component_version_number.c - ${CC} ${CFLAGS} -DINTERPRET_DUMP -c -o cbd.o ${srcdir}/callback.c + $(AFS_CCRULE) $(srcdir)/callback.c cbd: cbd.o - ${CC} ${CFLAGS} -DINTERPRET_DUMP -o cbd cbd.o ${LIBS} ${XLIBS} + $(AFS_LDRULE) cbd.o ${LIBS} ${XLIBS} install: fileserver fs_stats.h ${INSTALL} -d ${DESTDIR}${afssrvlibexecdir} @@ -142,3 +141,4 @@ check-splint:: host.c \ physio.c \ callback.c + diff --git a/src/vlserver/Makefile.in b/src/vlserver/Makefile.in index c4a55eb412..36b4890fb0 100644 --- a/src/vlserver/Makefile.in +++ b/src/vlserver/Makefile.in @@ -7,6 +7,8 @@ srcdir=@srcdir@ include @TOP_OBJDIR@/src/config/Makefile.config +include @TOP_OBJDIR@/src/config/Makefile.lwp + INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -71,22 +73,22 @@ ${TOP_INCDIR}/afs/cnvldb.h: cnvldb.h ${INSTALL_DATA} $? $@ vldb_check: vldb_check.o ${LIBS} - $(CC) ${CFLAGS} -o vldb_check vldb_check.o ${LIBS} ${XLIBS} + $(AFS_LDRULE) vldb_check.o ${LIBS} ${XLIBS} vldb_check.o: vldb_check.c AFS_component_version_number.o cnvldb: cnvldb.o ${LIBS} - $(CC) ${CFLAGS} -o cnvldb cnvldb.o ${LIBS} ${XLIBS} + $(AFS_LDRULE) cnvldb.o ${LIBS} ${XLIBS} cnvldb.o: cnvldb.c cnvldb.h AFS_component_version_number.o sascnvldb: sascnvldb.o ${LIBS} - $(CC) ${CFLAGS} -o sascnvldb sascnvldb.o ${LIBS} ${XLIBS} + $(AFS_LDRULE) sascnvldb.o ${LIBS} ${XLIBS} sascnvldb.o: sascnvldb.c cnvldb.h AFS_component_version_number.o vlserver: vlserver.o vlutils.o vlprocs.o vldbint.ss.o vldbint.xdr.o $(LIBS) - $(CC) ${CFLAGS} -o vlserver vlserver.o vlutils.o vlprocs.o vldbint.ss.o \ + $(AFS_LDRULE) vlserver.o vlutils.o vlprocs.o vldbint.ss.o \ vldbint.xdr.o $(LIBS) ${XLIBS} ${TOP_LIBDIR}/libaudit.a vlserver.o: vlserver.c ${INCLS} AFS_component_version_number.o @@ -124,7 +126,8 @@ libvldb.a: $(OBJS) AFS_component_version_number.o $(RANLIB) $@ vlclient: vlclient.o libvldb.a $(LIBS) - $(CC) ${CFLAGS} -o vlclient vlclient.o libvldb.a $(LIBS) ${XLIBS} ${TOP_LIBDIR}/libcmd.a + $(AFS_LDRULE) vlclient.o libvldb.a $(LIBS) ${XLIBS} \ + ${TOP_LIBDIR}/libcmd.a vlclient.o: vlclient.c ${INCLS} AFS_component_version_number.o diff --git a/src/vol/Makefile.in b/src/vol/Makefile.in index 1eb8cff9bb..739f07c93f 100644 --- a/src/vol/Makefile.in +++ b/src/vol/Makefile.in @@ -9,18 +9,20 @@ srcdir=@srcdir@ include @TOP_OBJDIR@/src/config/Makefile.config +include @TOP_OBJDIR@/src/config/Makefile.lwp + INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ HELPER_SPLINT=@HELPER_SPLINT@ - LIBS=${TOP_LIBDIR}/libcmd.a vlib.a ${TOP_LIBDIR}/util.a \ ${TOP_LIBDIR}/libsys.a ${TOP_LIBDIR}/libdir.a \ ${TOP_LIBDIR}/liblwp.a ${TOP_LIBDIR}/libacl.a -CFLAGS = ${COMMON_CFLAGS} -D${SYS_NAME} ${FSINCLUDES} ${XCFLAGS} ${ARCHFLAGS} -DFSSYNC_BUILD_SERVER -DFSSYNC_BUILD_CLIENT +MODULE_CFLAGS= -D${SYS_NAME} ${FSINCLUDES} \ + -DFSSYNC_BUILD_SERVER -DFSSYNC_BUILD_CLIENT PUBLICHEADERS=nfs.h vnode.h viceinode.h volume.h volume_inline.h voldefs.h partition.h \ fssync.h ihandle.h namei_ops.h salvsync.h daemon_com.h vnode_inline.h @@ -174,9 +176,6 @@ vol-salvage.o vutil.o: volinodes.h vol-salvage.o salvager.o: vol-salvage.h vol-salvage.o: salvsync.h daemon_com.h -salvager.o: salvager.c - $(CC) $(CFLAGS) -c ${srcdir}/salvager.c - vlib.a: ${VLIBOBJS} AFS_component_version_number.o $(RM) -f $@ $(AR) crv $@ ${VLIBOBJS} AFS_component_version_number.o @@ -184,9 +183,9 @@ vlib.a: ${VLIBOBJS} AFS_component_version_number.o # new salvager: remove references to /vice by linking with novice.o salvager: vol-salvage.o physio.o vlib.a salvager.o ${LIBS} - ${CC} ${LDFLAGS} -o salvager vol-salvage.o physio.o salvager.o ${LIBS} ${XLIBS} + $(AFS_LDRULE) vol-salvage.o physio.o salvager.o ${LIBS} ${XLIBS} -salvager.o: AFS_component_version_number.c +salvager.o: salvager.c AFS_component_version_number.c vol-salvage: vol-salvage.o vol-info: vol-info.o physio.o ihandle.o @@ -194,12 +193,12 @@ vol-info: vol-info.o physio.o ihandle.o listinodes.o: listinodes.c AFS_component_version_number.c case ${SYS_NAME} in \ hp?00_ux101 | hp_ux10? ) \ - ${CC} ${CFLAGS} -D_FILE64 -c ${srcdir}/listinodes.c \ + ${CC} ${AFS_CFLAGS} -D_FILE64 -c ${srcdir}/listinodes.c \ ;; \ hp_ux11* ) \ - ${CC} ${CFLAGS} -D_FILE_OFFSET_BITS=64 -c ${srcdir}/listinodes.c \ + ${CC} ${AFS_CFLAGS} -D_FILE_OFFSET_BITS=64 -c ${srcdir}/listinodes.c \ ;; \ - * ) ${CC} ${CFLAGS} -c ${srcdir}/listinodes.c \ + * ) ${CC} ${AFS_CFLAGS} -c ${srcdir}/listinodes.c \ ;; \ esac @@ -208,25 +207,25 @@ gi: ${TOP_LIBDIR}/libsys.a *linux* | sgi_* | *fbsd* ) \ echo "Don't build gi on ${SYS_NAME}";; \ *) \ - ${CC} ${CFLAGS} -c ${srcdir}/gi.c ; \ - ${CC} ${LDFLAGS} -o gi gi.o ${TOP_LIBDIR}/libsys.a;; \ + ${CC} $(AFS_CPPFLAGS) $(AFS_CFLAGS) \ + -c ${srcdir}/gi.c ; \ + $(AFS_LDRULE) gi.o ${TOP_LIBDIR}/libsys.a;; \ esac namei_map: ${TOP_LIBDIR}/libsys.a namei_map.o - ${CC} ${CFLAGS} -o namei_map namei_map.o ${TOP_LIBDIR}/libafsutil.a ${LIBS} ${XLIBS} + $(AFS_LDRULE) namei_map.o ${TOP_LIBDIR}/libafsutil.a ${LIBS} ${XLIBS} volinfo: vol-info.o physio.o ihandle.o ${LIBS} - ${CC} ${CFLAGS} -o volinfo vol-info.o physio.o \ - ihandle.o ${LIBS} ${XLIBS} + $(AFS_LDRULE) vol-info.o physio.o ihandle.o ${LIBS} ${XLIBS} fssync-debug: fssync-debug.o physio.o AFS_component_version_number.c ${LIBS} - ${CC} ${LDFLAGS} -o fssync-debug fssync-debug.o physio.o ${LIBS} ${XLIBS} + $(AFS_LDRULE) fssync-debug.o physio.o ${LIBS} ${XLIBS} vol-bless: vol-bless.o physio.o ihandle.o ${LIBS} - ${CC} ${CFLAGS} -o vol-bless vol-bless.o physio.o ${LIBS} ${XLIBS} + $(AFS_LDRULE) vol-bless.o physio.o ${LIBS} ${XLIBS} -xfs_size_check: xfs_size_check.c - ${CC} ${CFLAGS} -o xfs_size_check ${srcdir}/xfs_size_check.c +xfs_size_check: xfs_size_check.o + $(AFS_LDRULE) xfs_size_check.o # # Misc. targets diff --git a/src/vol/test/Makefile.in b/src/vol/test/Makefile.in index 933c79a2dd..4cb0d1c26d 100644 --- a/src/vol/test/Makefile.in +++ b/src/vol/test/Makefile.in @@ -7,6 +7,8 @@ srcdir=@srcdir@ include @TOP_OBJDIR@/src/config/Makefile.config +include @TOP_OBJDIR@/src/config/Makefile.lwp + INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -15,7 +17,6 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INCDIRS=-I. -I.. -I${TOP_INCDIR} ${FSINCLUDES} INSTALL = ${SRCDIR}/bin/install -LDFLAGS = ${OPTMZ} ${PROF} ${LDIRS} ${XLDFLAGS} ${ARCHFLAGS} LIBS=${TOP_LIBDIR}/libcmd.a ${TOP_LIBDIR}/vlib.a \ ${TOP_LIBDIR}/util.a \ @@ -24,7 +25,7 @@ LIBS=${TOP_LIBDIR}/libcmd.a ${TOP_LIBDIR}/vlib.a \ NAMEI_LIBS=../vlib.a ${TOP_LIBDIR}/util.a ${TOP_LIBDIR}/liblwp.a -CFLAGS = -D${SYS_NAME} ${OPTMZ} ${INCDIRS} ${XCFLAGS} ${ARCHFLAGS} -g +MODULE_CFLAGS = -D${SYS_NAME} -g PROGS = listVicepx @@ -39,40 +40,32 @@ 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 -listVicepx.o: listVicepx.c utilities.c - ${CC} ${CFLAGS} -c listVicepx.c - ${CC} ${CFLAGS} -c utilities.c - -testpart: testpart.c ../vlib.a - ${CC} ${CFLAGS} ${LDFLAGS} -o $@ testpart.c \ - ${TOP_LIBDIR}/vlib.a ${TOP_LIBDIR}/liblwp.a \ +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 - ${CC} ${LDFLAGS} -o listVicepx listVicepx.o utilities.o ${LIBS} - -updateDirInode.o: updateDirInode.c - ${CC} ${CFLAGS} -c updateDirInode.c +listVicepx: listVicepx.o utilities.o + $(AFS_LDRULE) listVicepx.o utilities.o ${LIBS} updateDirInode: updateDirInode.o - ${CC} ${LDFLAGS} -o updateDirInode updateDirInode.o ${LIBS} + $(AFS_LDRULE) updateDirInode.o ${LIBS} NAMEI_PROGS = nicreate nincdec nino nilist namei: ${NAMEI_PROGS} nicreate: nicreate.o nsubr.o - ${CC} ${CFLAGS} -o nicreate nicreate.o nsubr.o ${NAMEI_LIBS} + $(AFS_LDRULE) nicreate.o nsubr.o ${NAMEI_LIBS} nincdec: nincdec.o nsubr.o - ${CC} ${CFLAGS} -o nincdec nincdec.o nsubr.o ${NAMEI_LIBS} + $(AFS_LDRULE) nincdec.o nsubr.o ${NAMEI_LIBS} nilist: nilist.o nsubr.o - ${CC} ${CFLAGS} -o nilist nilist.o nsubr.o ${NAMEI_LIBS} + $(AFS_LDRULE) nilist.o nsubr.o ${NAMEI_LIBS} nino: nino.o - ${CC} ${CFLAGS} -o nino nino.o ${TOP_LIBDIR}/util.a + $(AFS_LDRULE) nino.o ${TOP_LIBDIR}/util.a clean: $(RM) -f *.o *.a diff --git a/src/volser/Makefile.in b/src/volser/Makefile.in index e4a2d3b535..cc45af96d6 100644 --- a/src/volser/Makefile.in +++ b/src/volser/Makefile.in @@ -7,6 +7,8 @@ srcdir=@srcdir@ include @TOP_OBJDIR@/src/config/Makefile.config +include @TOP_OBJDIR@/src/config/Makefile.lwp + INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -84,19 +86,18 @@ ${TOP_INCDIR}/afs/volint.h: volint.h ${TOP_LIBDIR}/libvolser.a: libvolser.a ${INSTALL_DATA} $? $@ -restorevol: restorevol.c - ${CC} ${CFLAGS} -o restorevol ${srcdir}/restorevol.c \ - ${TOP_LIBDIR}/libcmd.a ${TOP_LIBDIR}/util.a ${XLIBS} +restorevol: restorevol.o + $(AFS_LDRULE) restorevol.o ${TOP_LIBDIR}/libcmd.a \ + ${TOP_LIBDIR}/util.a ${XLIBS} vos: vos.o ${VSOBJS} libvolser.a ${LIBS} - ${CC} ${LDFLAGS} -o vos vos.o $(VSOBJS) libvolser.a ${LIBS} ${XLIBS} + $(AFS_LDRULE) vos.o $(VSOBJS) libvolser.a ${LIBS} ${XLIBS} volserver: $(SOBJS) $(LIBS) ${TOP_LIBDIR}/libdir.a - ${CC} ${DBUG} -o volserver $(SOBJS) ${TOP_LIBDIR}/libdir.a \ - ${LDFLAGS} $(LIBS) ${XLIBS} + $(AFS_LDRULE) $(SOBJS) ${TOP_LIBDIR}/libdir.a $(LIBS) ${XLIBS} voldump: vol-dump.o ${VOLDUMP_LIBS} - ${CC} ${CFLAGS} -o voldump vol-dump.o ${VOLDUMP_LIBS} ${XLIBS} + $(AFS_LDRULE) vol-dump.o ${VOLDUMP_LIBS} ${XLIBS} libvolser.a: volint.cs.o $(VSOBJS) volint.ss.o AFS_component_version_number.o -$(RM) -f $@ diff --git a/src/xstat/Makefile.in b/src/xstat/Makefile.in index b0d365b60f..ffdd606884 100644 --- a/src/xstat/Makefile.in +++ b/src/xstat/Makefile.in @@ -10,6 +10,8 @@ srcdir=@srcdir@ include @TOP_OBJDIR@/src/config/Makefile.config +include @TOP_OBJDIR@/src/config/Makefile.lwp + INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -61,7 +63,7 @@ xstat_fs_callback.o: xstat_fs_callback.c ${FSINCLS} xstat_fs_test.o: xstat_fs_test.c ${FSINCLS} AFS_component_version_number.c xstat_fs_test: xstat_fs_test.o libxstat_fs.a ${LIBS} - ${CC} ${CFLAGS} -o xstat_fs_test xstat_fs_test.o libxstat_fs.a ${LIBS} ${XLIBS} + $(AFS_LDRULE) xstat_fs_test.o libxstat_fs.a ${LIBS} ${XLIBS} # # Cache Manager data collection @@ -78,7 +80,7 @@ xstat_cm.o: xstat_cm.c ${CMINCLS} xstat_cm_test.o: xstat_cm_test.c ${CMINCLS} AFS_component_version_number.c xstat_cm_test: xstat_cm_test.o libxstat_cm.a ${LIBS} - ${CC} ${CFLAGS} -o xstat_cm_test xstat_cm_test.o libxstat_cm.a ${LIBS} ${XLIBS} + $(AFS_LDRULE) xstat_cm_test.o libxstat_cm.a ${LIBS} ${XLIBS} # # Installation targets diff --git a/tests/Makefile.in b/tests/Makefile.in index d2d0bbfbc8..205df8410e 100644 --- a/tests/Makefile.in +++ b/tests/Makefile.in @@ -4,19 +4,17 @@ srcdir=@srcdir@ abs_top_srcdir=@abs_top_srcdir@ abs_top_builddir=@abs_top_builddir@ include @TOP_OBJDIR@/src/config/Makefile.config +include @TOP_OBJDIR@/src/config/Makefile.pthread -RUNTESTS_CPPFLAGS = -DSOURCE='"$(abs_top_srcdir)/tests"' \ +MODULE_CFLAGS = -DSOURCE='"$(abs_top_srcdir)/tests"' \ -DBUILD='"$(abs_top_builddir)/tests"' all: runtests cd tap && $(MAKE) $@ cd util && $(MAKE) $@ -runtests.o: $(srcdir)/runtests.c - $(CCOBJ) $(CFLAGS) $(RUNTESTS_CPPFLAGS) -c $(srcdir)/runtests.c - runtests: runtests.o - $(CC) $(LDFLAGS) -o runtests runtests.o + $(AFS_LDRULE) runtests.o check test tests: runtests cd tap && $(MAKE) $@ diff --git a/tests/rpctestlib/Makefile.in b/tests/rpctestlib/Makefile.in index 934825e0b7..36154a1c7e 100644 --- a/tests/rpctestlib/Makefile.in +++ b/tests/rpctestlib/Makefile.in @@ -9,9 +9,7 @@ srcdir=@srcdir@ include @TOP_OBJDIR@/src/config/Makefile.config - -# impermanent build glue -#@ENABLE_XCB@include @TOP_OBJDIR@/src/mcas/Makefile.osi +include @TOP_OBJDIR@/src/config/Makefile.pthread INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ @@ -26,14 +24,9 @@ FSINT=@TOP_OBJDIR@/src/fsint MCAS=@TOP_OBJDIR@/src/mcas OSI=@TOP_OBJDIR@/src/osi -CC=${MT_CC} -CFLAGS=${COMMON_CFLAGS} -DNINTERFACE ${MT_CFLAGS} -DRXDEBUG \ - -DFSSYNC_BUILD_SERVER -DSALVSYNC_BUILD_CLIENT \ - -I${TOP_SRCDIR} -I${RX} -I${MCAS} ${OSI_XCFLAGS} ${MCAS_CFLAGS} \ - -DSUBSYS_LOG_MACRO=RTLLog - -CCRULE=${CC} ${CFLAGS} -c $? -CCRULE2=${CC} ${CFLAGS} -c $? -o $@ +MODULE_CFLAGS=-DNINTERFACE -DRXDEBUG -DFSSYNC_BUILD_SERVER \ + -DSALVSYNC_BUILD_CLIENT -I${RX} -I${MCAS} ${OSI_XCFLAGS} \ + ${MCAS_CFLAGS} -DSUBSYS_LOG_MACRO=RTLLog headers= ${RTL}/rpc_test_procs.h @@ -50,39 +43,25 @@ LIBS=${TOP_LIBDIR}/libafsauthent.a ${TOP_LIBDIR}/libafsrpc.a ${TOP_LIBDIR}/util. all: xmpl_driver +CFLAGS_rx_pthread.o = -DDPF_FSLOG + rx_pthread.o: ${RX}/rx_pthread.c - ${CCRULE} -DDPF_FSLOG rpc_test_main.o: ${RTL}/rpc_test_main.c ${headers} - ${CCRULE} - rpc_test_procs.o: ${RTL}/rpc_test_procs.c ${headers} - ${CCRULE} - rpc_test_cb_procs.o: ${RTL}/rpc_test_cb_procs.c ${headers} - ${CCRULE} +CFLAGS_afsaux.o = -I{FSINT} afsaux.o: ${FSINT}/afsaux.c - ${CCRULE} -I{FSINT} - afscbint.ss.o: ${FSINT}/afscbint.ss.c - ${CCRULE} - afsint.cs.o: ${FSINT}/afsint.cs.c - ${CCRULE} - afsint.ss.o: ${FSINT}/afsint.ss.c - ${CCRULE} - afsint.xdr.o: ${FSINT}/afsint.xdr.c - ${CCRULE} - afscbint.xdr.o: ${FSINT}/afscbint.xdr.c - ${CCRULE} xmpl_driver: librpc_test_lib.a rpc_test_main.o ${LIBS} - ${CC} ${LDFLAGS} -o $@ rpc_test_main.o \ - librpc_test_lib.a ${LIBS} ${MT_LIBS} ${XLIBS} + $(AFS_LDRULE) rpc_test_main.o librpc_test_lib.a \ + ${LIBS} ${MT_LIBS} ${XLIBS} librpc_test_lib.a: ${LIBOBJS} $(RM) -f $@ diff --git a/tests/tap/Makefile.in b/tests/tap/Makefile.in index 6ce9c62f3c..d74a13d323 100644 --- a/tests/tap/Makefile.in +++ b/tests/tap/Makefile.in @@ -2,13 +2,14 @@ srcdir=@srcdir@ include @TOP_OBJDIR@/src/config/Makefile.config +include @TOP_OBJDIR@/src/config/Makefile.pthread objects = basic.o all check test tests: libtap.a basic.o: $(srcdir)/basic.c $(srcdir)/basic.h - $(CCOBJ) $(CFLAGS) -I$(srcdir)/.. -c $(srcdir)/basic.c + $(CC) $(AFS_CFLAGS) -I$(srcdir)/.. -c $(srcdir)/basic.c libtap.a: $(objects) $(RM) -f libtap.a diff --git a/tests/util/Makefile.in b/tests/util/Makefile.in index 852bc49ec3..89ea518d67 100644 --- a/tests/util/Makefile.in +++ b/tests/util/Makefile.in @@ -3,19 +3,20 @@ srcdir=@srcdir@ abs_top_builddir=@abs_top_builddir@ include @TOP_OBJDIR@/src/config/Makefile.config +include @TOP_OBJDIR@/src/config/Makefile.lwp -CFLAGS += -I$(srcdir)/.. +MODULE_CFLAGS = -I$(srcdir)/.. tests = ktime-t exec-alt-t all check test tests: $(tests) ktime-t: ktime-t.o - $(CC) $(LDFLAGS) -o ktime-t ktime-t.o ../tap/libtap.a \ - $(abs_top_builddir)/lib/util.a $(XLIBS) + $(AFS_LDRULE) ktime-t.o ../tap/libtap.a \ + $(abs_top_builddir)/lib/util.a $(XLIBS) exec-alt-t: exec-alt-t.o - $(CC) $(LDFLAGS) -o exec-alt-t exec-alt-t.o ../tap/libtap.a \ + $(AFS_LDRULE) exec-alt-t.o ../tap/libtap.a \ $(abs_top_builddir)/lib/util.a $(XLIBS) install: