[pisa-src] r2121 - trunk/Makefile.am

Author: biurrun
Date: Wed Mar 10 18:09:11 2010
New Revision: 2121

Log:
Factorize header lists.
Introduce a variable that holds header locations and reuse it for both
EXTRA_DIST and the checkheaders target.

Modified:
   trunk/Makefile.am

Modified: trunk/Makefile.am
==============================================================================
--- trunk/Makefile.am   Wed Mar 10 17:41:53 2010        (r2120)
+++ trunk/Makefile.am   Wed Mar 10 18:09:11 2010        (r2121)
@@ -3,24 +3,29 @@
 
 ACLOCAL_AMFLAGS  = -I m4
 
+HEADER_LIST = community-operator/*.h   \
+              libpisa/*.h              \
+              pairing/*.h              \
+              pisacd/*.h               \
+              pisasd/*.h))
+
+HEADER_LIST_EXPANDED = $(wildcard $(addprefix $(srcdir)/,$(HEADER_LIST)))
+
 # The tools/ subdirectory cannot be directly included because then
 # distcleancheck has trouble building the C files below tools/.
 # FIXME: For some reason symlinked directories in openwrt/ get skipped.
-EXTRA_DIST_WILDCARDS = community-operator/*.cfg \
-                       community-operator/*.h   \
-                       libpisa/*.h              \
-                       pairing/*.cfg            \
-                       pairing/*.h              \
-                       pairing/*.txt            \
-                       pisacd/*.h               \
-                       pisacd/*.sh              \
-                       pisasd/*.h               \
-                       pisasd/*.sh              \
-                       tools/*.cfg              \
-                       tools/*.conf             \
-                       tools/*.output           \
-                       tools/*.pl               \
-                       tools/*.sh
+DIST_WILDCARDS = community-operator/*.cfg   \
+                 pairing/*.cfg              \
+                 pairing/*.txt              \
+                 pisacd/*.sh                \
+                 pisasd/*.sh                \
+                 tools/*.cfg                \
+                 tools/*.conf               \
+                 tools/*.output             \
+                 tools/*.pl                 \
+                 tools/*.sh))
+
+DIST_EXPANDED = $(wildcard $(addprefix $(srcdir)/,$(DIST_WILDCARDS)))
 
 EXTRA_DIST = INSTALL                            \
              LICENSE                            \
@@ -35,7 +40,8 @@
              tools/screenrc                     \
              tools/subversion                   \
              tools/tunnel                       \
-             $(wildcard $(addprefix $(srcdir)/,$(EXTRA_DIST_WILDCARDS)))
+             $(HEADER_LIST_EXPANDED)            \
+             $(DIST_EXPANDED)
 
 dist_sysconf_DATA = pisacd/pisacd.conf        \
                     pisacd/pisacd.startup     \
@@ -164,8 +170,7 @@
 libpisa_libpisa_la_LIBADD          = -lrt
 
 
-ALLHEADERS  = $(wildcard $(addprefix $(srcdir)/,community-operator/*.h 
libpisa/*.h pairing/*.h pisacd/*.h pisasd/*.h))
-HEADER_OBJS = $(ALLHEADERS:.h=.ho)
+HEADER_OBJS = $(HEADER_LIST_EXPANDED:.h=.ho)
 
 CLEANFILES = $(HEADER_OBJS)
 DISTCLEANFILES = pisa-[0-9.]*.tar.gz

Other related posts:

  • » [pisa-src] r2121 - trunk/Makefile.am - Diego Biurrun