summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonas Smedegaard <dr@jones.dk>2014-03-02 21:56:57 +0100
committerJonas Smedegaard <dr@jones.dk>2014-03-02 21:56:57 +0100
commit0d8ff7d363b717fd6b9d5f0d7890256ef649cf29 (patch)
treed14ccc96f1e942344efc570540fb02eea9421fef
parent53cd6ff1c597e75f94ea9ffc5f0c319e3fd92283 (diff)
Restructure makefile slightly.
-rw-r--r--Makefile7
1 files changed, 4 insertions, 3 deletions
diff --git a/Makefile b/Makefile
index 999c988..bace426 100644
--- a/Makefile
+++ b/Makefile
@@ -3,9 +3,10 @@ desktoptopics = email office web
desktoptopiclists = $(patsubst %,profiles/desktop-%,$(desktoptopics))
basefiles = $(patsubst %,content/%/base/preseed.cfg,$(profiles))
topicfiles = $(patsubst %,content/desktop/%/preseed.cfg,$(desktoptopics))
-profilefiles = $(patsubst %,content/%/preseed.cfg,$(profiles))
+mainfiles = $(patsubst %,content/%/preseed.cfg,$(profiles))
+allfiles = $(basefiles) $(topicfiles) $(mainfiles)
-all: $(basefiles) $(topicfiles) $(profilefiles)
+all: $(allfiles)
$(basefiles): content/%/base/preseed.cfg : profiles/% profiles/%-z
bin/pkglist2preseed skel/preseed.cfg.in $@ $^
@@ -13,5 +14,5 @@ $(basefiles): content/%/base/preseed.cfg : profiles/% profiles/%-z
$(topicfiles): content/desktop/%/preseed.cfg : profiles/desktop profiles/desktop-% profiles/desktop-z
bin/pkglist2preseed skel/preseed.cfg.in $@ $^
-$(profilefiles): content/%/preseed.cfg : profiles/% profiles/%-email $(desktoptopiclists) profiles/%-z
+$(mainfiles): content/%/preseed.cfg : profiles/% profiles/%-email $(desktoptopiclists) profiles/%-z
bin/pkglist2preseed skel/preseed.cfg.in $@ $^