diff options
| author | Thierry Vignaud <tv@mageia.org> | 2012-06-01 17:25:22 +0000 |
|---|---|---|
| committer | Thierry Vignaud <tv@mageia.org> | 2012-06-01 17:25:22 +0000 |
| commit | cebb882bbb82549f1798b8fc4b37d76be90a869b (patch) | |
| tree | aa04026f1b22781d668ed02d04688e1f48cd008c /mdk-stage1/Makefile | |
| parent | f8b5c22e2584741f2c522ffc86486bc073f943ce (diff) | |
| download | drakx-cebb882bbb82549f1798b8fc4b37d76be90a869b.tar drakx-cebb882bbb82549f1798b8fc4b37d76be90a869b.tar.gz drakx-cebb882bbb82549f1798b8fc4b37d76be90a869b.tar.bz2 drakx-cebb882bbb82549f1798b8fc4b37d76be90a869b.tar.xz drakx-cebb882bbb82549f1798b8fc4b37d76be90a869b.zip | |
link against system libraries for newt & slang too (from mdv)
Diffstat (limited to 'mdk-stage1/Makefile')
| -rw-r--r-- | mdk-stage1/Makefile | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/mdk-stage1/Makefile b/mdk-stage1/Makefile index 586596bb4..a4ef5d428 100644 --- a/mdk-stage1/Makefile +++ b/mdk-stage1/Makefile @@ -70,16 +70,19 @@ INITOBJS = $(subst .c,.o,$(INITSRC)) #- frontends NEWT_FRONTEND_SRC = newt-frontend.c -NEWT_FRONTEND_LIBS = newt/libnewt.a slang/libslang.a +NEWT_FRONTEND_LIBS = libnewt.a libslang.a STDIO_FRONTEND_SRC = stdio-frontend.c STDIO_FRONTEND_LIBS = STDIO_FRONTEND_LIBS = - FRONTEND_OBJS = $(subst .c,.o,$($(F)_FRONTEND_SRC)) +ifeq (DIETLIBC, $(L)) +FRONTEND_LINK = $(FRONTEND_OBJS) $(patsubst %,/usr/lib/dietlibc/lib-$(ARCH)/%,$($(F)_FRONTEND_LIBS)) +else FRONTEND_LINK = $(FRONTEND_OBJS) $($(F)_FRONTEND_LIBS) +endif STAGE1_STATIC_LIBS = STAGE1_STATIC_USR_LIBS = libz.a libldetect.a libkmod.a libpci.a liblzma.a libsysfs.a @@ -127,7 +130,7 @@ STAGE1OBJS-FULL = $(subst .c,-FULL.o,$(STAGE1_ALLSRC)) BINS = init stage1 dhcp-client rescue-gui probe-modules -DIRS += pci-resource usb-resource slang newt +DIRS += pci-resource usb-resource ifeq (i386, $(ARCH)) DIRS += pcmcia pcmcia-resource endif |