[Libtirpc-devel] [PATCH 2/3] Make the build system totally non-recursive.

[Diego E. P. <fla...@gm...>]

By using non-recursive make we cut down the time needed to build rpcbind,
without losing any feature at all.

Beside making it non-recursive, also clean the makefile up a bit.

Signed-off-by: Diego Elio Pettenò <fla...@gm...>
---
 .gitignore      |   10 +++-------
 Makefile.am     |   43 ++++++++++++++++++++++++++++++++++++++++++-
 configure.in    |    4 +---
 man/Makefile.am |    2 --
 src/Makefile.am |   35 -----------------------------------
 5 files changed, 46 insertions(+), 48 deletions(-)
 delete mode 100644 man/Makefile.am
 delete mode 100644 src/Makefile.am

diff --git a/.gitignore b/.gitignore
index 5a7546c..cbce869 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,18 +13,14 @@ depcomp
 install-sh
 libtool
 ltmain.sh
-man/Makefile
-man/Makefile.in
 missing
-src/.deps/
-src/Makefile
-src/Makefile.in
 src/config.h
 src/stamp-h2
 stamp-h1
 # file generated during compilation
+.deps
 *.o
-src/rpcbind
-src/rpcinfo
+rpcbind
+rpcinfo
 # cscope database files
 cscope.*
diff --git a/Makefile.am b/Makefile.am
index cd56148..60bdead 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,2 +1,43 @@
-SUBDIRS= src man
+AM_CPPFLAGS = \
+	-DCHECK_LOCAL \
+	-DPORTMAP \
+	-DFACILITY=LOG_MAIL \
+	-DSEVERITY=LOG_INFO \
+	-DINET6 \
+	-DVERSION="\"$(VERSION)\"" \
+	-D_GNU_SOURCE \
+	$(TIRPC_CFLAGS)
 
+if DEBUG
+AM_CPPFLAGS +=	-DRPCBIND_DEBUG -DSVC_RUN_DEBUG -DDEBUG_RMTCALL
+AM_CPPFLAGS +=	-DND_DEBUG -DBIND_DEBUG
+endif
+
+if WARMSTART
+AM_CPPFLAGS +=	-DWARMSTART
+endif
+
+if LIBWRAP
+AM_CPPFLAGS +=	-DLIBWRAP
+endif
+
+bin_PROGRAMS = rpcbind rpcinfo
+
+rpcbind_SOURCES = \
+	src/check_bound.c \
+	src/pmap_svc.c \
+	src/rpcb_stat.c \
+	src/rpcb_svc.c \
+	src/rpcb_svc_4.c \
+	src/rpcb_svc_com.c \
+	src/rpcbind.c \
+	src/rpcbind.h \
+	src/security.c \
+	src/util.c \
+	src/warmstart.c
+rpcbind_LDADD = $(TIRPC_LIBS) -lpthread
+
+rpcinfo_SOURCES =       src/rpcinfo.c
+rpcinfo_LDADD   =       $(TIRPC_LIBS) -lpthread
+
+dist_man8_MANS = man/rpcbind.8
diff --git a/configure.in b/configure.in
index 7d43fd4..a4d3776 100644
--- a/configure.in
+++ b/configure.in
@@ -63,6 +63,4 @@ AC_ARG_ENABLE(libwrap,[ --enable-libwrap  Enables host name checking],
 	esac],[libwarp=false])
 AM_CONDITIONAL(LIBWRAP, test x$libwarp = xtrue)
 
-AC_CONFIG_FILES([Makefile src/Makefile man/Makefile])
-AC_OUTPUT()
-                                                                   
+AC_OUTPUT([Makefile])
diff --git a/man/Makefile.am b/man/Makefile.am
deleted file mode 100644
index 84818e9..0000000
--- a/man/Makefile.am
+++ /dev/null
@@ -1,2 +0,0 @@
-man8_MANS   = rpcbind.8
-EXTRA_DIST  = $(man8_MANS)
diff --git a/src/Makefile.am b/src/Makefile.am
deleted file mode 100644
index a2f3e34..0000000
--- a/src/Makefile.am
+++ /dev/null
@@ -1,35 +0,0 @@
-INCLUDES = $(TIRPC_CFLAGS) -DPORTMAP -DINET6 -DVERSION="\"$(VERSION)\"" \
-                                                -D_GNU_SOURCE -Wall -pipe
-if DEBUG
-INCLUDES +=	-DRPCBIND_DEBUG -DSVC_RUN_DEBUG -DDEBUG_RMTCALL
-INCLUDES +=	-DND_DEBUG -DBIND_DEBUG
-endif
-
-if WARMSTART
-INCLUDES +=	-DWARMSTART
-endif
-
-if LIBWRAP
-INCLUDES +=	-DLIBWRAP
-endif
-
-
-bin_PROGRAMS = rpcbind rpcinfo
-
-rpcbind_SOURCES =       check_bound.c rpcbind.c \
-                        rpcb_svc_4.c rpcb_svc_com.c \
-                        util.c pmap_svc.c rpcb_stat.c \
-                        rpcb_svc.c security.c warmstart.c \
-                        rpcbind.h
-
-rpcinfo_SOURCES =       rpcinfo.c
-rpcinfo_LDFLAGS =       -lpthread
-rpcinfo_LDADD   =       $(TIRPC_LIBS)
-
-
-rpcbind_LDFLAGS = -lpthread
-rpcbind_CFLAGS = $(TIRPC_CFLAGS)
-rpcbind_LDADD = $(TIRPC_LIBS)
-AM_CPPFLAGS = -DCHECK_LOCAL -DPORTMAP \
-                       -DFACILITY=LOG_MAIL -DSEVERITY=LOG_INFO
-     
-- 
1.7.3.2