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 /pflocal/Makefile | |
parent | 1f8d504f631531c199d7c6154a0dc442d80ea4a7 (diff) | |
parent | 7e15f3d69a83a34ac62cbbee944a0bfbfa92724e (diff) |
Merge branch 'master' into xkb
Conflicts:
config.make.in
configure.in
Diffstat (limited to 'pflocal/Makefile')
-rw-r--r-- | pflocal/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pflocal/Makefile b/pflocal/Makefile index a7e664fa..7258e587 100644 --- a/pflocal/Makefile +++ b/pflocal/Makefile @@ -26,7 +26,7 @@ LCLHDRS = connq.h sock.h mig-decls.h mig-mutate.h sserver.h MIGSTUBS = ioServer.o socketServer.o OBJS = $(SRCS:.c=.o) $(MIGSTUBS) -HURDLIBS = pipe trivfs fshelp threads ports ihash shouldbeinlibc +HURDLIBS = pipe trivfs iohelp fshelp threads ports ihash shouldbeinlibc MIGSFLAGS = -imacros $(srcdir)/mig-mutate.h |