From 69a6204cdb258b5a54ce8ad856f11e0f2cc03e57 Mon Sep 17 00:00:00 2001 From: Ralf Corsepius Date: Thu, 27 Nov 2003 14:29:34 +0000 Subject: 2003-11-27 Ralf Corsepius * src/rpc/Makefile.am, src/xdr/Makefile.am, src/Makefile.am: Removed. * Makefile.am: Merge-in src/rpc/Makefile.am, src/xdr/Makefile.am, src/Makefile.am. Various fixes. Reformat. --- cpukit/librpc/ChangeLog | 8 ++ cpukit/librpc/Makefile.am | 184 ++++++++++++++++++++++++++++++++------ cpukit/librpc/src/Makefile.am | 8 -- cpukit/librpc/src/rpc/Makefile.am | 48 ---------- cpukit/librpc/src/xdr/Makefile.am | 33 ------- 5 files changed, 164 insertions(+), 117 deletions(-) delete mode 100644 cpukit/librpc/src/Makefile.am delete mode 100644 cpukit/librpc/src/rpc/Makefile.am delete mode 100644 cpukit/librpc/src/xdr/Makefile.am (limited to 'cpukit') diff --git a/cpukit/librpc/ChangeLog b/cpukit/librpc/ChangeLog index 7870483469..e4504bf457 100644 --- a/cpukit/librpc/ChangeLog +++ b/cpukit/librpc/ChangeLog @@ -1,3 +1,11 @@ +2003-11-27 Ralf Corsepius + + * src/rpc/Makefile.am, src/xdr/Makefile.am, src/Makefile.am: + Removed. + * Makefile.am: Merge-in src/rpc/Makefile.am, src/xdr/Makefile.am, + src/Makefile.am. + Various fixes. Reformat. + 2003-11-27 Ralf Corsepius * include/rpc/rpc.hinclude/rpc/rpc.h: Rename struct diff --git a/cpukit/librpc/Makefile.am b/cpukit/librpc/Makefile.am index 966d4b9e44..fa92dd94e7 100644 --- a/cpukit/librpc/Makefile.am +++ b/cpukit/librpc/Makefile.am @@ -2,43 +2,171 @@ ## $Id$ ## -SUBDIRS = . src +include $(top_srcdir)/automake/multilib.am +include $(top_srcdir)/automake/compile.am +include $(top_srcdir)/automake/lib.am -if HAS_NETWORKING +if LIBRPC include_rpcdir = $(includedir)/rpc -include_rpc_HEADERS = \ - include/rpc/auth.h include/rpc/auth_des.h include/rpc/auth_unix.h \ - include/rpc/clnt.h include/rpc/des.h include/rpc/des_crypt.h \ - include/rpc/pmap_clnt.h include/rpc/pmap_prot.h include/rpc/pmap_rmt.h \ - include/rpc/rpc.h include/rpc/rpc_com.h include/rpc/rpc_msg.h \ - include/rpc/svc.h include/rpc/svc_auth.h \ +include_rpc_HEADERS = include/rpc/auth.h include/rpc/auth_des.h \ + include/rpc/auth_unix.h include/rpc/clnt.h include/rpc/des.h \ + include/rpc/des_crypt.h include/rpc/pmap_clnt.h include/rpc/pmap_prot.h \ + include/rpc/pmap_rmt.h include/rpc/rpc.h include/rpc/rpc_com.h \ + include/rpc/rpc_msg.h include/rpc/svc.h include/rpc/svc_auth.h \ include/rpc/types.h include/rpc/xdr.h -PREINSTALL_FILES = $(PROJECT_INCLUDE)/rpc \ - $(include_rpc_HEADERS:include/rpc/%.h=$(PROJECT_INCLUDE)/rpc/%.h) +man_MANS = +#endif -$(PROJECT_INCLUDE)/rpc: +libxdr_C_FILES = src/xdr/xdr.c src/xdr/xdr_array.c src/xdr/xdr_float.c \ + src/xdr/xdr_mem.c src/xdr/xdr_rec.c src/xdr/xdr_reference.c \ + src/xdr/xdr_sizeof.c src/xdr/xdr_stdio.c + +CLEANDIRS = src/xdr + +EXTRA_DIST = $(libxdr_C_FILES) + +if LIBRPC +libxdr_C_O_FILES = \ + $(libxdr_C_FILES:src/xdr/%.c=src/xdr/$(ARCH)/%.$(OBJEXT)) + +libxdr_OBJS = $(libxdr_C_O_FILES) + +src/xdr/$(ARCH): @$(mkinstalldirs) $@ -$(PROJECT_INCLUDE)/%.h: include/%.h - $(INSTALL_DATA) $< $@ +src/xdr/$(ARCH)/%.$(OBJEXT): src/xdr/%.c + ${COMPILE} -o $@ -c $< +src/xdr/$(ARCH)/libxdr.a: $(libxdr_OBJS) + $(make-library) + +man_MANS += src/xdr/xdr.3 +all-local: src/xdr/$(ARCH) src/xdr/$(ARCH)/libxdr.a +endif + +librpc_C_FILES = src/rpc/auth_none.c src/rpc/auth_unix.c \ + src/rpc/authunix_prot.c src/rpc/bindresvport.c src/rpc/clnt_generic.c \ + src/rpc/clnt_perror.c src/rpc/clnt_raw.c src/rpc/clnt_simple.c \ + src/rpc/clnt_tcp.c src/rpc/clnt_udp.c src/rpc/get_myaddress.c \ + src/rpc/getrpcent.c src/rpc/getrpcport.c src/rpc/netname.c \ + src/rpc/netnamer.c src/rpc/pmap_clnt.c src/rpc/pmap_getmaps.c \ + src/rpc/pmap_getport.c src/rpc/pmap_prot.c src/rpc/pmap_prot2.c \ + src/rpc/pmap_rmt.c src/rpc/rpc_callmsg.c src/rpc/rpc_commondata.c \ + src/rpc/rpc_dtablesize.c src/rpc/rpc_prot.c src/rpc/rpcdname.c \ + src/rpc/rtime.c src/rpc/svc.c src/rpc/svc_auth.c src/rpc/svc_auth_unix.c \ + src/rpc/svc_raw.c src/rpc/svc_run.c src/rpc/svc_simple.c \ + src/rpc/svc_tcp.c src/rpc/svc_udp.c src/rpc/rtems_portmapper.c \ + src/rpc/rtems_rpc.c +librpc_UNUSED_C_FILES = src/rpc/auth_des.c src/rpc/auth_time.c \ + src/rpc/authdes_prot.c src/rpc/clnt_unix.c src/rpc/crypt_client.c \ + src/rpc/des_crypt.c src/rpc/des_soft.c src/rpc/getpublickey.c \ + src/rpc/key_call.c src/rpc/key_prot_xdr.c src/rpc/svc_auth_des.c \ + src/rpc/svc_unix.c + +if LIBRPC +librpc_C_O_FILES = \ + $(librpc_C_FILES:src/rpc/%.c=src/rpc/$(ARCH)/%.$(OBJEXT)) + +librpc_OBJS = $(librpc_C_O_FILES) + +librpc_a_CPPFLAGS = -D_RPC_read=read -D_RPC_write=write -D_RPC_close=close \ + -D_RTEMS_RPC_INTERNAL_ + +src/rpc/$(ARCH): + @$(mkinstalldirs) $@ +src/rpc/$(ARCH)/%.$(OBJEXT): src/rpc/%.c + ${COMPILE} $(librpc_a_CPPFLAGS) -o $@ -c $< +src/rpc/$(ARCH)/librpc.a: $(librpc_OBJS) + $(make-library) + +man_MANS += src/rpc/bindresvport.3 src/rpc/getrpcent.3 src/rpc/publickey.3 \ + src/rpc/rpc.3 src/rpc/rpc_secure.3 src/rpc/rstat_svc.8 \ + src/rpc/des_crypt.3 src/rpc/getrpcport.3 src/rpc/publickey.5 \ + src/rpc/rpc.5 src/rpc/rstat.1 src/rpc/rtime.3 + +all-local: src/rpc/$(ARCH) src/rpc/$(ARCH)/librpc.a +endif + +CLEANDIRS += src/rpc + +EXTRA_DIST += $(librpc_C_FILES) src/rpc/DISCLAIMER $(librpc_UNUSED_C_FILES) + +EXTRA_DIST += src/rpc/PSD.doc/nfs.rfc.ms src/rpc/PSD.doc/rpc.prog.ms \ + src/rpc/PSD.doc/rpc.rfc.ms src/rpc/PSD.doc/rpcgen.ms \ + src/rpc/PSD.doc/xdr.nts.ms src/rpc/PSD.doc/xdr.rfc.ms + endif -all-local: $(PREINSTALL_FILES) +PREINSTALL_FILES = + +if LIBRPC +$(PROJECT_INCLUDE)/rpc: + @$(mkinstalldirs) $(PROJECT_INCLUDE)/rpc +PREINSTALL_FILES += $(PROJECT_INCLUDE)/rpc + +$(PROJECT_INCLUDE)/rpc/auth.h: include/rpc/auth.h + $(INSTALL_DATA) $< $@ +PREINSTALL_FILES += $(PROJECT_INCLUDE)/rpc/auth.h + +$(PROJECT_INCLUDE)/rpc/auth_des.h: include/rpc/auth_des.h + $(INSTALL_DATA) $< $@ +PREINSTALL_FILES += $(PROJECT_INCLUDE)/rpc/auth_des.h + +$(PROJECT_INCLUDE)/rpc/auth_unix.h: include/rpc/auth_unix.h + $(INSTALL_DATA) $< $@ +PREINSTALL_FILES += $(PROJECT_INCLUDE)/rpc/auth_unix.h + +$(PROJECT_INCLUDE)/rpc/clnt.h: include/rpc/clnt.h + $(INSTALL_DATA) $< $@ +PREINSTALL_FILES += $(PROJECT_INCLUDE)/rpc/clnt.h + +$(PROJECT_INCLUDE)/rpc/des.h: include/rpc/des.h + $(INSTALL_DATA) $< $@ +PREINSTALL_FILES += $(PROJECT_INCLUDE)/rpc/des.h + +$(PROJECT_INCLUDE)/rpc/des_crypt.h: include/rpc/des_crypt.h + $(INSTALL_DATA) $< $@ +PREINSTALL_FILES += $(PROJECT_INCLUDE)/rpc/des_crypt.h + +$(PROJECT_INCLUDE)/rpc/pmap_clnt.h: include/rpc/pmap_clnt.h + $(INSTALL_DATA) $< $@ +PREINSTALL_FILES += $(PROJECT_INCLUDE)/rpc/pmap_clnt.h + +$(PROJECT_INCLUDE)/rpc/pmap_prot.h: include/rpc/pmap_prot.h + $(INSTALL_DATA) $< $@ +PREINSTALL_FILES += $(PROJECT_INCLUDE)/rpc/pmap_prot.h + +$(PROJECT_INCLUDE)/rpc/pmap_rmt.h: include/rpc/pmap_rmt.h + $(INSTALL_DATA) $< $@ +PREINSTALL_FILES += $(PROJECT_INCLUDE)/rpc/pmap_rmt.h + +$(PROJECT_INCLUDE)/rpc/rpc.h: include/rpc/rpc.h + $(INSTALL_DATA) $< $@ +PREINSTALL_FILES += $(PROJECT_INCLUDE)/rpc/rpc.h + +$(PROJECT_INCLUDE)/rpc/rpc_com.h: include/rpc/rpc_com.h + $(INSTALL_DATA) $< $@ +PREINSTALL_FILES += $(PROJECT_INCLUDE)/rpc/rpc_com.h + +$(PROJECT_INCLUDE)/rpc/rpc_msg.h: include/rpc/rpc_msg.h + $(INSTALL_DATA) $< $@ +PREINSTALL_FILES += $(PROJECT_INCLUDE)/rpc/rpc_msg.h + +$(PROJECT_INCLUDE)/rpc/svc.h: include/rpc/svc.h + $(INSTALL_DATA) $< $@ +PREINSTALL_FILES += $(PROJECT_INCLUDE)/rpc/svc.h + +$(PROJECT_INCLUDE)/rpc/svc_auth.h: include/rpc/svc_auth.h + $(INSTALL_DATA) $< $@ +PREINSTALL_FILES += $(PROJECT_INCLUDE)/rpc/svc_auth.h -EXTRA_DIST = include/rpcsvc/bootparam_prot.x include/rpcsvc/crypt.x \ - include/rpcsvc/key_prot.x include/rpcsvc/klm_prot.x \ - include/rpcsvc/mount.x include/rpcsvc/nfs_prot.x include/rpcsvc/nis.x \ - include/rpcsvc/nis_cache.x include/rpcsvc/nis_callback.x \ - include/rpcsvc/nis_db.h include/rpcsvc/nis_object.x \ - include/rpcsvc/nis_tags.h include/rpcsvc/nislib.h \ - include/rpcsvc/nlm_prot.x include/rpcsvc/pmap_prot.x \ - include/rpcsvc/rex.x include/rpcsvc/rnusers.x include/rpcsvc/rquota.x \ - include/rpcsvc/rstat.x include/rpcsvc/rwall.x include/rpcsvc/sm_inter.x \ - include/rpcsvc/spray.x include/rpcsvc/yp.x include/rpcsvc/yp_prot.h \ - include/rpcsvc/ypclnt.h include/rpcsvc/yppasswd.x \ - include/rpcsvc/ypupdate_prot.x include/rpcsvc/ypxfrd.x +$(PROJECT_INCLUDE)/rpc/types.h: include/rpc/types.h + $(INSTALL_DATA) $< $@ +PREINSTALL_FILES += $(PROJECT_INCLUDE)/rpc/types.h -EXTRA_DIST += README_RTEMS +$(PROJECT_INCLUDE)/rpc/xdr.h: include/rpc/xdr.h + $(INSTALL_DATA) $< $@ +PREINSTALL_FILES += $(PROJECT_INCLUDE)/rpc/xdr.h + +endif -include $(top_srcdir)/automake/subdirs.am include $(top_srcdir)/automake/local.am diff --git a/cpukit/librpc/src/Makefile.am b/cpukit/librpc/src/Makefile.am deleted file mode 100644 index b561cda3c4..0000000000 --- a/cpukit/librpc/src/Makefile.am +++ /dev/null @@ -1,8 +0,0 @@ -## -## $Id$ -## - -SUBDIRS = xdr rpc - -include $(top_srcdir)/automake/subdirs.am -include $(top_srcdir)/automake/local.am diff --git a/cpukit/librpc/src/rpc/Makefile.am b/cpukit/librpc/src/rpc/Makefile.am deleted file mode 100644 index 297cf8d016..0000000000 --- a/cpukit/librpc/src/rpc/Makefile.am +++ /dev/null @@ -1,48 +0,0 @@ -## -## $Id$ -## - -include $(top_srcdir)/automake/multilib.am -include $(top_srcdir)/automake/compile.am -include $(top_srcdir)/automake/lib.am - -LIB = $(ARCH)/librpc.a - -C_FILES = auth_none.c auth_unix.c authunix_prot.c bindresvport.c \ - clnt_generic.c clnt_perror.c clnt_raw.c clnt_simple.c clnt_tcp.c \ - clnt_udp.c get_myaddress.c getrpcent.c getrpcport.c netname.c netnamer.c \ - pmap_clnt.c pmap_getmaps.c pmap_getport.c pmap_prot.c pmap_prot2.c \ - pmap_rmt.c rpc_callmsg.c rpc_commondata.c rpc_dtablesize.c rpc_prot.c \ - rpcdname.c rtime.c svc.c svc_auth.c svc_auth_unix.c svc_raw.c svc_run.c \ - svc_simple.c svc_tcp.c svc_udp.c rtems_portmapper.c rtems_rpc.c -UNUSED_C_FILES = auth_des.c auth_time.c authdes_prot.c clnt_unix.c \ - crypt_client.c des_crypt.c des_soft.c getpublickey.c key_call.c \ - key_prot_xdr.c svc_auth_des.c svc_unix.c - -C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT)) - -OBJS = $(C_O_FILES) - -# -# Add local stuff here using += -# - -AM_CPPFLAGS += -D_RPC_read=read -D_RPC_write=write -D_RPC_close=close -D_RTEMS_RPC_INTERNAL_ - -if LIBRPC -$(LIB): $(OBJS) - $(make-library) - -noinst_MANS = bindresvport.3 getrpcent.3 publickey.3 rpc.3 rpc_secure.3 \ - rstat_svc.8 des_crypt.3 getrpcport.3 publickey.5 rpc.5 rstat.1 rtime.3 - -man_MANS = $(noinst_MANS) -all-local: $(ARCH) $(LIB) -endif - -EXTRA_DIST = $(C_FILES) DISCLAIMER $(UNUSED_C_FILES) $(noinst_MANS) - -EXTRA_DIST += PSD.doc/nfs.rfc.ms PSD.doc/rpc.prog.ms PSD.doc/rpc.rfc.ms \ - PSD.doc/rpcgen.ms PSD.doc/xdr.nts.ms PSD.doc/xdr.rfc.ms - -include $(top_srcdir)/automake/local.am diff --git a/cpukit/librpc/src/xdr/Makefile.am b/cpukit/librpc/src/xdr/Makefile.am deleted file mode 100644 index 3e7d848e3e..0000000000 --- a/cpukit/librpc/src/xdr/Makefile.am +++ /dev/null @@ -1,33 +0,0 @@ -## -## $Id$ -## - -LIB = $(ARCH)/libxdr.a - -include $(top_srcdir)/automake/multilib.am -include $(top_srcdir)/automake/compile.am -include $(top_srcdir)/automake/lib.am - -C_FILES = xdr.c xdr_array.c xdr_float.c xdr_mem.c xdr_rec.c xdr_reference.c \ - xdr_sizeof.c xdr_stdio.c -C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT)) - -OBJS = $(C_O_FILES) - -noinst_MANS = xdr.3 - -# -# Add local stuff here using += -# - -if LIBRPC -$(LIB): $(OBJS) - $(make-library) - -man_MANS = $(noinst_MANS) -all-local: $(ARCH) $(LIB) -endif - -EXTRA_DIST = $(C_FILES) $(noinst_MANS) - -include $(top_srcdir)/automake/local.am -- cgit v1.2.3