summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeroen Dekkers <jeroen@dekkers.cx>2003-07-05 15:10:02 +0000
committerJeroen Dekkers <jeroen@dekkers.cx>2003-07-05 15:10:02 +0000
commit667ed7f251864241fb7c7a930b9b324be8028b04 (patch)
treecc4de1d07b4539d24d781544f49867c99ae6e267
parent38c862bb0c34759102539d59636f7997e92054d3 (diff)
2003-07-05 Jeroen Dekkers <jeroen@pc-jeroen>
* Makefile: Rewrite.
-rw-r--r--ChangeLog8
-rw-r--r--Makefile44
2 files changed, 16 insertions, 36 deletions
diff --git a/ChangeLog b/ChangeLog
index 9ba5903..8fd7d3b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,6 @@
-2003-07-05 Jeroen Dekkers <jeroen@dekkers.cx>
+2003-07-05 Jeroen Dekkers <jeroen@pc-jeroen>
+
+ * Makefile: Rewrite.
* netfs.c (netfs_attempt_create_file): Unlock DIR.
(netfs_attempt_mkfile): Likewise.
@@ -27,3 +29,7 @@
* node.c (node_create_root): call lnode_destroy, if node_create
failed, not if lnode_create failed. Reported by Richard Smith.
+
+ Copyright 2002, 2003 Free Software Foundation, Inc.
+ Copying and distribution of this file, with or without modification, are
+ permitted provided the copyright notice and this notice are preserved.
diff --git a/Makefile b/Makefile
index 67dd3ae..017863c 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
# Hurd unionfs
-# Copyright (C) 2001, 2002 Free Software Foundation, Inc.
-# Written by Moritz Schulte <moritz@duesseldorf.ccc.de>.
+# Copyright (C) 2001, 2002, 2003 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
@@ -17,46 +17,20 @@
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
# USA.
-CFLAGS += -Wall -g -D_FILE_OFFSET_BITS=64 -std=gnu99 \
+CFLAGS += -Wall -g -O2 -D_FILE_OFFSET_BITS=64 -std=gnu99 \
-DDEBUG
LDFLAGS += -lnetfs -lfshelp -liohelp -lthreads \
-lports -lihash -lshouldbeinlibc
+OBJS = main.o node.o lnode.o ulfs.o ncache.o netfs.o \
+ lib.o options.o
all: unionfs
-unionfs: main.o node.o lnode.o ulfs.o ncache.o netfs.o \
- lib.o options.o
- $(CC) -o $@ main.o node.o lnode.o ulfs.o options.o \
- ncache.o netfs.o lib.o $(LDFLAGS)
+unionfs: $(OBJS)
+ $(CC) -o $@ $(OBJS) $(LDFLAGS)
-unionfs.static: main.o node.o lnode.o ulfs.o ncache.o netfs.o \
- lib.o options.o
- $(CC) -static -o $@ main.o node.o lnode.o ulfs.o \
- ncache.o netfs.o lib.o options.o $(LDFLAGS)
-
-main.o: main.c
- $(CC) $(CFLAGS) -c $<
-
-node.o: node.c
- $(CC) $(CFLAGS) -c $<
-
-lnode.o: lnode.c
- $(CC) $(CFLAGS) -c $<
-
-ulfs.o: ulfs.c
- $(CC) $(CFLAGS) -c $<
-
-ncache.o: ncache.c
- $(CC) $(CFLAGS) -c $<
-
-netfs.o: netfs.c
- $(CC) $(CFLAGS) -c $<
-
-lib.o: lib.c
- $(CC) $(CFLAGS) -c $<
-
-options.o: options.c
- $(CC) $(CFLAGS) -c $<
+unionfs.static: $(OBJS)
+ $(CC) -static -o $@ $(OBJS) $(LDFLAGS)
.PHONY: clean