summaryrefslogtreecommitdiffstats
path: root/mdk-stage1/Makefile
diff options
context:
space:
mode:
authorGuillaume Cottenceau <gc@mandriva.com>2001-05-15 12:10:43 +0000
committerGuillaume Cottenceau <gc@mandriva.com>2001-05-15 12:10:43 +0000
commita2777beb22f9cf6133eb3504dd6c60dd588003c6 (patch)
tree95eb0b917b1decfd8070aafb5a075bcf4c636ff4 /mdk-stage1/Makefile
parent158dc80bcd864eda64578c838cd76f72ab76086d (diff)
downloaddrakx-backup-do-not-use-a2777beb22f9cf6133eb3504dd6c60dd588003c6.tar
drakx-backup-do-not-use-a2777beb22f9cf6133eb3504dd6c60dd588003c6.tar.gz
drakx-backup-do-not-use-a2777beb22f9cf6133eb3504dd6c60dd588003c6.tar.bz2
drakx-backup-do-not-use-a2777beb22f9cf6133eb3504dd6c60dd588003c6.tar.xz
drakx-backup-do-not-use-a2777beb22f9cf6133eb3504dd6c60dd588003c6.zip
have stage1-full with pcmcia also compile with dietlibc, cool!
Diffstat (limited to 'mdk-stage1/Makefile')
-rw-r--r--mdk-stage1/Makefile10
1 files changed, 6 insertions, 4 deletions
diff --git a/mdk-stage1/Makefile b/mdk-stage1/Makefile
index 96eade486..48830638f 100644
--- a/mdk-stage1/Makefile
+++ b/mdk-stage1/Makefile
@@ -113,7 +113,7 @@ INIT_LIBC = $(DIETLIBC_LIBC)
endif
-BINS = init #stage1-full
+BINS = init stage1-full
ifeq (i386, $(ARCH))
BINS += stage1-cdrom stage1-disk stage1-network
@@ -127,7 +127,9 @@ endif
ifeq (i386,$(ARCH))
-PCMCIA_LIB = pcmcia/libpcmcia.a
+GLIBC_PCMCIA_LIB = pcmcia/libpcmcia.a
+DIETLIBC_PCMCIA_LIB = $(subst .a,-DIET.a,$(GLIBC_PCMCIA_LIB))
+PCMCIA_LIB = $($(L)_PCMCIA_LIB)
PCMCIA_DEFS = -DENABLE_PCMCIA
endif
@@ -155,7 +157,7 @@ stage1-network: $(STAGE1OBJS-NETWORK) $(STAGE1_OWN_LIBS) $(STAGE1_NETWORK_LIBS)
$(CC) $(LDFLAGS_STAGE1) -o $@ $^
$(STRIPCMD) $@
-stage1-full: $(STAGE1OBJS) $(STAGE1_OWN_LIBS) $(STAGE1_NETWORK_LIBS) $(FRONTEND_LINK) $(PCMCIA_LIB)
+stage1-full: $(STAGE1OBJS) $(STAGE1_OWN_LIBS) $(STAGE1_NETWORK_LIBS) $(FRONTEND_LINK) $(PCMCIA_LIB) $(STAGE1_LIBC)
$(CC) $(LDFLAGS_STAGE1) -o $@ $^
$(STRIPCMD) $@
@@ -173,7 +175,7 @@ $(INITOBJS): %.o: %.c
$(COMPILE) $(INIT_DEFS) -c $<
.c.o: .depend
- $(COMPILE) $(GLIBC_INCLUDES) $(PCMCIA_DEFS) -c $<
+ $(COMPILE) $(INCLUDES) $(PCMCIA_DEFS) -c $<
clean: