Formerly Makefile.~14~

1 files changed, 14 insertions, 34 deletions

diff --git a/libthreads/Makefile b/libthreads/Makefile
index ea5400e7..b32136b0 100644
--- a/libthreads/Makefile
+++ b/libthreads/Makefile
@@ -15,57 +15,37 @@
 #   along with this program; if not, write to the Free Software
 #   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-dir := libthreads
-
 # This is currently i386 specific. XXX 
 
-include ../Makeconf
+dir := libthreads
+makemode := library
 
 # 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 malloc.c
-machine-sources = csw.S thread.c
-sources = $(generic-sources) $(addprefix $(machine)/,$(machine-sources))
-objects = $(addsuffix .o,$(basename $(notdir $(sources))))
-headers = cthreads.h
-
-SRCS = $(sources)
-TAGSHDRS=$(headers)
-
-DIST_FILES = $(generic-sources) $(headers) \
-	     cthread_internals.h options.h \
-	     ChangeLog Makefile
+SRCS := call.c cprocs.c cthread_data.c cthreads.c stack.c malloc.c
+I386SRCS := i386/csw.S i386/thread.c
 
 # In GNU machine/cthreads.h is omitted; that work is done in libc headers.
-I386_DIST_FILES = $(addprefix i386/,$(machine-sources)) i386/asm.h
+LCLHDRS := cthread_internals.h options.h cthreads.h
+I386HDRS := i386/asm.h
 
-VPATH = $(machine)
-
-all: libthreads.a 
-
-libthreads.a: $(objects)
-	rm -f libthreads.a
-	$(AR) r $@ $^
+OBJS = $(addsuffix .o,$(basename $(notdir $(SRCS) $(I386SRCS))))
 
-$(hurdinst)/lib/libthreads.a: libthreads.a
-	cp libthreads.a $@
-	$(RANLIB) $@
+OTHERTAGS = $(I386SRCS) $(I386HDRS)
 
-$(hurdinst)/include/cthreads.h: cthreads.h
-	cp $< $@
+libname = libthreads
+installhdrs = cthreads.h
 
-install: $(hurdinst)/lib/libthreads.a $(hurdinst)/include/cthreads.h
+VPATH = $(machine)
 
-$(objects): cthreads.h cthread_internals.h options.h \
-	 i386/asm.h
+include ../Makeconf
 
-clean:
-	rm -f libthreads.a *.o
+$(objects): cthreads.h cthread_internals.h options.h i386/asm.h
 
 lndist: lndist-i386-files
 
 lndist-i386-files: $(hurdsource)/hurd-snap/$(dir)/i386
-	ln $(I386_DIST_FILES) $(hurdsource)/hurd-snap/$(dir)/i386
+	ln $(I386SRCS) $(I386HDRS) $(hurdsource)/hurd-snap/$(dir)/i386
 
 $(hurdsource)/hurd-snap/$(dir)/i386:
 	mkdir $(hurdsource)/hurd-snap/$(dir)/i386