[PATCH] fix up Makefiles to get the klibc build working properly.

Based on a patch from Kay Sievers <kay.sievers@vrfy.org>

diff --git a/Makefile b/Makefile
index 764618e1b43e56b3a41fdfab125f40d684488f2b..bc2f85261408074f6ac9af31da5974e9111b2583 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
 # Makefile for udev
 #
 # Makefile for udev
 #

-# Copyright (C) 2003  Greg Kroah-Hartman <greg@kroah.com>
+# Copyright (C) 2003,2004 Greg Kroah-Hartman <greg@kroah.com>

 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by


@@ -33,7 +33,7 @@ INFO =                udevinfo
 TESTER =       udevtest
 STARTER =      udevstart
 RULER =                udevruler
 TESTER =       udevtest
 STARTER =      udevstart
 RULER =                udevruler

-VERSION =      032
+VERSION =      032_bk

 INSTALL_DIR =  /usr/local/bin
 RELEASE_NAME = $(ROOT)-$(VERSION)
 LOCAL_CFG_DIR =        etc/udev
 INSTALL_DIR =  /usr/local/bin
 RELEASE_NAME = $(ROOT)-$(VERSION)
 LOCAL_CFG_DIR =        etc/udev


@@ -140,9 +140,8 @@ endif
 ifeq ($(strip $(USE_KLIBC)),true)
        KLIBC_BASE      = $(PWD)/klibc
        KLIBC_DIR       = $(KLIBC_BASE)/klibc
 ifeq ($(strip $(USE_KLIBC)),true)
        KLIBC_BASE      = $(PWD)/klibc
        KLIBC_DIR       = $(KLIBC_BASE)/klibc

-       INCLUDE_DIR     := $(KLIBC_DIR)/include
+       INCLUDE_DIR     := $(KLIBC_BASE)/include

        LINUX_INCLUDE_DIR       := $(KERNEL_DIR)/include
        LINUX_INCLUDE_DIR       := $(KERNEL_DIR)/include

-#      LINUX_INCLUDE_DIR       := $(KLIBC_BASE)/linux/include

        include $(KLIBC_DIR)/arch/$(ARCH)/MCONFIG
        # arch specific objects
        ARCH_LIB_OBJS = \
        include $(KLIBC_DIR)/arch/$(ARCH)/MCONFIG
        # arch specific objects
        ARCH_LIB_OBJS = \


@@ -150,12 +149,12 @@ ifeq ($(strip $(USE_KLIBC)),true)
 
 
        CRT0 = $(KLIBC_DIR)/crt0.o
 
 
        CRT0 = $(KLIBC_DIR)/crt0.o

-       LIBC =  $(ARCH_LIB_OBJS) $(LIB_OBJS) $(CRT0)
+       LIBC = $(ARCH_LIB_OBJS) $(LIB_OBJS) $(CRT0)

        CFLAGS += $(WARNINGS) -nostdinc                 \
                $(OPTFLAGS)                             \
                -D__KLIBC__ -fno-builtin-printf         \
                -I$(INCLUDE_DIR)                        \
        CFLAGS += $(WARNINGS) -nostdinc                 \
                $(OPTFLAGS)                             \
                -D__KLIBC__ -fno-builtin-printf         \
                -I$(INCLUDE_DIR)                        \

-               -I$(KLIBC_DIR)/arch/$(ARCH)/include     \
+               -I$(INCLUDE_DIR)/arch/$(ARCH)           \

                -I$(INCLUDE_DIR)/bits$(BITSIZE)         \
                -I$(GCCINCDIR)                          \
                -I$(LINUX_INCLUDE_DIR)
                -I$(INCLUDE_DIR)/bits$(BITSIZE)         \
                -I$(GCCINCDIR)                          \
                -I$(LINUX_INCLUDE_DIR)


@@ -164,7 +163,7 @@ ifeq ($(strip $(USE_KLIBC)),true)
 else
        WARNINGS += -Wshadow -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations
        CRT0 =
 else
        WARNINGS += -Wshadow -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations
        CRT0 =

-       LIBC = 
+       LIBC =

        CFLAGS += $(WARNINGS) -I$(GCCINCDIR)
        LIB_OBJS = -lc
        LDFLAGS =
        CFLAGS += $(WARNINGS) -I$(GCCINCDIR)
        LIB_OBJS = -lc
        LDFLAGS =


@@ -185,7 +184,10 @@ all: $(ROOT) $(SENDER) $(DAEMON) $(INFO) $(TESTER)
 $(ARCH_LIB_OBJS) : $(CRT0)
 
 $(CRT0):
 $(ARCH_LIB_OBJS) : $(CRT0)
 
 $(CRT0):

-       $(MAKE) -C klibc KERNEL_DIR=$(KERNEL_DIR)
+       @if [ ! -r klibc/linux ]; then \
+               ln -f -s $(KERNEL_DIR) klibc/linux; \
+       fi
+       $(MAKE) -C klibc SUBDIRS=klibc

 
 TDB =  tdb/tdb.o       \
        tdb/spinlock.o
 
 TDB =  tdb/tdb.o       \
        tdb/spinlock.o


@@ -261,27 +263,27 @@ $(DAEMON).o: $(GEN_HEADERS)
 $(SENDER).o: $(GEN_HEADERS)
 $(STARTER).o: $(GEN_HEADERS)
 
 $(SENDER).o: $(GEN_HEADERS)
 $(STARTER).o: $(GEN_HEADERS)
 

