diff options
Diffstat (limited to 'mdk-stage1/Makefile')
| -rw-r--r-- | mdk-stage1/Makefile | 54 |
1 files changed, 18 insertions, 36 deletions
diff --git a/mdk-stage1/Makefile b/mdk-stage1/Makefile index ddb5cfda1..1f47002f4 100644 --- a/mdk-stage1/Makefile +++ b/mdk-stage1/Makefile @@ -15,7 +15,7 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -VERSION=1.82 +VERSION=2.0 PRODUCT=drakx-installer-binaries # @@ -59,9 +59,7 @@ COMPILE = $(CC) $(DEFS) $(CFLAGS) INIT_DEFS = INITSRC = init.c -ifneq (DIETLIBC, $(L)) INIT_DEFS += $(GLIBC_INCLUDES) -endif STAGE1_DEFS=-DDISABLE_KA @@ -70,35 +68,19 @@ INITOBJS = $(subst .c,.o,$(INITSRC)) #- frontends NEWT_FRONTEND_SRC = newt-frontend.c -NEWT_FRONTEND_LIBS = libnewt.a libslang.a +NEWT_FRONTEND_LIBS = -lnewt -lslang 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 -STAGE1_OWN_LIBS = -ifeq (DIETLIBC, $(L)) -STAGE1_OWN_LIBS = $(patsubst %,/usr/lib/dietlibc/lib-$(ARCH)/%,$(STAGE1_STATIC_USR_LIBS) $(STAGE1_STATIC_LIBS)) -else -STAGE1_OWN_LIBS = $(patsubst %,/usr/$(LIB)/%,$(STAGE1_STATIC_USR_LIBS)) $(patsubst %,/$(LIB)/%,$(STAGE1_STATIC_LIBS)) -endif +STAGE1_OWN_LIBS = -lz -lldetect -lkmod -lpci -llzma -lsysfs -ifeq (DIETLIBC, $(L)) -STAGE1_NETWORK_LIBS = /usr/lib/dietlibc/lib-$(ARCH)/librpc.a -else -STAGE1_NETWORK_LIBS = /usr/$(LIB)/libresolv.a -endif +STAGE1_NETWORK_LIBS = -lresolv #- stage1 itself STAGE1SRC = stage1.c log.c utils.c params.c tools.c modules.c probing.c mount.c automatic.c frontend-common.c lomount.c thirdparty.c zlibsupport.c @@ -158,16 +140,16 @@ dirs: [ "$$n" = "." ] || make -C $$n || exit 1 ;\ done -init: $(INITOBJS) $(STAGE1_LIBC) - $(DIET) $(CC) $(LDFLAGS) -o $@ $^ +init: $(INITOBJS) + $(CC) $(LDFLAGS) -o $@ $^ $(STRIPCMD) $@ -stage1: $(STAGE1OBJS-FULL) $(STAGE1_OWN_LIBS) $(STAGE1_NETWORK_LIBS) $(FRONTEND_LINK) $(PCMCIA_LIB) $(STAGE1_LIBC) - $(DIET) $(CC) $(LDFLAGS) -o $@ $^ +stage1: $(STAGE1OBJS-FULL) $(STAGE1_OWN_LIBS) $(STAGE1_NETWORK_LIBS) $(FRONTEND_LINK) $(PCMCIA_LIB) + $(CC) $(LDFLAGS) -o $@ $^ $(STRIPCMD) $@ -dhcp-client: $(STAGE1OBJS-NETWORK-STANDALONE) $(STAGE1_OWN_LIBS) $(STAGE1_NETWORK_LIBS) $(FRONTEND_LINK) $(STAGE1_LIBC) - $(DIET) $(CC) $(LDFLAGS) -o $@ $^ +dhcp-client: $(STAGE1OBJS-NETWORK-STANDALONE) $(STAGE1_OWN_LIBS) $(STAGE1_NETWORK_LIBS) $(FRONTEND_LINK) + $(CC) $(LDFLAGS) -o $@ $^ $(STRIPCMD) $@ @@ -175,16 +157,16 @@ $(INITOBJS): %.o: %.c $(COMPILE) $(INIT_DEFS) -c $< $(STAGE1OBJS-NETWORK): %-NETWORK.o: %.c - $(DIET) $(COMPILE) $(INCLUDES) $(NETWORK_DEFS) $(PCMCIA_DEFS) $(USB_DEFS_GEN) -DENABLE_ADDITIONAL_MODULES -c $< -o $@ + $(COMPILE) $(INCLUDES) $(NETWORK_DEFS) $(PCMCIA_DEFS) $(USB_DEFS_GEN) -DENABLE_ADDITIONAL_MODULES -c $< -o $@ $(STAGE1OBJS-NETWORK-STANDALONE): %-NETWORK-STANDALONE.o: %.c - $(DIET) $(COMPILE) $(INCLUDES) $(NETWORK_STANDALONE_DEFS) $(USB_DEFS_GEN) -c $< -o $@ + $(COMPILE) $(INCLUDES) $(NETWORK_STANDALONE_DEFS) $(USB_DEFS_GEN) -c $< -o $@ $(STAGE1OBJS-FULL): %-FULL.o: %.c - $(DIET) $(COMPILE) $(INCLUDES) -DSPAWN_SHELL $(USB_DEFS_GEN) $(PCMCIA_DEFS) $(STAGE1_DEFS) -c $< -o $@ + $(COMPILE) $(INCLUDES) -DSPAWN_SHELL $(USB_DEFS_GEN) $(PCMCIA_DEFS) $(STAGE1_DEFS) -c $< -o $@ .c.o: - $(DIET) $(COMPILE) $(INCLUDES) -c $< + $(COMPILE) $(INCLUDES) -c $< clean: localclean @@ -196,12 +178,12 @@ localclean: rm -f *.o .depend *.rdz *.img $(BINS) -rescue-gui: rescue-gui.o frontend-common.o params.o utils.o log.o automatic.o $(FRONTEND_LINK) $(STAGE1_LIBC) - $(DIET) $(CC) $(LDFLAGS) -o $@ $^ +rescue-gui: rescue-gui.o frontend-common.o params.o utils.o log.o automatic.o $(FRONTEND_LINK) + $(CC) $(LDFLAGS) -o $@ $^ $(STRIPCMD) $@ -probe-modules: probe-modules.o probing-FULL.o modules-FULL.o params-FULL.o utils-FULL.o log-FULL.o automatic-FULL.o frontend-common-FULL.o stdio-frontend.o zlibsupport-FULL.o $(STAGE1_OWN_LIBS) $(PCMCIA_LIB) $(STAGE1_LIBC) - $(DIET) $(CC) $(LDFLAGS) -o $@ $^ +probe-modules: probe-modules.o probing-FULL.o modules-FULL.o params-FULL.o utils-FULL.o log-FULL.o automatic-FULL.o frontend-common-FULL.o stdio-frontend.o zlibsupport-FULL.o $(STAGE1_OWN_LIBS) $(PCMCIA_LIB) + $(CC) $(LDFLAGS) -o $@ $^ $(STRIPCMD) $@ dist: tar |