Per bug 652: conditionally install LAM developent header files

This commit was SVN r134.

src/lam/ctnetwork/Makefile.am

@@ -7,9 +7,18 @@ include $(top_srcdir)/config/Makefile.options
 
 noinst_LTLIBRARIES = libctnetwork.la
 
+# Source code files
+
+headers = \
+	ctpeer.h \
+	ctchannel.h \
+	ctcontroller.h \
+	ctmessage.h \
+	ctnode.h
+
 libctnetwork_la_SOURCES = \
-	ctpeer.c \
+	$(headers) \
-	ctpeer.h
+	ctpeer.c
 
 bogus = \
         ctchannel.c \
@@ -20,3 +29,12 @@ bogus = \
 	ctmessage.h \
 	ctnode.c \
 	ctnode.h
+
+# Conditionally install the header files
+
+if WANT_INSTALL_HEADERS
+lamdir = $(includedir)/lam/lam/ctnetwork
+lam_HEADERS = $(headers)
+else
+lamdir = $(includedir)
+endif

src/lam/lfc/Makefile.am

@@ -7,13 +7,26 @@ include $(top_srcdir)/config/Makefile.options
 
 noinst_LTLIBRARIES = liblfc.la
 
-liblfc_la_SOURCES = \
+# Source code files
-	array.c \
+
+headers = \
 	array.h \
-	hash_table.c \
 	hash_table.h \
-	list.c \
 	list.h \
-	object.c \
 	object.h
 
+liblfc_la_SOURCES = \
+	$(headers) \
+	array.c \
+	hash_table.c \
+	list.c \
+	object.c
+
+# Conditionally install the header files
+
+if WANT_INSTALL_HEADERS
+lamdir = $(includedir)/lam/lam/lfc
+lam_HEADERS = $(headers)
+else
+lamdir = $(includedir)
+endif

src/lam/mem/Makefile.am

@@ -7,16 +7,30 @@ include $(top_srcdir)/config/Makefile.options
 
 noinst_LTLIBRARIES = libmem.la
 
-libmem_la_SOURCES = \
+# Source code files
-	allocator.c \
+
+headers = \
 	allocator.h \
-	free_list.c \
 	free_list.h \
-	mem_globals.c \
 	mem_globals.h \
-	mem_pool.c \
 	mem_pool.h \
-	seg_list.c \
 	seg_list.h \
-	sharedmem_util.c \
 	sharedmem_util.h
+
+libmem_la_SOURCES = \
+	$(headers) \
+	allocator.c \
+	free_list.c \
+	mem_globals.c \
+	mem_pool.c \
+	seg_list.c \
+	sharedmem_util.c
+
+# Conditionally install the header files
+
+if WANT_INSTALL_HEADERS
+lamdir = $(includedir)/lam/lam/mem
+lam_HEADERS = $(headers)
+else
+lamdir = $(includedir)
+endif

src/lam/os/Makefile.am

@@ -6,3 +6,17 @@
 include $(top_srcdir)/config/Makefile.options
 
 SUBDIRS = cygwin darwin irix linux tru64
+
+headers = \
+	atomic.h \
+	lam_system.h \
+	numa.h
+
+# Conditionally install the header files
+
+if WANT_INSTALL_HEADERS
+lamdir = $(includedir)/lam/lam/os
+lam_HEADERS = $(headers)
+else
+lamdir = $(includedir)
+endif

src/lam/os/cygwin/Makefile.am

@@ -5,7 +5,16 @@
 
 include $(top_srcdir)/config/Makefile.options
 
-noinst_HEADERS	= \
+headers = \
 	atomic.h \
 	smp_dev_params.h \
 	ulm_os.h
+
+# Conditionally install the header files
+
+if WANT_INSTALL_HEADERS
+lamdir = $(includedir)/lam/lam/os/cygwin
+lam_HEADERS = $(headers)
+else
+lamdir = $(includedir)
+endif

src/lam/os/darwin/Makefile.am

@@ -5,6 +5,15 @@
 
 include $(top_srcdir)/config/Makefile.options
 
-SUBDIRS		= powerpc ppc_64
+SUBDIRS = ppc_32 ppc_64
 
-noinst_HEADERS	= ulm_os.h
+headers = ulm_os.h
+
+# Conditionally install the header files
+
+if WANT_INSTALL_HEADERS
+lamdir = $(includedir)/lam/lam/os/darwin
+lam_HEADERS = $(headers)
+else
+lamdir = $(includedir)
+endif

src/lam/os/darwin/ppc_32/Makefile.am

@@ -4,6 +4,15 @@
 
 include $(top_srcdir)/config/Makefile.options
 
-noinst_HEADERS	= \
+headers = \
 	atomic.h \
 	smp_dev_params.h
+
+# Conditionally install the header files
+
+if WANT_INSTALL_HEADERS
+lamdir = $(includedir)/lam/lam/os/darwin/ppc_32
+lam_HEADERS = $(headers)
+else
+lamdir = $(includedir)
+endif

src/lam/os/darwin/ppc_64/Makefile.am

@@ -5,6 +5,15 @@
 
 include $(top_srcdir)/config/Makefile.options
 
-noinst_HEADERS	= \
+headers = \
 	atomic.h \
 	smp_dev_params.h
+
+# Conditionally install the header files
+
+if WANT_INSTALL_HEADERS
+lamdir = $(includedir)/lam/lam/os/darwin/ppc_64
+lam_HEADERS = $(headers)
+else
+lamdir = $(includedir)
+endif

