Move noinst_PROGRAMS to EXTRA_PROGRAMS.

The main product is the library, example programs should not be built by
default. Move them to EXTRA_PROGRAMS so they can still be built with a
manual make command.

diff --git a/examples/Makefile.am b/examples/Makefile.am
index 9c7261c073892173e9418175de22fbeaa667503b..ee64fa8ec37ff1ae69142a9edd8adbc272c332b3 100644 (file)
--- a/examples/Makefile.am
+++ b/examples/Makefile.am
@@ -1,4 +1,4 @@
-noinst_PROGRAMS = meshlinkapp chat chatpp manynodes channels groupchat
+EXTRA_PROGRAMS = meshlinkapp chat chatpp manynodes channels groupchat
 
 AM_CPPFLAGS = $(PTHREAD_CFLAGS) -I${top_srcdir}/src -iquote. -Wall
 AM_LDFLAGS = $(PTHREAD_LIBS)
@@ -9,7 +9,6 @@ meshlinkapp_LDADD = ${top_builddir}/src/libmeshlink.la
 chat_SOURCES = chat.c
 chat_LDADD = ${top_builddir}/src/libmeshlink.la
 
-noinst_PROGRAMS += chatpp
 chatpp_SOURCES = chatpp.cc
 chatpp_LDADD = ${top_builddir}/src/libmeshlink.la
 
@@ -20,7 +19,7 @@ channels_SOURCES = channels.c
 channels_LDADD = ${top_builddir}/src/libmeshlink.la
 
 if MONITOR
-noinst_PROGRAMS += monitor
+EXTRA_PROGRAMS += monitor
 monitor_SOURCES = monitor.c
 monitor_LDADD = ${top_builddir}/src/libmeshlink.la $(NCURSES_LIBS) -lm
 endif

diff --git a/src/Makefile.am b/src/Makefile.am
index b5beee15f523f0a6809ac0b750881ec8dfcbdd4c..fad47bff3a4af3aebb74c288b2af48491fd46aee 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -30,7 +30,7 @@ utcp_SOURCES = \
        utcp_priv.h
 
 lib_LTLIBRARIES = libmeshlink.la
-noinst_PROGRAMS = utcp-test
+EXTRA_PROGRAMS = utcp-test
 
 pkginclude_HEADERS = meshlink++.h meshlink.h