Merge jkoenig/master into master.

This branch supersedes the previous one.

1 files changed, 22 insertions, 26 deletions

diff --git a/Makefile b/Makefile
index 500a2371..a397522f 100644
--- a/Makefile
+++ b/Makefile
@@ -1,30 +1,26 @@
-#   Makefile - for procfs
-# 
-#   Copyright (C) 2008 Free Software Foundation, Inc.
-#
-#   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, or (at
-#   your option) any later version.
-#
-#   This program is distributed in the hope that it will be useful, but
-#   WITHOUT ANY WARRANTY; without even the implied warranty of
-#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-#   General Public License for more details.
-#
-#   You should have received a copy of the GNU General Public License
-#   along with this program; if not, write to the Free Software
-#   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+TARGET = procfs
+OBJS = procfs.o netfs.o procfs_dir.o \
+       process.o proclist.o rootdir.o dircat.o main.o
+LIBS = -lnetfs -lps
 
-dir := procfs
-makemode := server
+CC = gcc
+CFLAGS = -Wall -g
+CPPFLAGS =
+LDFLAGS =
 
-target = procfs
+ifdef PROFILE
+CFLAGS= -g -pg
+CPPFLAGS= -DPROFILE
+LDFLAGS= -static
+LIBS= -lnetfs -lfshelp -liohelp -lps -lports -lthreads -lihash -lshouldbeinlibc
+endif
 
-SRCS = procfs.c bootstrap.c netfs.c procfs_dir.c node.c procfs_pid_files.c procfs_nonpid_files.c
-LCLHDRS = procfs.h procfs_pid.h
+CPPFLAGS += -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64
 
-OBJS = $(SRCS:.c=.o)
-HURDLIBS = netfs fshelp iohelp threads ports ihash ps shouldbeinlibc
-	
-include ../Makeconf
+all: $(TARGET)
+
+$(TARGET): $(OBJS)
+	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(LIBS)
+
+clean:
+	$(RM) $(TARGET) $(OBJS)