summaryrefslogtreecommitdiff
path: root/libthreads
diff options
context:
space:
mode:
Diffstat (limited to 'libthreads')
-rw-r--r--libthreads/Makefile20
1 files changed, 5 insertions, 15 deletions
diff --git a/libthreads/Makefile b/libthreads/Makefile
index dfe5cb77..ea5400e7 100644
--- a/libthreads/Makefile
+++ b/libthreads/Makefile
@@ -23,36 +23,30 @@ include ../Makeconf
# In GNU mig_support.c, sync.c and machine/lock.s are omitted; that work is
# all done in libc.
-generic-sources = call.c cprocs.c cthread_data.c cthreads.c stack.c
+generic-sources = call.c cprocs.c cthread_data.c cthreads.c stack.c malloc.c
machine-sources = csw.S thread.c
sources = $(generic-sources) $(addprefix $(machine)/,$(machine-sources))
objects = $(addsuffix .o,$(basename $(notdir $(sources))))
headers = cthreads.h
-malloc-sources = malloc.c
-malloc-objects = $(addsuffix .o,$(basename $(notdir $(malloc-sources))))
SRCS = $(sources)
TAGSHDRS=$(headers)
DIST_FILES = $(generic-sources) $(headers) \
cthread_internals.h options.h \
- ChangeLog Makefile $(malloc-sources)
+ ChangeLog Makefile
# In GNU machine/cthreads.h is omitted; that work is done in libc headers.
I386_DIST_FILES = $(addprefix i386/,$(machine-sources)) i386/asm.h
VPATH = $(machine)
-all: libthreads.a libmalloc.a
+all: libthreads.a
libthreads.a: $(objects)
rm -f libthreads.a
$(AR) r $@ $^
-libmalloc.a: $(malloc-objects)
- rm -f libmalloc.a
- $(AR) r $@ $^
-
$(hurdinst)/lib/libthreads.a: libthreads.a
cp libthreads.a $@
$(RANLIB) $@
@@ -60,17 +54,13 @@ $(hurdinst)/lib/libthreads.a: libthreads.a
$(hurdinst)/include/cthreads.h: cthreads.h
cp $< $@
-$(hurdinst)/lib/libmalloc.a: libmalloc.a
- cp $< $@
- $(RANLIB) $@
-
-install: $(hurdinst)/lib/libthreads.a $(hurdinst)/include/cthreads.h $(hurdinst)/lib/libmalloc.a
+install: $(hurdinst)/lib/libthreads.a $(hurdinst)/include/cthreads.h
$(objects): cthreads.h cthread_internals.h options.h \
i386/asm.h
clean:
- rm -f libthreads.a *.o libmalloc.a
+ rm -f libthreads.a *.o
lndist: lndist-i386-files