diff options
| author | Guillaume Cottenceau <gc@mandriva.com> | 2001-06-01 19:07:04 +0000 |
|---|---|---|
| committer | Guillaume Cottenceau <gc@mandriva.com> | 2001-06-01 19:07:04 +0000 |
| commit | 8b643ee943076746ac3707c266f3222c97278edd (patch) | |
| tree | f8875f8046e018eaa807ad93bcae55044eb3070a | |
| parent | 7d56735bc74dfeb5f60fe9ff9aec332a1f5f40cb (diff) | |
| download | drakx-8b643ee943076746ac3707c266f3222c97278edd.tar drakx-8b643ee943076746ac3707c266f3222c97278edd.tar.gz drakx-8b643ee943076746ac3707c266f3222c97278edd.tar.bz2 drakx-8b643ee943076746ac3707c266f3222c97278edd.tar.xz drakx-8b643ee943076746ac3707c266f3222c97278edd.zip | |
use -FULL postfix for common .c files targetting stage1-full
| -rw-r--r-- | mdk-stage1/Makefile | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/mdk-stage1/Makefile b/mdk-stage1/Makefile index 7f43acf06..d52b0f8da 100644 --- a/mdk-stage1/Makefile +++ b/mdk-stage1/Makefile @@ -94,20 +94,18 @@ STAGE1_NETWORK_LIBS = $(top_dir)/dietlibc/bin-$(ARCH)/librpc.a endif ifeq (GLIBC, $(L)) -STAGE1_NETWORK_LIBS = +STAGE1_NETWORK_LIBS = /usr/lib/libresolv.a endif #- stage1 itself STAGE1SRC = stage1.c log.c tools.c modules.c probing.c mount.c automatic.c frontend-common.c CDROMSRC = cdrom.c DISKSRC = disk.c lomount.c -NETWORKSRC = network.c nfsmount.c dhcp.c url.c dns.c +NETWORKSRC = network.c nfsmount.c dhcp.c url.c dns.c adsl.c ALLSRC = $(INITSRC) $(STAGE1SRC) $(CDROMSRC) $(DISKSRC) $(NETWORKSRC) -STAGE1OBJS = $(subst .c,.o,$(STAGE1SRC) $(CDROMSRC) $(DISKSRC) $(NETWORKSRC)) - STAGE1OBJS-CDROM = $(subst .c,-CDROM.o,$(STAGE1SRC) $(CDROMSRC)) @@ -124,6 +122,9 @@ STAGE1OBJS-NETWORK = $(subst .c,-NETWORK.o,$(STAGE1SRC) $(NETWORKSRC)) NETWORK_DEFS = -DDISABLE_CDROM -DDISABLE_DISK +STAGE1OBJS-FULL = $(subst .c,-FULL.o,$(STAGE1SRC) $(CDROMSRC) $(DISKSRC) $(NETWORKSRC)) + + ifeq (i386, $(ARCH)) LDFLAGS_INIT = -static -nostdlib /usr/lib/crt1.o else @@ -183,11 +184,14 @@ 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_LIBC) +stage1-full: $(STAGE1OBJS-FULL) $(STAGE1_OWN_LIBS) $(STAGE1_NETWORK_LIBS) $(FRONTEND_LINK) $(PCMCIA_LIB) $(STAGE1_LIBC) $(CC) $(LDFLAGS_STAGE1) -o $@ $^ $(STRIPCMD) $@ +$(INITOBJS): %.o: %.c + $(COMPILE) $(INIT_DEFS) -c $< + $(STAGE1OBJS-CDROM): %-CDROM.o: %.c .depend $(COMPILE) $(INCLUDES) $(CDROM_DEFS) -c $< -o $@ @@ -197,11 +201,11 @@ $(STAGE1OBJS-DISK): %-DISK.o: %.c .depend $(STAGE1OBJS-NETWORK): %-NETWORK.o: %.c .depend $(COMPILE) $(INCLUDES) $(NETWORK_DEFS) -c $< -o $@ -$(INITOBJS): %.o: %.c - $(COMPILE) $(INIT_DEFS) -c $< +$(STAGE1OBJS-FULL): %-FULL.o: %.c .depend + $(COMPILE) $(INCLUDES) $(PCMCIA_DEFS) -c $< -o $@ .c.o: .depend - $(COMPILE) $(INCLUDES) $(PCMCIA_DEFS) -c $< + $(COMPILE) $(INCLUDES) -c $< clean: |