From 91938b9585c196df4fad00cfc0d40e38f4f334b3 Mon Sep 17 00:00:00 2001 From: pschwan Date: Mon, 19 May 2003 06:26:23 +0000 Subject: [PATCH] Fix some minor autoconf incompatibilities, replace portals cvsignore files --- lnet/.cvsignore | 3 +++ lnet/{Rules.linux.in => Rules.linux} | 12 ------------ lnet/configure.in | 4 +--- lnet/include/.cvsignore | 3 +++ lnet/klnds/.cvsignore | 2 ++ lnet/klnds/gmlnd/.cvsignore | 3 +++ lnet/klnds/qswlnd/.cvsignore | 3 +++ lnet/klnds/scimaclnd/.cvsignore | 3 +++ lnet/klnds/socklnd/.cvsignore | 3 +++ lnet/klnds/toelnd/.cvsignore | 3 +++ lnet/libcfs/.cvsignore | 4 ++++ lnet/lnet/.cvsignore | 3 +++ lnet/router/.cvsignore | 3 +++ lnet/ulnds/.cvsignore | 3 +++ lustre/portals/.cvsignore | 3 +++ lustre/portals/{Rules.linux.in => Rules.linux} | 12 ------------ lustre/portals/configure.in | 4 +--- lustre/portals/include/.cvsignore | 3 +++ lustre/portals/knals/.cvsignore | 2 ++ lustre/portals/knals/gmnal/.cvsignore | 3 +++ lustre/portals/knals/qswnal/.cvsignore | 3 +++ lustre/portals/knals/scimacnal/.cvsignore | 3 +++ lustre/portals/knals/socknal/.cvsignore | 3 +++ lustre/portals/knals/toenal/.cvsignore | 3 +++ lustre/portals/libcfs/.cvsignore | 4 ++++ lustre/portals/portals/.cvsignore | 3 +++ lustre/portals/router/.cvsignore | 3 +++ lustre/portals/unals/.cvsignore | 3 +++ 28 files changed, 74 insertions(+), 30 deletions(-) create mode 100644 lnet/.cvsignore rename lnet/{Rules.linux.in => Rules.linux} (96%) create mode 100644 lnet/include/.cvsignore create mode 100644 lnet/klnds/.cvsignore create mode 100644 lnet/klnds/gmlnd/.cvsignore create mode 100644 lnet/klnds/qswlnd/.cvsignore create mode 100644 lnet/klnds/scimaclnd/.cvsignore create mode 100644 lnet/klnds/socklnd/.cvsignore create mode 100644 lnet/klnds/toelnd/.cvsignore create mode 100644 lnet/libcfs/.cvsignore create mode 100644 lnet/lnet/.cvsignore create mode 100644 lnet/router/.cvsignore create mode 100644 lnet/ulnds/.cvsignore create mode 100644 lustre/portals/.cvsignore rename lustre/portals/{Rules.linux.in => Rules.linux} (96%) create mode 100644 lustre/portals/include/.cvsignore create mode 100644 lustre/portals/knals/.cvsignore create mode 100644 lustre/portals/knals/gmnal/.cvsignore create mode 100644 lustre/portals/knals/qswnal/.cvsignore create mode 100644 lustre/portals/knals/scimacnal/.cvsignore create mode 100644 lustre/portals/knals/socknal/.cvsignore create mode 100644 lustre/portals/knals/toenal/.cvsignore create mode 100644 lustre/portals/libcfs/.cvsignore create mode 100644 lustre/portals/portals/.cvsignore create mode 100644 lustre/portals/router/.cvsignore create mode 100644 lustre/portals/unals/.cvsignore diff --git a/lnet/.cvsignore b/lnet/.cvsignore new file mode 100644 index 0000000..cd1dd4f --- /dev/null +++ b/lnet/.cvsignore @@ -0,0 +1,3 @@ +Kernelenv +Makefile +Makefile.in diff --git a/lnet/Rules.linux.in b/lnet/Rules.linux similarity index 96% rename from lnet/Rules.linux.in rename to lnet/Rules.linux index 8247deb..93943b7 100644 --- a/lnet/Rules.linux.in +++ b/lnet/Rules.linux @@ -1,29 +1,21 @@ # included in Linux kernel directories # Rules for module building -MODLINK=@MOD_LINK@ if LINUX25 - basename=$(shell echo $< | sed -e 's/\.c//g' | sed -e 's/-//g' | sed -e 's/\.o//g') AM_CPPFLAGS= -Wstrict-prototypes -Wno-trigraphs -fno-strict-aliasing -fno-common -pipe -mpreferred-stack-boundary=2 -DKBUILD_MODNAME=$(MODULE) -DKBUILD_BASENAME=$(basename) $(MODULE).o: $($(MODULE)_OBJECTS) $(LD) -m $(MOD_LINK) -r -o $(MODULE).o $($(MODULE)_OBJECTS) - - else - $(MODULE).o: $($(MODULE)_OBJECTS) $(LD) -m $(MOD_LINK) -r -o $(MODULE).o $($(MODULE)_OBJECTS) - - endif - tags: rm -f $(top_srcdir)/TAGS rm -f $(top_srcdir)/tags @@ -31,7 +23,3 @@ tags: find $(top_srcdir) -name '*.[hc]' | grep -v ".orig" | xargs etags -a find $(top_srcdir)/../portals/ -name '*.[hc]' | xargs ctags -a find $(top_srcdir) -name '*.[hc]' | grep -v ".orig" | xargs ctags -a - - - - diff --git a/lnet/configure.in b/lnet/configure.in index 7c32246..3cffe87 100644 --- a/lnet/configure.in +++ b/lnet/configure.in @@ -23,13 +23,11 @@ cp portals/Makefile.mk portals/Makefile.in cp knals/Makefile.mk knals/Makefile.in cp knals/socknal/Makefile.mk knals/socknal/Makefile.in cp router/Makefile.mk router/Makefile.in -AC_OUTPUT(Kernelenv) fi - AM_CONFIG_HEADER(include/config.h) -AC_OUTPUT([Rules.linux Makefile libcfs/Makefile portals/Makefile \ +AC_OUTPUT([Makefile Kernelenv libcfs/Makefile portals/Makefile \ unals/Makefile knals/Makefile router/Makefile \ knals/socknal/Makefile knals/gmnal/Makefile knals/qswnal/Makefile \ knals/scimacnal/Makefile knals/toenal/Makefile \ diff --git a/lnet/include/.cvsignore b/lnet/include/.cvsignore new file mode 100644 index 0000000..5e771c8 --- /dev/null +++ b/lnet/include/.cvsignore @@ -0,0 +1,3 @@ +config.h +stamp-h +stamp-h.in diff --git a/lnet/klnds/.cvsignore b/lnet/klnds/.cvsignore new file mode 100644 index 0000000..282522d --- /dev/null +++ b/lnet/klnds/.cvsignore @@ -0,0 +1,2 @@ +Makefile +Makefile.in diff --git a/lnet/klnds/gmlnd/.cvsignore b/lnet/klnds/gmlnd/.cvsignore new file mode 100644 index 0000000..e995588 --- /dev/null +++ b/lnet/klnds/gmlnd/.cvsignore @@ -0,0 +1,3 @@ +.deps +Makefile +Makefile.in diff --git a/lnet/klnds/qswlnd/.cvsignore b/lnet/klnds/qswlnd/.cvsignore new file mode 100644 index 0000000..e995588 --- /dev/null +++ b/lnet/klnds/qswlnd/.cvsignore @@ -0,0 +1,3 @@ +.deps +Makefile +Makefile.in diff --git a/lnet/klnds/scimaclnd/.cvsignore b/lnet/klnds/scimaclnd/.cvsignore new file mode 100644 index 0000000..e995588 --- /dev/null +++ b/lnet/klnds/scimaclnd/.cvsignore @@ -0,0 +1,3 @@ +.deps +Makefile +Makefile.in diff --git a/lnet/klnds/socklnd/.cvsignore b/lnet/klnds/socklnd/.cvsignore new file mode 100644 index 0000000..e995588 --- /dev/null +++ b/lnet/klnds/socklnd/.cvsignore @@ -0,0 +1,3 @@ +.deps +Makefile +Makefile.in diff --git a/lnet/klnds/toelnd/.cvsignore b/lnet/klnds/toelnd/.cvsignore new file mode 100644 index 0000000..e995588 --- /dev/null +++ b/lnet/klnds/toelnd/.cvsignore @@ -0,0 +1,3 @@ +.deps +Makefile +Makefile.in diff --git a/lnet/libcfs/.cvsignore b/lnet/libcfs/.cvsignore new file mode 100644 index 0000000..67d1a3d --- /dev/null +++ b/lnet/libcfs/.cvsignore @@ -0,0 +1,4 @@ +.deps +Makefile +Makefile.in +link-stamp diff --git a/lnet/lnet/.cvsignore b/lnet/lnet/.cvsignore new file mode 100644 index 0000000..e995588 --- /dev/null +++ b/lnet/lnet/.cvsignore @@ -0,0 +1,3 @@ +.deps +Makefile +Makefile.in diff --git a/lnet/router/.cvsignore b/lnet/router/.cvsignore new file mode 100644 index 0000000..e995588 --- /dev/null +++ b/lnet/router/.cvsignore @@ -0,0 +1,3 @@ +.deps +Makefile +Makefile.in diff --git a/lnet/ulnds/.cvsignore b/lnet/ulnds/.cvsignore new file mode 100644 index 0000000..e995588 --- /dev/null +++ b/lnet/ulnds/.cvsignore @@ -0,0 +1,3 @@ +.deps +Makefile +Makefile.in diff --git a/lustre/portals/.cvsignore b/lustre/portals/.cvsignore new file mode 100644 index 0000000..cd1dd4f --- /dev/null +++ b/lustre/portals/.cvsignore @@ -0,0 +1,3 @@ +Kernelenv +Makefile +Makefile.in diff --git a/lustre/portals/Rules.linux.in b/lustre/portals/Rules.linux similarity index 96% rename from lustre/portals/Rules.linux.in rename to lustre/portals/Rules.linux index 8247deb..93943b7 100644 --- a/lustre/portals/Rules.linux.in +++ b/lustre/portals/Rules.linux @@ -1,29 +1,21 @@ # included in Linux kernel directories # Rules for module building -MODLINK=@MOD_LINK@ if LINUX25 - basename=$(shell echo $< | sed -e 's/\.c//g' | sed -e 's/-//g' | sed -e 's/\.o//g') AM_CPPFLAGS= -Wstrict-prototypes -Wno-trigraphs -fno-strict-aliasing -fno-common -pipe -mpreferred-stack-boundary=2 -DKBUILD_MODNAME=$(MODULE) -DKBUILD_BASENAME=$(basename) $(MODULE).o: $($(MODULE)_OBJECTS) $(LD) -m $(MOD_LINK) -r -o $(MODULE).o $($(MODULE)_OBJECTS) - - else - $(MODULE).o: $($(MODULE)_OBJECTS) $(LD) -m $(MOD_LINK) -r -o $(MODULE).o $($(MODULE)_OBJECTS) - - endif - tags: rm -f $(top_srcdir)/TAGS rm -f $(top_srcdir)/tags @@ -31,7 +23,3 @@ tags: find $(top_srcdir) -name '*.[hc]' | grep -v ".orig" | xargs etags -a find $(top_srcdir)/../portals/ -name '*.[hc]' | xargs ctags -a find $(top_srcdir) -name '*.[hc]' | grep -v ".orig" | xargs ctags -a - - - - diff --git a/lustre/portals/configure.in b/lustre/portals/configure.in index 7c32246..3cffe87 100644 --- a/lustre/portals/configure.in +++ b/lustre/portals/configure.in @@ -23,13 +23,11 @@ cp portals/Makefile.mk portals/Makefile.in cp knals/Makefile.mk knals/Makefile.in cp knals/socknal/Makefile.mk knals/socknal/Makefile.in cp router/Makefile.mk router/Makefile.in -AC_OUTPUT(Kernelenv) fi - AM_CONFIG_HEADER(include/config.h) -AC_OUTPUT([Rules.linux Makefile libcfs/Makefile portals/Makefile \ +AC_OUTPUT([Makefile Kernelenv libcfs/Makefile portals/Makefile \ unals/Makefile knals/Makefile router/Makefile \ knals/socknal/Makefile knals/gmnal/Makefile knals/qswnal/Makefile \ knals/scimacnal/Makefile knals/toenal/Makefile \ diff --git a/lustre/portals/include/.cvsignore b/lustre/portals/include/.cvsignore new file mode 100644 index 0000000..5e771c8 --- /dev/null +++ b/lustre/portals/include/.cvsignore @@ -0,0 +1,3 @@ +config.h +stamp-h +stamp-h.in diff --git a/lustre/portals/knals/.cvsignore b/lustre/portals/knals/.cvsignore new file mode 100644 index 0000000..282522d --- /dev/null +++ b/lustre/portals/knals/.cvsignore @@ -0,0 +1,2 @@ +Makefile +Makefile.in diff --git a/lustre/portals/knals/gmnal/.cvsignore b/lustre/portals/knals/gmnal/.cvsignore new file mode 100644 index 0000000..e995588 --- /dev/null +++ b/lustre/portals/knals/gmnal/.cvsignore @@ -0,0 +1,3 @@ +.deps +Makefile +Makefile.in diff --git a/lustre/portals/knals/qswnal/.cvsignore b/lustre/portals/knals/qswnal/.cvsignore new file mode 100644 index 0000000..e995588 --- /dev/null +++ b/lustre/portals/knals/qswnal/.cvsignore @@ -0,0 +1,3 @@ +.deps +Makefile +Makefile.in diff --git a/lustre/portals/knals/scimacnal/.cvsignore b/lustre/portals/knals/scimacnal/.cvsignore new file mode 100644 index 0000000..e995588 --- /dev/null +++ b/lustre/portals/knals/scimacnal/.cvsignore @@ -0,0 +1,3 @@ +.deps +Makefile +Makefile.in diff --git a/lustre/portals/knals/socknal/.cvsignore b/lustre/portals/knals/socknal/.cvsignore new file mode 100644 index 0000000..e995588 --- /dev/null +++ b/lustre/portals/knals/socknal/.cvsignore @@ -0,0 +1,3 @@ +.deps +Makefile +Makefile.in diff --git a/lustre/portals/knals/toenal/.cvsignore b/lustre/portals/knals/toenal/.cvsignore new file mode 100644 index 0000000..e995588 --- /dev/null +++ b/lustre/portals/knals/toenal/.cvsignore @@ -0,0 +1,3 @@ +.deps +Makefile +Makefile.in diff --git a/lustre/portals/libcfs/.cvsignore b/lustre/portals/libcfs/.cvsignore new file mode 100644 index 0000000..67d1a3d --- /dev/null +++ b/lustre/portals/libcfs/.cvsignore @@ -0,0 +1,4 @@ +.deps +Makefile +Makefile.in +link-stamp diff --git a/lustre/portals/portals/.cvsignore b/lustre/portals/portals/.cvsignore new file mode 100644 index 0000000..e995588 --- /dev/null +++ b/lustre/portals/portals/.cvsignore @@ -0,0 +1,3 @@ +.deps +Makefile +Makefile.in diff --git a/lustre/portals/router/.cvsignore b/lustre/portals/router/.cvsignore new file mode 100644 index 0000000..e995588 --- /dev/null +++ b/lustre/portals/router/.cvsignore @@ -0,0 +1,3 @@ +.deps +Makefile +Makefile.in diff --git a/lustre/portals/unals/.cvsignore b/lustre/portals/unals/.cvsignore new file mode 100644 index 0000000..e995588 --- /dev/null +++ b/lustre/portals/unals/.cvsignore @@ -0,0 +1,3 @@ +.deps +Makefile +Makefile.in -- 1.8.3.1