diff options
| author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2012-07-01 02:20:08 +0000 |
|---|---|---|
| committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2012-07-01 02:20:08 +0000 |
| commit | 953c525d7589178629f3e91e4bf4ea805a92a5b4 (patch) | |
| tree | 9411cddbd2f213fe4edf2150e2e8b02a9d27b4bf /libthreads/Makefile | |
| parent | 13ea39a34766fcbecd96ab94bcdf798b08e9bb60 (diff) | |
| parent | 5430151902aa7cb17458c0d71722a05fd379babf (diff) | |
Merge branch 'master' into xkb
Conflicts:
console-client/Makefile
Diffstat (limited to 'libthreads/Makefile')
| -rw-r--r-- | libthreads/Makefile | 19 |
1 files changed, 1 insertions, 18 deletions
diff --git a/libthreads/Makefile b/libthreads/Makefile index e9fa571b..3bcff2aa 100644 --- a/libthreads/Makefile +++ b/libthreads/Makefile @@ -1,5 +1,4 @@ -# -# Copyright (C) 1994,95,96,97,2000,2010 Free Software Foundation, Inc. +# Copyright (C) 1994,95,96,97,2000,2010,2012 Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License as @@ -25,7 +24,6 @@ SRCS := call.c cprocs.c cthread_data.c cthreads.c stack.c \ I386SRCS := i386/csw.S i386/thread.c # In GNU machine/cthreads.h is omitted; that work is done in libc headers. -LCLHDRS := cthread_internals.h options.h cthreads.h rwlock.h OBJS = $(addsuffix .o,$(basename $(notdir $(SRCS) $(I386SRCS)))) @@ -43,23 +41,8 @@ include ../Makeconf # what that means, you'll understand this line. CFLAGS := $(filter-out -Wall,$(CFLAGS)) -lndist: lndist-i386-files - -lndist-i386-files: $(top_srcdir)/hurd-snap/$(dir)/i386 - ln $(addprefix $(srcdir)/,$(I386SRCS) $(I386HDRS)) $< - -$(top_srcdir)/hurd-snap/$(dir)/i386: - mkdir $@ - ifeq ($(VERSIONING),yes) - # Adding this dependency gets it included in the command line, # where ld will read it as a linker script. $(libname).so.$(hurd-version): $(srcdir)/$(libname).map - -lndist: lndist-map-file - -lndist-map-file: $(top_srcdir)/hurd-snap/$(dir) - ln $(addprefix $(srcdir)/,$(libname).map) $< - endif |