From f3ecae04980dcc398c30b560748ab3b4f6eae759 Mon Sep 17 00:00:00 2001 From: wittinobi Date: Mon, 30 Apr 2012 14:46:59 +0200 Subject: [PATCH] =?utf8?q?fix=20Abh=C3=A4ngigkeiten=20beim=20parallelisier?= =?utf8?q?ten=20build?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- Makefile | 28 ++++++++++++++++------------ make/applications.mk | 12 +++++++++++- make/libraries.mk | 4 ++-- make/plugins.mk | 9 ++++++--- 4 files changed, 35 insertions(+), 18 deletions(-) diff --git a/Makefile b/Makefile index 4f9bdfb..27bf53e 100755 --- a/Makefile +++ b/Makefile @@ -147,11 +147,11 @@ wittinobi-neutrino: wittinobi-neutrino-new: if [ $(MULTIMEDIA) == no ]; then \ - $(MAKE) neutrino-new applications-all-new plugins skeleton rootfs; \ + $(MAKE) neutrino-new applications-all-new plugins-new skeleton rootfs; \ elif [ $(MULTIMEDIA) == yes ]; then \ - $(MAKE) neutrino-new applications-all-new plugins multimedia-new skeleton rootfs; \ + $(MAKE) neutrino-new applications-all-new plugins-new multimedia-new skeleton rootfs; \ else \ - $(MAKE) neutrino-new applications-all-new plugins skeleton rootfs; \ + $(MAKE) neutrino-new applications-all-new plugins-new skeleton rootfs; \ fi @echo "" @echo ' ============================================================================== ' @@ -173,11 +173,11 @@ wittinobi-neutrino-flash: wittinobi-neutrino-flash-new: if [ $(MULTIMEDIA) == no ]; then \ - $(MAKE) neutrino-new applications-all-new plugins skeleton rootfs flash; \ + $(MAKE) neutrino-new applications-all-new plugins-new skeleton rootfs flash; \ elif [ $(MULTIMEDIA) == yes ]; then \ - $(MAKE) neutrino-new applications-all-new plugins multimedia-new skeleton rootfs flash; \ + $(MAKE) neutrino-new applications-all-new plugins-new multimedia-new skeleton rootfs flash; \ else \ - $(MAKE) neutrino-new applications-all-new plugins skeleton rootfs flash; \ + $(MAKE) neutrino-new applications-all-new plugins-new skeleton rootfs flash; \ fi @echo "" @echo ' ============================================================================== ' @@ -199,11 +199,11 @@ wittinobi-all: wittinobi-all-new: if [ $(MULTIMEDIA) == no ]; then \ - $(MAKE) neutrino-new applications-all-new plugins skeleton bootloader kernel-new drivers-new rootfs flash flash-full; \ + $(MAKE) neutrino-new applications-all-new plugins-new skeleton bootloader kernel-new drivers-new rootfs flash flash-full; \ elif [ $(MULTIMEDIA) == yes ]; then \ - $(MAKE) neutrino-new applications-all-new plugins multimedia-new skeleton bootloader kernel-new drivers-new rootfs flash flash-full; \ + $(MAKE) neutrino-new applications-all-new plugins-new multimedia-new skeleton bootloader kernel-new drivers-new rootfs flash flash-full; \ else \ - $(MAKE) neutrino-new applications-all-new plugins skeleton bootloader kernel-new drivers-new rootfs flash flash-full; \ + $(MAKE) neutrino-new applications-all-new plugins-new skeleton bootloader kernel-new drivers-new rootfs flash flash-full; \ fi @echo "" @echo ' ============================================================================== ' @@ -253,18 +253,22 @@ applications-all: fi applications-all-new: if [ $(LCD4LINUX) == no ]; then \ - $(MAKE) $(D)/links-new $(D)/procps-new $(D)/busybox-new $(D)/e2fsprogs-new $(D)/hotplug $(D)/fbshot $(D)/vsftpd-new $(D)/flashcp; \ + $(MAKE) $(D)/links-new $(D)/procps-new $(D)/busybox-new $(D)/e2fsprogs-new $(D)/hotplug $(D)/fbshot-new $(D)/vsftpd-new $(D)/flashcp; \ elif [ $(LCD4LINUX) == yes ]; then \ - $(MAKE) $(D)/links-new $(D)/procps-new $(D)/busybox-new $(D)/e2fsprogs-new $(D)/hotplug $(D)/fbshot $(D)/vsftpd-new $(D)/flashcp $(D)/lcd4linux-new; \ + $(MAKE) $(D)/links-new $(D)/procps-new $(D)/busybox-new $(D)/e2fsprogs-new $(D)/hotplug $(D)/fbshot-new $(D)/vsftpd-new $(D)/flashcp $(D)/lcd4linux-new; \ else \ - $(MAKE) $(D)/links-new $(D)/procps-new $(D)/busybox-new $(D)/e2fsprogs-new $(D)/hotplug $(D)/fbshot $(D)/vsftpd-new $(D)/flashcp; \ + $(MAKE) $(D)/links-new $(D)/procps-new $(D)/busybox-new $(D)/e2fsprogs-new $(D)/hotplug $(D)/fbshot-new $(D)/vsftpd-new $(D)/flashcp; \ fi # plugins.mk plugins: $(MAKE) $(D)/tuxcom $(D)/tuxcal $(D)/getrc $(D)/msgbox $(D)/input $(D)/shellexec $(D)/cooliTSclimax $(D)/rcsim +plugins-new: + $(MAKE) $(D)/tuxcom-new $(D)/tuxcal-new $(D)/getrc $(D)/msgbox $(D)/input $(D)/shellexec $(D)/cooliTSclimax $(D)/rcsim plugins-all: $(MAKE) $(D)/tuxcom $(D)/tuxcal $(D)/blockad $(D)/getrc $(D)/msgbox $(D)/input $(D)/shellexec $(D)/liga_nat $(D)/boerse $(D)/rssnews $(D)/tanken $(D)/wetter $(D)/formel1 $(D)/cooliTSclimax $(D)/rcsim $(D)/logomask +plugins-all-new: + $(MAKE) $(D)/tuxcom-new $(D)/tuxcal-new $(D)/blockad $(D)/getrc $(D)/msgbox $(D)/input $(D)/shellexec $(D)/liga_nat $(D)/boerse $(D)/rssnews $(D)/tanken $(D)/wetter $(D)/formel1 $(D)/cooliTSclimax $(D)/rcsim $(D)/logomask # multimedia.mk multimedia: diff --git a/make/applications.mk b/make/applications.mk index 15352d7..e94b1a8 100755 --- a/make/applications.mk +++ b/make/applications.mk @@ -242,7 +242,17 @@ $(D)/hotplug: $(D)/libblkid $(D)/libuuid | $(TARGETPREFIX) $(REMOVE)/hotplug touch $@ -$(D)/fbshot: $(ARCHIVE)/fbshot-0.3.tar.gz | $(TARGETPREFIX) +$(D)/fbshot: $(D)/zlib $(ARCHIVE)/fbshot-0.3.tar.gz | $(TARGETPREFIX) + $(UNTAR)/fbshot-0.3.tar.gz + pushd $(BUILD_TMP)/fbshot-0.3 && \ + $(PATCH)/fbshot-0.3-32bit_cs_fb.diff && \ + $(TARGET)-gcc $(TARGET_CFLAGS) $(TARGET_LDFLAGS) fbshot.c -lpng -lz -o $(TARGETPREFIX)/bin/fbshot + cd $(TARGETPREFIX)/bin && \ + ln -sf fbshot dboxshot + $(REMOVE)/fbshot-0.3 + touch $@ + +$(D)/fbshot-new: $(D)/zlib-new $(ARCHIVE)/fbshot-0.3.tar.gz | $(TARGETPREFIX) $(UNTAR)/fbshot-0.3.tar.gz pushd $(BUILD_TMP)/fbshot-0.3 && \ $(PATCH)/fbshot-0.3-32bit_cs_fb.diff && \ diff --git a/make/libraries.mk b/make/libraries.mk index 0fd61c9..2cf32bd 100755 --- a/make/libraries.mk +++ b/make/libraries.mk @@ -269,7 +269,7 @@ $(D)/freetype-new: $(D)/libpng-new $(ARCHIVE)/freetype-2.4.9.tar.bz2 | $(TARGETP $(REMOVE)/freetype-2.4.9 touch $@ -$(D)/libpng: $(ARCHIVE)/libpng-1.2.42.tar.gz | $(TARGETPREFIX) +$(D)/libpng: $(D)/zlib $(ARCHIVE)/libpng-1.2.42.tar.gz | $(TARGETPREFIX) $(UNTAR)/libpng-1.2.42.tar.gz pushd $(BUILD_TMP)/libpng-1.2.42 && \ $(CONFIGURE) --prefix=$(TARGETPREFIX) --build=$(BUILD) --host=$(TARGET) --bindir=$(HOSTPREFIX)/bin --mandir=$(BUILD_TMP)/libpng-1.2.42/tmpman && \ @@ -278,7 +278,7 @@ $(D)/libpng: $(ARCHIVE)/libpng-1.2.42.tar.gz | $(TARGETPREFIX) $(REMOVE)/libpng-1.2.42 touch $@ -$(D)/libpng-new: $(ARCHIVE)/libpng-1.5.6.tar.gz | $(TARGETPREFIX) +$(D)/libpng-new: $(D)/zlib-new $(ARCHIVE)/libpng-1.5.6.tar.gz | $(TARGETPREFIX) $(UNTAR)/libpng-1.5.6.tar.gz pushd $(BUILD_TMP)/libpng-1.5.6 && \ $(CONFIGURE) --prefix=$(TARGETPREFIX) --build=$(BUILD) --host=$(TARGET) --bindir=$(HOSTPREFIX)/bin --mandir=$(BUILD_TMP)/libpng-1.5.6/tmpman && \ diff --git a/make/plugins.mk b/make/plugins.mk index bb5e5f3..9f3dea1 100755 --- a/make/plugins.mk +++ b/make/plugins.mk @@ -14,14 +14,16 @@ $(LIBPLUG)/blockads.so: cp -f blockads.conf $(VARCONF)/ && \ cp -f blockads.cfg $(LIBPLUG)/ -$(D)/tuxcom: $(LIBPLUG)/tuxcom.so +$(D)/tuxcom: $(D)/freetype $(LIBPLUG)/tuxcom.so +$(D)/tuxcom-new: $(D)/freetype-new $(LIBPLUG)/tuxcom.so $(LIBPLUG)/tuxcom.so: mkdir -p $(LIBPLUG) && \ pushd $(SOURCE)/tuxcom && \ $(TARGET)-gcc $(TARGET_CFLAGS) -L$(TARGETPREFIX)/lib -I$(TARGETPREFIX)/include/freetype2 -lfreetype -lz -o $@ tuxcom.c && \ cp -f tuxcom.cfg $(LIBPLUG)/ -$(D)/tuxcal: $(LIBPLUG)/tuxcal.so $(D)/tuxcald +$(D)/tuxcal: $(D)/freetype $(LIBPLUG)/tuxcal.so $(D)/tuxcald +$(D)/tuxcal-new: $(D)/freetype-new $(LIBPLUG)/tuxcal.so $(D)/tuxcald-new $(LIBPLUG)/tuxcal.so: mkdir -p $(LIBPLUG)/ && \ mkdir -p $(VARCONF)/tuxcal/ && \ @@ -30,7 +32,8 @@ $(LIBPLUG)/tuxcal.so: cp -f tuxcal.cfg $(LIBPLUG)/ && \ cp -f tuxcal.conf $(VARCONF)/tuxcal/ -$(D)/tuxcald: $(BIN)/tuxcald +$(D)/tuxcald: $(D)/freetype $(BIN)/tuxcald +$(D)/tuxcald-new: $(D)/freetype-new $(BIN)/tuxcald $(BIN)/tuxcald: pushd $(SOURCE)/tuxcal/daemon && \ $(TARGET)-gcc $(TARGET_CFLAGS) -L$(TARGETPREFIX)/lib -I$(TARGETPREFIX)/include/freetype2 -lpthread -lfreetype -lz -o $@ tuxcald.c -- 2.39.5