From 504d11ded8c1e9a0757332f2a10ed7d86dd5fc70 Mon Sep 17 00:00:00 2001
From: Luke Shumaker <lukeshu@sbcglobal.net>
Date: Wed, 1 Jul 2015 23:22:00 -0600
Subject: A whole bunch of stuff

---
 Makefile | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 57993c8..479eb88 100644
--- a/Makefile
+++ b/Makefile
@@ -17,18 +17,19 @@
 include $(dir $(lastword $(MAKEFILE_LIST)))/config.mk
 include $(topsrcdir)/common.top.mk
 
-#subdirs = wrapper plugins
-subdirs = wrapper
+subdirs = wrapper modules
 
 src_files = Makefile
-src_files += common.top.mk common.bottom.mk config.mk configure
+src_files += common.top.mk common.bottom.mk
+src_files += common.each.mk common.once.mk
+src_files += config.mk configure
 src_files += COPYING HACKING README
-obj_files = config.sh config.h
+out_files = config.sh config.h
 
-config_vars = $(shell $(SED) -n 's/^\s*\([a-z][^ !?:=]*\).*=.*/\1/p' $(topobjdir)/config.mk) PACKAGE VERSION DESTDIR
-$(objdir)/config.sh: $(objdir)/config.mk
+config_vars = $(shell $(SED) -n 's/^\s*\([a-z][^ !?:=]*\).*=.*/\1/p' $(topoutdir)/config.mk) PACKAGE VERSION DESTDIR
+$(outdir)/config.sh: $(outdir)/config.mk
 	$(PRINTF) '%s=%s\n' $(foreach v,$(config_vars),$v $($v)) | LC_ALL=C $(SORT) > $@
-$(objdir)/config.h: $(objdir)/config.sh
+$(outdir)/config.h: $(outdir)/config.sh
 	. $(abspath $<) && $(PRINTF) '#define %s "%s"\n' $(foreach v,$(config_vars),$v '$($v)') PACKAGE_UPPER $${PACKAGE^^} | LC_ALL=C $(SORT) > $@
 
 include $(topsrcdir)/common.bottom.mk
-- 
cgit v1.2.3-54-g00ecf