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 /libdiskfs/Makefile | |
| parent | 13ea39a34766fcbecd96ab94bcdf798b08e9bb60 (diff) | |
| parent | 5430151902aa7cb17458c0d71722a05fd379babf (diff) | |
Merge branch 'master' into xkb
Conflicts:
console-client/Makefile
Diffstat (limited to 'libdiskfs/Makefile')
| -rw-r--r-- | libdiskfs/Makefile | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/libdiskfs/Makefile b/libdiskfs/Makefile index 73686889..606ed954 100644 --- a/libdiskfs/Makefile +++ b/libdiskfs/Makefile @@ -1,5 +1,4 @@ -# -# Copyright (C) 1994,95,96,97,98,99,2000,01,2006 +# Copyright (C) 1994,95,96,97,98,99,2000,01,2006,2012 # Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or @@ -54,7 +53,6 @@ OTHERSRCS = conch-fetch.c conch-set.c dir-clear.c dir-init.c dir-renamed.c \ validate-mode.c validate-group.c validate-author.c validate-flags.c \ validate-rdev.c validate-owner.c extra-version.c SRCS = $(OTHERSRCS) $(FSSRCS) $(IOSRCS) $(FSYSSRCS) $(IFSOCKSRCS) -LCLHDRS = diskfs.h priv.h lithp.h fsmutations.h diskfs-pager.h fhandle.h installhdrs = diskfs.h diskfs-pager.h MIGSTUBS = fsServer.o ioServer.o fsysServer.o exec_startupServer.o \ |