From b84f96cd651714cd2daa7295a0910925639c632d Mon Sep 17 00:00:00 2001 From: Jonas Smedegaard Date: Wed, 30 Jul 2014 22:36:40 +0200 Subject: Simplify Makefile: Create only full targets desktop, desktop/eu and desktop/all. --- Makefile | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) diff --git a/Makefile b/Makefile index 2307508..b123cc5 100644 --- a/Makefile +++ b/Makefile @@ -6,13 +6,9 @@ desktoptopiclists = $(patsubst %,profiles/desktop-%,$(desktoptopics)) desktoptopiclcgrouplists = $(foreach topic,$(lcdesktoptopics),\ profiles/desktop-$(topic)-%) desktoptweaks = tweaks/base tweaks/desktop -basefiles = $(patsubst %,content/%/base/preseed.cfg,$(maintopics)) -topicfiles = $(patsubst %,content/desktop/%/preseed.cfg,$(desktoptopics)) -lcgroupfiles = $(foreach lcgroup,$(lcgroups),\ - $(patsubst %,content/desktop/%-$(lcgroup)/preseed.cfg,$(lcdesktoptopics))) mainfiles = $(patsubst %,content/%/preseed.cfg,$(maintopics)) mainlcgroupfiles = $(patsubst %,content/desktop/%/preseed.cfg,$(lcgroups)) -profiles-di = $(basefiles) $(topicfiles) $(lcgroupfiles) $(mainfiles) $(mainlcgroupfiles) +profiles-di = $(mainfiles) $(mainlcgroupfiles) profiles-script = $(patsubst %/preseed.cfg,%/script.sh,$(profiles-di)) profiles = $(profiles-di) $(profiles-script) mdfiles = content/MD5SUMS @@ -24,15 +20,6 @@ info = content/NEWS content/TODO all: $(checksumfiles) $(info) sign: $(signfiles) -$(basefiles): content/%/base/preseed.cfg : skel/preseed.cfg.in profiles/% profiles/%-z $(desktoptweaks) - bin/pkglist2preseed $(filter skel/%,$^) $@ "$(filter profiles/%,$^)" "$(filter tweaks/%,$^)" - -$(topicfiles): content/desktop/%/preseed.cfg : skel/preseed.cfg.in profiles/desktop profiles/desktop-% profiles/desktop-z $(desktoptweaks) - bin/pkglist2preseed $(filter skel/%,$^) $@ "$(filter profiles/%,$^)" "$(filter tweaks/%,$^)" - -$(lcgroupfiles): content/desktop/%/preseed.cfg : skel/preseed.cfg.in profiles/desktop profiles/desktop-% profiles/desktop-z $(desktoptweaks) - bin/pkglist2preseed $(filter skel/%,$^) $@ "$(filter profiles/%,$^)" "$(filter tweaks/%,$^)" - $(mainfiles): content/%/preseed.cfg : skel/preseed.cfg.in profiles/% $(desktoptopiclists) profiles/%-z $(desktoptweaks) bin/pkglist2preseed $(filter skel/%,$^) $@ "$(filter profiles/%,$^)" "$(filter tweaks/%,$^)" -- cgit v1.2.3