src/lam/os/irix/Makefile.am

@@ -7,7 +7,16 @@ include $(top_srcdir)/config/Makefile.options
 
 SUBDIRS		= sn0
 
-noinst_HEADERS	= \
+headers = \
 	atomic.h \
 	smp_dev_params.h \
 	ulm_os.h
+
+# Conditionally install the header files
+
+if WANT_INSTALL_HEADERS
+lamdir = $(includedir)/lam/lam/os/irix
+lam_HEADERS = $(headers)
+else
+lamdir = $(includedir)
+endif

src/lam/os/linux/Makefile.am

@@ -5,6 +5,15 @@
 
 include $(top_srcdir)/config/Makefile.options
 
-SUBDIRS		= alpha i686 ia64 x86_64
+SUBDIRS = alpha i686 ia64 x86_64
 
-noinst_HEADERS	= ulm_os.h
+headers = ulm_os.h
+
+# Conditionally install the header files
+
+if WANT_INSTALL_HEADERS
+lamdir = $(includedir)/lam/lam/os/linux
+lam_HEADERS = $(headers)
+else
+lamdir = $(includedir)
+endif

src/lam/os/linux/alpha/Makefile.am

@@ -5,6 +5,15 @@
 
 include $(top_srcdir)/config/Makefile.options
 
-noinst_HEADERS	= \
+headers = \
 	atomic.h \
 	smp_dev_params.h
+
+# Conditionally install the header files
+
+if WANT_INSTALL_HEADERS
+lamdir = $(includedir)/lam/lam/os/linux/alpha
+lam_HEADERS = $(headers)
+else
+lamdir = $(includedir)
+endif

src/lam/os/linux/i686/Makefile.am

@@ -5,7 +5,16 @@
 
 include $(top_srcdir)/config/Makefile.options
 
-noinst_HEADERS	= \
+headers = \
 	atomic.h \
 	lock.s \
 	smp_dev_params.h
+
+# Conditionally install the header files
+
+if WANT_INSTALL_HEADERS
+lamdir = $(includedir)/lam/lam/os/linux/i686
+lam_HEADERS = $(headers)
+else
+lamdir = $(includedir)
+endif

src/lam/os/linux/ia64/Makefile.am

@@ -5,7 +5,16 @@
 
 include $(top_srcdir)/config/Makefile.options
 
-noinst_HEADERS	= \
+headers = \
 	atomic.h \
 	lock.s \
 	smp_dev_params.h
+
+# Conditionally install the header files
+
+if WANT_INSTALL_HEADERS
+lamdir = $(includedir)/lam/lam/os/linux/ia64
+lam_HEADERS = $(headers)
+else
+lamdir = $(includedir)
+endif

src/lam/os/linux/x86_64/Makefile.am

@@ -5,6 +5,15 @@
 
 include $(top_srcdir)/config/Makefile.options
 
-noinst_HEADERS	= \
+headers = \
 	atomic.h \
 	smp_dev_params.h
+
+# Conditionally install the header files
+
+if WANT_INSTALL_HEADERS
+lamdir = $(includedir)/lam/lam/os/linux/x86_64
+lam_HEADERS = $(headers)
+else
+lamdir = $(includedir)
+endif

src/lam/os/tru64/Makefile.am

@@ -5,7 +5,16 @@
 
 include $(top_srcdir)/config/Makefile.options
 
-noinst_HEADERS	= \
+headers = \
 	atomic.h \
 	smp_dev_params.h \
 	ulm_os.h
+
+# Conditionally install the header files
+
+if WANT_INSTALL_HEADERS
+lamdir = $(includedir)/lam/lam/os/tru64
+lam_HEADERS = $(headers)
+else
+lamdir = $(includedir)
+endif

src/lam/threads/Makefile.am

@@ -7,9 +7,23 @@ include $(top_srcdir)/config/Makefile.options
 
 noinst_LTLIBRARIES = libthreads.la
 
-libthreads_la_SOURCES = \
+# Source code files
+
+headers = \
 	mutex.h \
 	mutex_spinlock.h \
 	mutex_spinwait.h \
-	thread.c \
 	thread.h
+
+libthreads_la_SOURCES = \
+	$(headers) \
+	thread.c
+
+# Conditionally install the header files
+
+if WANT_INSTALL_HEADERS
+lamdir = $(includedir)/lam/lam/threads
+lam_HEADERS = $(headers)
+else
+lamdir = $(includedir)
+endif

src/lam/util/Makefile.am

@@ -7,13 +7,27 @@ include $(top_srcdir)/config/Makefile.options
 
 noinst_LTLIBRARIES = libutil.la
 
-libutil_la_SOURCES = \
+# Source code files
-	argv.c \
+
+headers = \
 	argv.h \
-	lam_log.c \
 	lam_log.h \
 	malloc.h \
-	reactor.c \
 	reactor.h \
-	strncpy.c \
 	strncpy.h
+
+libutil_la_SOURCES = \
+	$(headers) \
+	argv.c \
+	lam_log.c \
+	reactor.c \
+	strncpy.c
+
+# Conditionally install the header files
+
+if WANT_INSTALL_HEADERS
+lamdir = $(includedir)/lam/lam/util
+lam_HEADERS = $(headers)
+else
+lamdir = $(includedir)
+endif