summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile18
-rw-r--r--options.c4
2 files changed, 11 insertions, 11 deletions
diff --git a/Makefile b/Makefile
index b180072..7ef2100 100644
--- a/Makefile
+++ b/Makefile
@@ -1,10 +1,12 @@
# Hurd unionfs
-# Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation, Inc.
+#
+# Copyright (C) 2001, 2002, 2003, 2005, 2009 Free Software Foundation, Inc.
+#
# Written by Jeroen Dekkers <jeroen@dekkers.cx>.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or *
+# the Free Software Foundation; either version 2 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful, but
@@ -23,7 +25,7 @@ MIGCOM = mig -cc cat - /dev/null
CFLAGS += -Wall -g -O2 -D_FILE_OFFSET_BITS=64 -std=gnu99 \
-DDEBUG
LDFLAGS += -lnetfs -lfshelp -liohelp -lthreads \
- -lports -lihash -lshouldbeinlibc
+ -lports -lihash -lshouldbeinlibc -lhurdbugaddr
OBJS = main.o node.o lnode.o ulfs.o ncache.o netfs.o \
lib.o options.o pattern.o stow.o update.o
@@ -58,11 +60,11 @@ $(mig-sheader-prefix)%_S.h %Server.c: %.sdefsi
-sheader $(mig-sheader-prefix)$*_S.h -server $*Server.c \
-user /dev/null -header /dev/null < $<
-%.sdefsi: %.defs
- $(CPP) $(CPPFLAGS) $(MIGSFLAGS) $($*-MIGSFLAGS) -DSERVERPREFIX=S_ $< -o $@
-
-vpath %.defs $(prefix)/include/hurd
-
+%.sdefsi:
+ echo '#include <hurd/$*.defs>' | \
+ $(CPP) \
+ $(CPPFLAGS) $(MIGSFLAGS) $($*-MIGSFLAGS) -DSERVERPREFIX=S_ \
+ -x c - -o $@
all: unionfs
diff --git a/options.c b/options.c
index ef29a02..2d3a11f 100644
--- a/options.c
+++ b/options.c
@@ -1,5 +1,5 @@
/* Hurd unionfs
- Copyright (C) 2001, 2002, 2005 Free Software Foundation, Inc.
+ Copyright (C) 2001, 2002, 2005, 2009 Free Software Foundation, Inc.
Written by Moritz Schulte <moritz@duesseldorf.ccc.de>.
This program is free software; you can redistribute it and/or
@@ -210,8 +210,6 @@ const struct argp_child argp_children_startup[] =
};
const char *argp_program_version = STANDARD_HURD_VERSION (unionfs);
-const char *argp_program_bug_address =
-"Gianluca Guida <glguida@gmail.com>";
#define ARGS_DOC "FILESYSTEMS ..."
#define DOC "Hurd unionfs server"