diff options
| author | Thierry Vignaud <thierry.vignaud@gmail.com> | 2014-05-17 22:44:00 +0200 |
|---|---|---|
| committer | Thierry Vignaud <thierry.vignaud@gmail.com> | 2014-05-17 22:54:51 +0200 |
| commit | 155b75bebc7e70501782e55160d144df212c6f4e (patch) | |
| tree | c410aa483dbe0aa00d68145f236dff552b112715 /mdk-stage1/Makefile | |
| parent | 0acaf5127ede7fc0eac16c950e4a450e76962ff9 (diff) | |
| download | drakx-155b75bebc7e70501782e55160d144df212c6f4e.tar drakx-155b75bebc7e70501782e55160d144df212c6f4e.tar.gz drakx-155b75bebc7e70501782e55160d144df212c6f4e.tar.bz2 drakx-155b75bebc7e70501782e55160d144df212c6f4e.tar.xz drakx-155b75bebc7e70501782e55160d144df212c6f4e.zip | |
fix "make -j"
inspirated by pok's changes @mdv
Diffstat (limited to 'mdk-stage1/Makefile')
| -rw-r--r-- | mdk-stage1/Makefile | 23 |
1 files changed, 15 insertions, 8 deletions
diff --git a/mdk-stage1/Makefile b/mdk-stage1/Makefile index 381b4b172..8ab5b680a 100644 --- a/mdk-stage1/Makefile +++ b/mdk-stage1/Makefile @@ -91,9 +91,9 @@ STAGE1OBJS-FULL = $(STAGE1_ALLSRC:.c=-FULL.o) BINS = init stage1 dhcp-client rescue-gui probe-modules -DIRS += pci-resource usb-resource +OTHERS = pci-ids.h usb-ids.h ifneq (,$(filter $(ARCH),i386 x86_64)) -DIRS += pcmcia pcmcia-resource +OTHERS += pcmcia-ids.h pcmcia PCMCIA_LIB = pcmcia/libpcmcia.a PCMCIA_DEFS = -DENABLE_PCMCIA endif @@ -101,12 +101,19 @@ endif USB_DEFS_GEN = -DENABLE_USB USB_DEFS = -DENABLE_USB -DDISABLE_PCIADAPTERS -all: dirs $(BINS) +all: $(OTHERS) $(BINS) -dirs: - @for n in . $(DIRS); do \ - [ "$$n" = "." ] || make -C $$n || exit 1 ;\ - done +pci-ids.h: /usr/share/ldetect-lst/pcitable.gz update-pci-ids.pl + perl update-pci-ids.pl > $@ || { rm -f $@; exit 1; } + +usb-ids.h: /usr/share/ldetect-lst/usbtable.gz update-usb-ids.pl + perl update-usb-ids.pl > $@ || rm -f $@ + +pcmcia-ids.h: update-pcmcia-ids.pl + perl update-pcmcia-ids.pl > $@ || { rm -f $@; exit 1; } + +pcmcia/libpcmcia.a: + make -j -C pcmcia init: $(INITOBJS) $(CC) $(LDFLAGS) -o $@ $^ @@ -143,7 +150,7 @@ clean: localclean done localclean: - rm -f *.o .depend *.rdz *.img $(BINS) + rm -f *.o .depend *.rdz *.img pci-ids.h pcmcia-ids.h usb-ids.h $(BINS) rescue-gui: rescue-gui.o frontend-common.o params.o utils.o log.o automatic.o $(FRONTEND_LINK) |