chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[PATCH] pull some klibc stuff into the make Makefile to try to stay in sync.
[elogind.git]
/
Makefile
diff --git
a/Makefile
b/Makefile
index c7d0391473682f675ecc9bfa4753ac3e5cdf200d..8d7122858b3660df403a240643b563aecd3aefe6 100644
(file)
--- a/
Makefile
+++ b/
Makefile
@@
-22,7
+22,7
@@
DEBUG = true
ROOT = udev
ROOT = udev
-VERSION = 00
4_bk
+VERSION = 00
5
INSTALL_DIR = /usr/local/bin
RELEASE_NAME = $(ROOT)-$(VERSION)
INSTALL_DIR = /usr/local/bin
RELEASE_NAME = $(ROOT)-$(VERSION)
@@
-106,34
+106,43
@@
endif
# If we are using our version of klibc, then we need to build and link it.
# Otherwise, use glibc and link statically.
ifeq ($(strip $(KLIBC)),true)
# If we are using our version of klibc, then we need to build and link it.
# Otherwise, use glibc and link statically.
ifeq ($(strip $(KLIBC)),true)
- KLIBC_DIR = klibc
+ KLIBC_DIR = klibc
/klibc
INCLUDE_DIR := $(KLIBC_DIR)/include
# arch specific objects
INCLUDE_DIR := $(KLIBC_DIR)/include
# arch specific objects
+ LIBGCC = $(shell $(CC) --print-libgcc)
ARCH_LIB_OBJS = \
ARCH_LIB_OBJS = \
- $(KLIBC_DIR)/
bin-$(ARCH)/start.o
\
- $(
KLIBC_DIR)/bin-$(ARCH)/klibc.a
+ $(KLIBC_DIR)/
libc.a
\
+ $(
LIBGCC)
- LIB_OBJS = $(GCC_LIB)
+ CRT0 = $(KLIBC_DIR)/crt0.o
LIBC = $(ARCH_LIB_OBJS) $(LIB_OBJS)
LIBC = $(ARCH_LIB_OBJS) $(LIB_OBJS)
- CFLAGS += -nostdinc -I$(INCLUDE_DIR) -I$(GCCINCDIR)
+ CFLAGS += -nostdinc -I$(INCLUDE_DIR) -I$(INCLUDE_DIR)/bits32 -I$(GCCINCDIR) -Iklibc/linux/include -D__KLIBC__
+ LIB_OBJS =
LDFLAGS = --static --nostdlib -nostartfiles
else
LDFLAGS = --static --nostdlib -nostartfiles
else
+ CRT0 =
LIBC =
CFLAGS += -I$(GCCINCDIR)
LIB_OBJS = -lc
LDFLAGS = --static
endif
LIBC =
CFLAGS += -I$(GCCINCDIR)
LIB_OBJS = -lc
LDFLAGS = --static
endif
-LIB=libsysfs
-
all: $(LIBC) $(ROOT)
$(ARCH_LIB_OBJS) :
$(MAKE) -C klibc
all: $(LIBC) $(ROOT)
$(ARCH_LIB_OBJS) :
$(MAKE) -C klibc
-LIBSYSFS = libsysfs/libsysfs.a
-TDB = tdb/tdb.o tdb/spinlock.o
+TDB = tdb/tdb.o \
+ tdb/spinlock.o
+
+SYSFS = libsysfs/sysfs_bus.o \
+ libsysfs/sysfs_class.o \
+ libsysfs/sysfs_device.o \
+ libsysfs/sysfs_dir.o \
+ libsysfs/sysfs_driver.o \
+ libsysfs/sysfs_utils.o \
+ libsysfs/dlist.o
OBJS = udev.o \
udev-add.o \
OBJS = udev.o \
udev-add.o \
@@
-141,14
+150,10
@@
OBJS = udev.o \
udevdb.o \
logging.o \
namedev.o \
udevdb.o \
logging.o \
namedev.o \
+ klibc_fixups.o \
+ $(SYSFS) \
$(TDB)
$(TDB)
-libsysfs/libsysfs.a:
- $(MAKE) -C libsysfs
-
-tdb/tdb.o:
- $(MAKE) -C tdb
-
# header files automatically generated
GEN_HEADERS = udev_version.h
# header files automatically generated
GEN_HEADERS = udev_version.h
@@
-159,9
+164,8
@@
udev_version.h:
@echo \#define UDEV_ROOT \"$(udevdir)\" >> $@
@echo \#define UDEV_ROOT \"$(udevdir)\" >> $@
-$(ROOT): $(GEN_HEADERS) $(OBJS) $(LIBSYSFS) $(TDB)
- $(MAKE) -C libsysfs
- $(CC) $(LDFLAGS) -o $(ROOT) $(OBJS) -lsysfs $(LIB_OBJS) -L$(LIB) $(ARCH_LIB_OBJS)
+$(ROOT): $(GEN_HEADERS) $(OBJS)
+ $(CC) $(LDFLAGS) -o $(ROOT) $(OBJS) $(LIB_OBJS) $(ARCH_LIB_OBJS)
$(STRIPCMD) $(ROOT)
clean:
$(STRIPCMD) $(ROOT)
clean:
@@
-169,10
+173,8
@@
clean:
| xargs rm -f
-rm -f core $(ROOT) $(GEN_HEADERS)
$(MAKE) -C klibc clean
| xargs rm -f
-rm -f core $(ROOT) $(GEN_HEADERS)
$(MAKE) -C klibc clean
- $(MAKE) -C libsysfs clean
- $(MAKE) -C tdb clean
-
#DISTFILES = $(shell find . \( -not -name '.' \) -print | grep -v CVS | grep -v "\.tar\.gz" | grep -v "\/\." | grep -v releases | grep -v BitKeeper | grep -v SCCS | grep -v "\.tdb
" | sort )
+
DISTFILES = $(shell find . \( -not -name '.' \) -print | grep -v CVS | grep -v "\.tar\.gz" | grep -v "\/\." | grep -v releases | grep -v BitKeeper | grep -v SCCS | grep -v "\.tdb" | grep -v "test\/sys
" | sort )
DISTDIR := $(RELEASE_NAME)
srcdir = .
release: $(DISTFILES) clean
DISTDIR := $(RELEASE_NAME)
srcdir = .
release: $(DISTFILES) clean