-$(ROOT): $(ROOT).o $(STARTER).o $(OBJS) $(HEADERS) $(LIBC) $(GEN_MANPAGES)
+$(ROOT): $(LIBC) $(ROOT).o $(STARTER).o $(OBJS) $(HEADERS) $(GEN_MANPAGES)

        $(LD) $(LDFLAGS) -o $@ $(CRT0) udev.o udevstart.o $(OBJS) $(LIB_OBJS) $(ARCH_LIB_OBJS)
        $(STRIPCMD) $@
 
        $(LD) $(LDFLAGS) -o $@ $(CRT0) udev.o udevstart.o $(OBJS) $(LIB_OBJS) $(ARCH_LIB_OBJS)
        $(STRIPCMD) $@
 

-$(TESTER): $(TESTER).o $(OBJS) $(HEADERS) $(LIBC)
+$(TESTER): $(LIBC) $(TESTER).o $(OBJS) $(HEADERS)

        $(LD) $(LDFLAGS) -o $@ $(CRT0) udevtest.o $(OBJS) $(LIB_OBJS) $(ARCH_LIB_OBJS)
        $(STRIPCMD) $@
 
        $(LD) $(LDFLAGS) -o $@ $(CRT0) udevtest.o $(OBJS) $(LIB_OBJS) $(ARCH_LIB_OBJS)
        $(STRIPCMD) $@
 

-$(INFO): $(INFO).o $(OBJS) $(HEADERS) $(LIBC)
+$(INFO): $(LIBC) $(INFO).o $(OBJS) $(HEADERS)

        $(LD) $(LDFLAGS) -o $@ $(CRT0) udevinfo.o udev_lib.o udev_config.o udevdb.o $(SYSFS) $(TDB) $(LIB_OBJS) $(ARCH_LIB_OBJS)
        $(STRIPCMD) $@
 
        $(LD) $(LDFLAGS) -o $@ $(CRT0) udevinfo.o udev_lib.o udev_config.o udevdb.o $(SYSFS) $(TDB) $(LIB_OBJS) $(ARCH_LIB_OBJS)
        $(STRIPCMD) $@
 

-$(DAEMON): $(DAEMON).o $(OBJS) udevd.h $(LIBC)
+$(DAEMON): $(LIBC) $(DAEMON).o $(OBJS) udevd.h

        $(LD) $(LDFLAGS) -o $@ $(CRT0) udevd.o udev_lib.o $(KLIBC_FIXUP) $(LIB_OBJS) $(ARCH_LIB_OBJS)
        $(STRIPCMD) $@
 
        $(LD) $(LDFLAGS) -o $@ $(CRT0) udevd.o udev_lib.o $(KLIBC_FIXUP) $(LIB_OBJS) $(ARCH_LIB_OBJS)
        $(STRIPCMD) $@
 

-$(SENDER): $(SENDER).o $(OBJS) udevd.h $(LIBC)
+$(SENDER): $(LIBC) $(SENDER).o $(OBJS) udevd.h

        $(LD) $(LDFLAGS) -o $@ $(CRT0) udevsend.o udev_lib.o $(LIB_OBJS) $(ARCH_LIB_OBJS)
        $(STRIPCMD) $@
 
        $(LD) $(LDFLAGS) -o $@ $(CRT0) udevsend.o udev_lib.o $(LIB_OBJS) $(ARCH_LIB_OBJS)
        $(STRIPCMD) $@
 

-$(RULER): $(RULER).o $(OBJS) $(HEADERS) $(LIBC)
+$(RULER): $(LIBC) $(RULER).o $(OBJS) $(HEADERS)

        $(LD) $(LDFLAGS) -o $@ $(CRT0) udevruler.o udev_lib.o udev_config.o udevdb.o $(SYSFS) $(TDB) $(LIB_OBJS) $(ARCH_LIB_OBJS) -lnewt
        $(STRIPCMD) $@
 
        $(LD) $(LDFLAGS) -o $@ $(CRT0) udevruler.o udev_lib.o udev_config.o udevdb.o $(SYSFS) $(TDB) $(LIB_OBJS) $(ARCH_LIB_OBJS) -lnewt
        $(STRIPCMD) $@
 


@@ -298,6 +300,7 @@ clean:
 
 spotless: clean
        $(MAKE) -C klibc spotless
 
 spotless: clean
        $(MAKE) -C klibc spotless

+       -rm -f klibc/linux

 
 DISTFILES = $(shell find . \( -not -name '.' \) -print | grep -v -e CVS -e "\.tar\.gz$" -e "\/\." -e releases -e BitKeeper -e SCCS -e "\.tdb$" -e test/sys | sort )
 DISTDIR := $(RELEASE_NAME)
 
 DISTFILES = $(shell find . \( -not -name '.' \) -print | grep -v -e CVS -e "\.tar\.gz$" -e "\/\." -e releases -e BitKeeper -e SCCS -e "\.tdb$" -e test/sys | sort )
 DISTDIR := $(RELEASE_NAME)

diff --git a/klibc/klibc/Makefile b/klibc/klibc/Makefile
index d7e75f181498c6269a951760ac3bbd5e2a9c228e..3519b4508908b5d9f374eab58bf42c96c0969e2f 100644 (file)
--- a/klibc/klibc/Makefile
+++ b/klibc/klibc/Makefile
@@ -59,7 +59,7 @@ LIB     = libc.a
 
 INTERP_O = interp.o
 
 
 INTERP_O = interp.o
 

-all: tests $(CRT0) $(LIB) $(SOLIB) klibc.so
+all: $(CRT0) $(LIB) $(SOLIB) klibc.so

 
 # Add any architecture-specific rules
 include arch/$(ARCH)/Makefile.inc
 
 # Add any architecture-specific rules
 include arch/$(ARCH)/Makefile.inc