summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJustus Winter <4winter@informatik.uni-hamburg.de>2014-06-15 18:25:59 +0200
committerJustus Winter <4winter@informatik.uni-hamburg.de>2014-06-15 18:25:59 +0200
commitaac4aaf42372f61c78061711916c81a9d5bcb42d (patch)
tree167fb3e426cc7757a43da2c7d04fc2baa293c5de
parent65ebcc40e55dfb3ee776383891f8a6b15b176d27 (diff)
Prepare the procfs translator to be merged into the Hurd sources
Move the procfs translator to its own subdirectory 'procfs'. This is the last commit to this repository. Development of the procfs translator will continue in the main Hurd repository. * procfs/Makefile: Replace the standalone Makefile with the one from the Debian packaging repository.
-rw-r--r--Makefile46
-rw-r--r--procfs/ChangeLog (renamed from ChangeLog)0
-rw-r--r--procfs/Makefile34
-rw-r--r--procfs/TODO (renamed from TODO)0
-rw-r--r--procfs/dircat.c (renamed from dircat.c)0
-rw-r--r--procfs/dircat.h (renamed from dircat.h)0
-rw-r--r--procfs/main.c (renamed from main.c)0
-rw-r--r--procfs/main.h (renamed from main.h)0
-rw-r--r--procfs/netfs.c (renamed from netfs.c)0
-rw-r--r--procfs/process.c (renamed from process.c)0
-rw-r--r--procfs/process.h (renamed from process.h)0
-rw-r--r--procfs/procfs.c (renamed from procfs.c)0
-rw-r--r--procfs/procfs.h (renamed from procfs.h)0
-rw-r--r--procfs/procfs_dir.c (renamed from procfs_dir.c)0
-rw-r--r--procfs/procfs_dir.h (renamed from procfs_dir.h)0
-rw-r--r--procfs/proclist.c (renamed from proclist.c)0
-rw-r--r--procfs/proclist.h (renamed from proclist.h)0
-rw-r--r--procfs/rootdir.c (renamed from rootdir.c)0
-rw-r--r--procfs/rootdir.h (renamed from rootdir.h)0
19 files changed, 34 insertions, 46 deletions
diff --git a/Makefile b/Makefile
deleted file mode 100644
index 28205962..00000000
--- a/Makefile
+++ /dev/null
@@ -1,46 +0,0 @@
-TARGET = procfs
-OBJS = procfs.o netfs.o procfs_dir.o \
- process.o proclist.o rootdir.o dircat.o main.o mach_debugUser.o
-LIBS = -lnetfs -lps -lfshelp -lpthread
-
-CC = gcc
-CFLAGS = -Wall -g
-CPPFLAGS =
-LDFLAGS =
-
-ifdef PROFILE
-CFLAGS= -g -pg
-CPPFLAGS= -DPROFILE
-LDFLAGS= -static
-LIBS= -lnetfs -lfshelp -liohelp -lps -lports -lpthread -lihash -lshouldbeinlibc
-endif
-
-CPPFLAGS += -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64
-
-all: $(TARGET)
-
-rootdir.o: rootdir.c mach_debug_U.h
-
-$(TARGET): $(OBJS)
- $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(LIBS)
-
-clean:
- $(RM) $(TARGET) $(OBJS)
-
-# This is the gist of the MIG user stub handling from Hurd's build
-# system:
-
-# Where to find .defs files.
-vpath %.defs /usr/include/mach_debug
-
-MIG = mig
-MIGCOM = $(MIG) -cc cat - /dev/null
-MIGCOMFLAGS := -subrprefix __
-
-%.udefsi: %.defs
- $(CPP) -x c $(CPPFLAGS) $(MIGUFLAGS) $($*-MIGUFLAGS) \
- $< -o $*.udefsi
-
-%_U.h %User.c: %.udefsi
- $(MIGCOM) $(MIGCOMFLAGS) $(MIGCOMUFLAGS) $($*-MIGCOMUFLAGS) < $< \
- -user $*User.c -server /dev/null -header $*_U.h
diff --git a/ChangeLog b/procfs/ChangeLog
index 0cd74d02..0cd74d02 100644
--- a/ChangeLog
+++ b/procfs/ChangeLog
diff --git a/procfs/Makefile b/procfs/Makefile
new file mode 100644
index 00000000..6d7ca483
--- /dev/null
+++ b/procfs/Makefile
@@ -0,0 +1,34 @@
+# 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.
+
+dir := procfs
+makemode := server
+
+target = procfs
+
+SRCS = procfs.c netfs.c procfs_dir.c process.c proclist.c rootdir.c dircat.c main.c mach_debugUser.c
+LCLHDRS = dircat.h main.h process.h procfs.h procfs_dir.h proclist.h rootdir.h
+
+OBJS = $(SRCS:.c=.o)
+HURDLIBS = netfs fshelp iohelp ps ports ihash shouldbeinlibc
+OTHERLIBS = -lpthread
+
+# Where to find .defs files.
+vpath %.defs /usr/include/mach_debug
+
+include ../Makeconf
diff --git a/TODO b/procfs/TODO
index 952d67bc..952d67bc 100644
--- a/TODO
+++ b/procfs/TODO
diff --git a/dircat.c b/procfs/dircat.c
index 5a60899a..5a60899a 100644
--- a/dircat.c
+++ b/procfs/dircat.c
diff --git a/dircat.h b/procfs/dircat.h
index 4177b384..4177b384 100644
--- a/dircat.h
+++ b/procfs/dircat.h
diff --git a/main.c b/procfs/main.c
index 54e96823..54e96823 100644
--- a/main.c
+++ b/procfs/main.c
diff --git a/main.h b/procfs/main.h
index 4e28b7eb..4e28b7eb 100644
--- a/main.h
+++ b/procfs/main.h
diff --git a/netfs.c b/procfs/netfs.c
index 276c57cc..276c57cc 100644
--- a/netfs.c
+++ b/procfs/netfs.c
diff --git a/process.c b/procfs/process.c
index 269a18bb..269a18bb 100644
--- a/process.c
+++ b/procfs/process.c
diff --git a/process.h b/procfs/process.h
index b230a281..b230a281 100644
--- a/process.h
+++ b/procfs/process.h
diff --git a/procfs.c b/procfs/procfs.c
index cae4a519..cae4a519 100644
--- a/procfs.c
+++ b/procfs/procfs.c
diff --git a/procfs.h b/procfs/procfs.h
index d04bbad7..d04bbad7 100644
--- a/procfs.h
+++ b/procfs/procfs.h
diff --git a/procfs_dir.c b/procfs/procfs_dir.c
index c250aa48..c250aa48 100644
--- a/procfs_dir.c
+++ b/procfs/procfs_dir.c
diff --git a/procfs_dir.h b/procfs/procfs_dir.h
index 94c5b019..94c5b019 100644
--- a/procfs_dir.h
+++ b/procfs/procfs_dir.h
diff --git a/proclist.c b/procfs/proclist.c
index 58b942dc..58b942dc 100644
--- a/proclist.c
+++ b/procfs/proclist.c
diff --git a/proclist.h b/procfs/proclist.h
index bfe95b3d..bfe95b3d 100644
--- a/proclist.h
+++ b/procfs/proclist.h
diff --git a/rootdir.c b/procfs/rootdir.c
index 0b131192..0b131192 100644
--- a/rootdir.c
+++ b/procfs/rootdir.c
diff --git a/rootdir.h b/procfs/rootdir.h
index 6980da8f..6980da8f 100644
--- a/rootdir.h
+++ b/procfs/rootdir.h