Whamcloud - gitweb
git://git.whamcloud.com / fs / lustre-release.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: f7ecb3f)
b=3533
authorjacob <jacob>
Thu, 10 Jun 2004 23:25:29 +0000 (23:25 +0000)
committerjacob <jacob>
Thu, 10 Jun 2004 23:25:29 +0000 (23:25 +0000)
r=adilger

fixes from 1.2.2 release to make --disable/--enable work correctly for
buliding packages.

lnet/ulnds/Makefile.am patch | blob | history
lnet/ulnds/socklnd/Makefile.am patch | blob | history
lustre/portals/unals/Makefile.am patch | blob | history

diff --git a/lnet/ulnds/Makefile.am b/lnet/ulnds/Makefile.am
index 1681250..3437d39 100644 (file)
--- a/lnet/ulnds/Makefile.am
+++ b/lnet/ulnds/Makefile.am
@@ -1,10 +1,10 @@
 if LIBLUSTRE
+if !CRAY_PORTALS
 noinst_LIBRARIES = libtcpnal.a
 endif
+endif
 
-if !CRAY_PORTALS
-pkginclude_HEADERS =  pqtimer.h dispatch.h table.h timer.h connection.h ipmap.h bridge.h procbridge.h
+noinst_HEADERS =  pqtimer.h dispatch.h table.h timer.h connection.h ipmap.h bridge.h procbridge.h
 libtcpnal_a_SOURCES = debug.c pqtimer.c select.c table.c pqtimer.h dispatch.h table.h timer.h address.c procapi.c proclib.c connection.c tcpnal.c connection.h
 libtcpnal_a_CPPFLAGS = $(LLCPPFLAGS)
 libtcpnal_a_CFLAGS = $(LLCFLAGS)
-endif
\ No newline at end of file
diff --git a/lnet/ulnds/socklnd/Makefile.am b/lnet/ulnds/socklnd/Makefile.am
index 1681250..3437d39 100644 (file)
--- a/lnet/ulnds/socklnd/Makefile.am
+++ b/lnet/ulnds/socklnd/Makefile.am
@@ -1,10 +1,10 @@
 if LIBLUSTRE
+if !CRAY_PORTALS
 noinst_LIBRARIES = libtcpnal.a
 endif
+endif
 
-if !CRAY_PORTALS
-pkginclude_HEADERS =  pqtimer.h dispatch.h table.h timer.h connection.h ipmap.h bridge.h procbridge.h
+noinst_HEADERS =  pqtimer.h dispatch.h table.h timer.h connection.h ipmap.h bridge.h procbridge.h
 libtcpnal_a_SOURCES = debug.c pqtimer.c select.c table.c pqtimer.h dispatch.h table.h timer.h address.c procapi.c proclib.c connection.c tcpnal.c connection.h
 libtcpnal_a_CPPFLAGS = $(LLCPPFLAGS)
 libtcpnal_a_CFLAGS = $(LLCFLAGS)
-endif
\ No newline at end of file
diff --git a/lustre/portals/unals/Makefile.am b/lustre/portals/unals/Makefile.am
index 1681250..3437d39 100644 (file)
--- a/lustre/portals/unals/Makefile.am
+++ b/lustre/portals/unals/Makefile.am
@@ -1,10 +1,10 @@
 if LIBLUSTRE
+if !CRAY_PORTALS
 noinst_LIBRARIES = libtcpnal.a
 endif
+endif
 
-if !CRAY_PORTALS
-pkginclude_HEADERS =  pqtimer.h dispatch.h table.h timer.h connection.h ipmap.h bridge.h procbridge.h
+noinst_HEADERS =  pqtimer.h dispatch.h table.h timer.h connection.h ipmap.h bridge.h procbridge.h
 libtcpnal_a_SOURCES = debug.c pqtimer.c select.c table.c pqtimer.h dispatch.h table.h timer.h address.c procapi.c proclib.c connection.c tcpnal.c connection.h
 libtcpnal_a_CPPFLAGS = $(LLCPPFLAGS)
 libtcpnal_a_CFLAGS = $(LLCFLAGS)
-endif
\ No newline at end of file
Lustre primary development and releases