diff options
| author | Jonas Smedegaard <dr@jones.dk> | 2014-07-30 22:36:40 +0200 |
|---|---|---|
| committer | Jonas Smedegaard <dr@jones.dk> | 2014-07-30 23:10:34 +0200 |
| commit | b84f96cd651714cd2daa7295a0910925639c632d (patch) | |
| tree | 38094493320a6cc6cd4ae2611cac7ee8af7e03a6 | |
| parent | ab364cb87800240ae0454e058e85c1af0e0a0806 (diff) | |
Simplify Makefile: Create only full targets desktop, desktop/eu and desktop/all.
| -rw-r--r-- | Makefile | 15 |
1 files changed, 1 insertions, 14 deletions
@@ -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/%,$^)" |