X-Git-Url: http://nsz.repo.hu/git/?p=musl;a=blobdiff_plain;f=Makefile;h=6a862110487cfd153eee6aa8654da72a122b2e86;hp=3c55c8f24c9dd566ae2e4033f4afe85d16093cc3;hb=3df0b66ee95c837496ae434ba7a2282d97ca71ef;hpb=0b3e2257fa9f4c4773f8aec1bdbccbc46a4d9477

diff --git a/Makefile b/Makefile
index 3c55c8f2..6a862110 100644
--- a/Makefile
+++ b/Makefile
@@ -16,7 +16,7 @@ includedir = $(prefix)/include
 libdir = $(prefix)/lib
 syslibdir = /lib
 
-SRCS = $(sort $(wildcard src/*/*.c))
+SRCS = $(sort $(wildcard src/*/*.c arch/$(ARCH)/src/*.c))
 OBJS = $(SRCS:.c=.o)
 LOBJS = $(OBJS:.o=.lo)
 GENH = include/bits/alltypes.h
@@ -37,7 +37,8 @@ CFLAGS_ALL_SHARED = $(CFLAGS_ALL) -fPIC -DSHARED
 AR      = $(CROSS_COMPILE)ar
 RANLIB  = $(CROSS_COMPILE)ranlib
 
-ALL_INCLUDES = $(sort $(wildcard include/*.h include/*/*.h) $(GENH))
+ARCH_INCLUDES = $(wildcard arch/$(ARCH)/bits/*.h)
+ALL_INCLUDES = $(sort $(wildcard include/*.h include/*/*.h) $(GENH) $(ARCH_INCLUDES:arch/$(ARCH)/%=include/%))
 
 EMPTY_LIB_NAMES = m rt pthread crypt util xnet resolv dl
 EMPTY_LIBS = $(EMPTY_LIB_NAMES:%=lib/lib%.a)
@@ -94,7 +95,7 @@ src/ldso/dynlink.lo: arch/$(ARCH)/reloc.h
 lib/libc.so: $(LOBJS)
 	$(CC) $(CFLAGS_ALL_SHARED) $(LDFLAGS) -nostdlib -shared \
 	-Wl,-e,_start -Wl,-Bsymbolic-functions \
-	-Wl,-soname=libc.so -o $@ $(LOBJS) $(LIBCC)
+	-o $@ $(LOBJS) $(LIBCC)
 
 lib/libc.a: $(OBJS)
 	rm -f $@
@@ -124,6 +125,9 @@ $(DESTDIR)$(libdir)/%.so: lib/%.so
 $(DESTDIR)$(libdir)/%: lib/%
 	install -D -m 644 $< $@
 
+$(DESTDIR)$(includedir)/bits/%: arch/$(ARCH)/bits/%
+	install -D -m 644 $< $@
+
 $(DESTDIR)$(includedir)/%: include/%
 	install -D -m 644 $< $@