X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=Makefile.klibc;h=df1e55b436b37b28896c818aa0280ea7db899410;hp=ccc862dd8bd7b306f34d3d1ba74e9b22059c128f;hb=98b88dbf704a1376ee4c79051086089adde5d626;hpb=1e959a4b05f93bf31d0603a027b50cb148ef7e90

diff --git a/Makefile.klibc b/Makefile.klibc
index ccc862dd8..df1e55b43 100644
--- a/Makefile.klibc
+++ b/Makefile.klibc
@@ -22,7 +22,7 @@ DEBUG = true
 
 
 ROOT =		udev
-VERSION =	004_bk
+VERSION =	005_bk
 INSTALL_DIR =	/usr/local/bin
 RELEASE_NAME =	$(ROOT)-$(VERSION)
 
@@ -112,18 +112,18 @@ ifeq ($(strip $(KLIBC)),true)
 	LIBGCC		= $(shell $(CC) --print-libgcc)
 	ARCH_LIB_OBJS =	\
 			$(KLIBC_DIR)/libc.a	\
-#			$(KLIBC_DIR)/crt0.o	\
-#			$(LIBGCC)
-#			$(KLIBC_DIR)/bin-$(ARCH)/start.o	\
-#			$(KLIBC_DIR)/bin-$(ARCH)/klibc.a
+			$(LIBGCC)
 
-#	LIB_OBJS =	$(GCC_LIB)
 
+	CRT0 = $(KLIBC_DIR)/crt0.o
 	LIBC =	$(ARCH_LIB_OBJS) $(LIB_OBJS)
-	CFLAGS += -nostdinc -I$(INCLUDE_DIR) -I$(INCLUDE_DIR)/bits32 -I/home/greg/linux/linux-2.5/include -I$(GCCINCDIR) -D__KLIBC__
-	LDFLAGS =
-#	LDFLAGS = --static --nostdlib -nostartfiles
+	CFLAGS += -nostdinc -I$(INCLUDE_DIR) -I$(INCLUDE_DIR)/bits32 -I$(GCCINCDIR) -Iklibc/linux/include -D__KLIBC__
+	LIB_OBJS =
+	LDFLAGS = --static --nostdlib -nostartfiles
 else
+#	ARCH_LIB_OBJS = /usr/lib/libc.a
+	LIBGCC = $(shell $(CC) --print-libgcc)
+	CRT0 = /usr/lib/crt1.o /usr/lib/crti.o
 	LIBC = 
 	CFLAGS += -I$(GCCINCDIR)
 	LIB_OBJS = -lc
@@ -152,7 +152,7 @@ OBJS =	udev.o		\
 	udevdb.o	\
 	logging.o	\
 	namedev.o	\
-	klibc.o		\
+	klibc_fixups.o	\
 	$(SYSFS)	\
 	$(TDB)
 
@@ -167,8 +167,7 @@ udev_version.h:
 
 
 $(ROOT): $(GEN_HEADERS) $(OBJS)
-	$(CC) $(LDFLAGS) -o $(ROOT) $(OBJS) $(LIB_OBJS) $(ARCH_LIB_OBJS)
-	$(LD) $(LDFLAGS) -o $(ROOT) $(KLIBC_DIR)/crt0.o $(OBJS) $(LIB_OBJS) $(ARCH_LIB_OBJS)
+	$(LD) $(LDFLAGS) -o $(ROOT) $(CRT0) $(OBJS) $(LIB_OBJS) $(LIBGCC) $(ARCH_LIB_OBJS)
 	$(STRIPCMD) $(ROOT)
 
 clean:
@@ -177,3 +176,44 @@ clean:
 	-rm -f core $(ROOT) $(GEN_HEADERS)
 	$(MAKE) -C klibc 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" | grep -v "test\/sys" | sort )
+DISTDIR := $(RELEASE_NAME)
+srcdir = .
+release: $(DISTFILES) clean
+#	@echo $(DISTFILES)
+	@-rm -rf $(DISTDIR)
+	@mkdir $(DISTDIR)
+	@-chmod 777 $(DISTDIR)
+	@for file in $(DISTFILES); do			\
+		if test -d $$file; then			\
+		  	mkdir $(DISTDIR)/$$file;	\
+		else					\
+			cp -p $$file $(DISTDIR)/$$file;	\
+		fi;					\
+	done
+	@tar -c $(DISTDIR) | gzip -9 > $(RELEASE_NAME).tar.gz
+	@rm -rf $(DISTDIR)
+	@echo "Built $(RELEASE_NAME).tar.gz"
+
+
+install: all
+	$(INSTALL) -d $(udevdir)
+	$(INSTALL) -d $(configdir)
+	$(INSTALL) -d $(hotplugdir)
+	$(INSTALL_PROGRAM) -D $(ROOT) $(sbindir)/$(ROOT)
+	$(INSTALL_DATA) -D udev.8 $(mandir)/man8/udev.8
+	$(INSTALL_DATA) udev.config $(configdir)
+	$(INSTALL_DATA) udev.permissions $(configdir)
+	- ln -s $(sbindir)/$(ROOT) $(hotplugdir)/udev.hotplug
+
+uninstall:
+	- rm $(hotplugdir)/udev.hotplug
+	- rm $(configdir)/udev.permissions
+	- rm $(configdir)/udev.config
+	- rm $(mandir)/man8/udev.8
+	- rm $(sbindir)/$(ROOT)
+	- rmdir $(hotplugdir)
+	- rmdir $(configdir)
+	- rmdir $(udevdir)
+
+