diff options
| author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2012-07-01 02:12:43 +0000 |
|---|---|---|
| committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2012-07-01 02:12:43 +0000 |
| commit | 13ea39a34766fcbecd96ab94bcdf798b08e9bb60 (patch) | |
| tree | 1e1463b03838a6f36868a4dafc7e652358a51857 /Makeconf | |
| parent | 1f8d504f631531c199d7c6154a0dc442d80ea4a7 (diff) | |
| parent | 7e15f3d69a83a34ac62cbbee944a0bfbfa92724e (diff) | |
Merge branch 'master' into xkb
Conflicts:
config.make.in
configure.in
Diffstat (limited to 'Makeconf')
| -rw-r--r-- | Makeconf | 14 |
1 files changed, 10 insertions, 4 deletions
@@ -35,9 +35,6 @@ # Put this first so it's the default all: -# What version of the Hurd is this? -hurd-version := 0.3 - # Figure out how to locate the parent directory from here. ifeq (.,$(dir)) .. = @@ -273,6 +270,15 @@ $(libdir)/$(libname).so: $(libdir)/$(libname).so.$(hurd-version) $(addprefix $(includedir)/$(installhdrsubdir)/,$(installhdrs)): $(includedir)/$(installhdrsubdir)/%: % $(INSTALL_DATA) $< $@ +# Arrange to have the shared libraries available locally in one single +# directory. This is not used by the build system itself, but is just for easy +# testing. +local-libdir = lib +../$(local-libdir)/$(libname).so.$(hurd-version): $(libname).so.$(hurd-version) + @test -d $(@D)/ || $(MKINSTALLDIRS) $(@D) + ln -sf ../$(dir)/$< $@ +libs: ../$(local-libdir)/$(libname).so.$(hurd-version) + endif # Provide default. @@ -382,7 +388,7 @@ $(..)$(dir).d: $(srcdir)/Makefile echo $(dir): $(hurd-bug-addr-dir-dep) $(addprefix lib,$(HURDLIBS)) > $@ # Making a snapshot -distfiles = Makefile ChangeLog $(SRCS) $(LCLHDRS) $(DIST_FILES) +distfiles = Makefile $(SRCS) $(LCLHDRS) $(DIST_FILES) lndist: $(distfiles) $(top_srcdir)/hurd-snap/$(dir) FORCE ln $(addprefix $(srcdir)/,$(distfiles)) $(top_srcdir)/hurd-snap/$(dir) |