[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[SCM] Debian GNU Hurd packaging branch, master, updated. debian/20120219
|
From: |
Samuel Thibault |
|
Subject: |
[SCM] Debian GNU Hurd packaging branch, master, updated. debian/20120219-1-14-g95aa400 |
|
Date: |
Wed, 22 Feb 2012 02:05:30 +0000 |
The following commit has been merged in the master branch:
commit 6e51fb5c6caac3ee7412af8e732ba367610d82c2
Author: Samuel Thibault <address@hidden>
Date: Tue Feb 21 23:37:19 2012 +0000
Clean up includes
To use the standard hurd Makeconf rules and permit external dde_* build
diff --git a/dde_e100/Makefile b/dde_e100/Makefile
index 1fa82e1..eaed375 100644
--- a/dde_e100/Makefile
+++ b/dde_e100/Makefile
@@ -8,7 +8,7 @@ TARGET = dde_e100
SRC_C = main.c e100.c
LIBS += $(libmachdev_path) -ldde_linux26.o -ldde_linux26_net
$(libddekit_path) -lfshelp -ltrivfs -lpciaccess -lz -lthreads -lshouldbeinlibc
-lports $(libslab_path) $(libbpf_path)
-CFLAGS += -g -I$(PKGDIR)/include -I../libmachdev
+CFLAGS += -g -I$(PKGDIR)/include -I$(BUILDDIR)/include
# DDE configuration
include $(L4DIR)/Makeconf
diff --git a/dde_e100/main.c b/dde_e100/main.c
index 63ab182..98f4452 100644
--- a/dde_e100/main.c
+++ b/dde_e100/main.c
@@ -6,7 +6,7 @@
#include <linux/init.h> // initcall()
#include <linux/delay.h> // msleep()
-#include <machdev.h>
+#include <hurd/machdev.h>
int using_std = 1;
diff --git a/dde_e1000/Makefile b/dde_e1000/Makefile
index df30112..fecd94d 100644
--- a/dde_e1000/Makefile
+++ b/dde_e1000/Makefile
@@ -8,7 +8,7 @@ TARGET = dde_e1000
SRC_C = main.c e1000_ethtool.c e1000_hw.c e1000_main.c e1000_param.c
LIBS += $(libmachdev_path) -ldde_linux26.o -ldde_linux26_net
$(libddekit_path) -lfshelp -ltrivfs -lpciaccess -lz -lthreads -lshouldbeinlibc
-lports $(libslab_path) $(libbpf_path)
-CFLAGS += -g -I$(PKGDIR)/include -I../libmachdev
+CFLAGS += -g -I$(PKGDIR)/include -I$(BUILDDIR)/include
# DDE configuration
include $(L4DIR)/Makeconf
diff --git a/dde_e1000/main.c b/dde_e1000/main.c
index 63ab182..98f4452 100644
--- a/dde_e1000/main.c
+++ b/dde_e1000/main.c
@@ -6,7 +6,7 @@
#include <linux/init.h> // initcall()
#include <linux/delay.h> // msleep()
-#include <machdev.h>
+#include <hurd/machdev.h>
int using_std = 1;
diff --git a/dde_ne2k_pci/Makefile b/dde_ne2k_pci/Makefile
index 0f25544..5bb27da 100644
--- a/dde_ne2k_pci/Makefile
+++ b/dde_ne2k_pci/Makefile
@@ -10,7 +10,7 @@ TARGET = dde_ne2k_pci
SRC_C = main.c ne2k-pci.c 8390.c
LIBS += $(libmachdev_path) -ldde_linux26.o -ldde_linux26_net
$(libddekit_path) -lfshelp -ltrivfs -lpciaccess -lz -lthreads -lshouldbeinlibc
-lports $(libslab_path) $(libbpf_path)
-CFLAGS += -g -I$(PKGDIR)/include -I../libmachdev
+CFLAGS += -g -I$(PKGDIR)/include -I$(BUILDDIR)/include
# DDE configuration
include $(L4DIR)/Makeconf
diff --git a/dde_ne2k_pci/main.c b/dde_ne2k_pci/main.c
index 63ab182..98f4452 100644
--- a/dde_ne2k_pci/main.c
+++ b/dde_ne2k_pci/main.c
@@ -6,7 +6,7 @@
#include <linux/init.h> // initcall()
#include <linux/delay.h> // msleep()
-#include <machdev.h>
+#include <hurd/machdev.h>
int using_std = 1;
diff --git a/dde_pcnet32/Makefile b/dde_pcnet32/Makefile
index bcdcb42..0268d80 100644
--- a/dde_pcnet32/Makefile
+++ b/dde_pcnet32/Makefile
@@ -8,7 +8,7 @@ TARGET = dde_pcnet32
SRC_C = main.c pcnet32.c
LIBS += $(libmachdev_path) -ldde_linux26.o -ldde_linux26_net
$(libddekit_path) -lfshelp -ltrivfs -lpciaccess -lz -lthreads -lshouldbeinlibc
-lports $(libslab_path) $(libbpf_path)
-CFLAGS += -g -I$(PKGDIR)/include -I../libmachdev
+CFLAGS += -g -I$(PKGDIR)/include -I$(BUILDDIR)/include
# DDE configuration
include $(L4DIR)/Makeconf
diff --git a/dde_pcnet32/main.c b/dde_pcnet32/main.c
index 63ab182..98f4452 100644
--- a/dde_pcnet32/main.c
+++ b/dde_pcnet32/main.c
@@ -6,7 +6,7 @@
#include <linux/init.h> // initcall()
#include <linux/delay.h> // msleep()
-#include <machdev.h>
+#include <hurd/machdev.h>
int using_std = 1;
diff --git a/dde_rtl8139/Makefile b/dde_rtl8139/Makefile
index a9acda4..0a9b1b7 100644
--- a/dde_rtl8139/Makefile
+++ b/dde_rtl8139/Makefile
@@ -10,7 +10,7 @@ TARGET = dde_rtl8139
SRC_C = main.c 8139cp.c
LIBS += $(libmachdev_path) -ldde_linux26.o -ldde_linux26_net
$(libddekit_path) -lfshelp -ltrivfs -lpciaccess -lz -lthreads -lshouldbeinlibc
-lports $(libslab_path) $(libbpf_path)
-CFLAGS += -g -I$(PKGDIR)/include -I../libmachdev
+CFLAGS += -g -I$(PKGDIR)/include -I$(BUILDDIR)/include
# DDE configuration
include $(L4DIR)/Makeconf
diff --git a/dde_rtl8139/main.c b/dde_rtl8139/main.c
index 63ab182..98f4452 100644
--- a/dde_rtl8139/main.c
+++ b/dde_rtl8139/main.c
@@ -6,7 +6,7 @@
#include <linux/init.h> // initcall()
#include <linux/delay.h> // msleep()
-#include <machdev.h>
+#include <hurd/machdev.h>
int using_std = 1;
diff --git a/libbpf/Makefile b/libbpf/Makefile
index 5ce8757..1000429 100644
--- a/libbpf/Makefile
+++ b/libbpf/Makefile
@@ -21,7 +21,7 @@ makemode := library
libname = libbpf
SRCS= bpf_impl.c queue.c
LCLHDRS = bpf_impl.h queue.h
-installhdrs =
+installhdrs = bpf_impl.h
MIGSTUBS =
OBJS = $(sort $(SRCS:.c=.o) $(MIGSTUBS))
diff --git a/libdde_linux26/Makeconf b/libdde_linux26/Makeconf
index 4ee54c6..00c5909 100644
--- a/libdde_linux26/Makeconf
+++ b/libdde_linux26/Makeconf
@@ -39,7 +39,7 @@ ifeq ($(ARCH), x86)
MY_DDE_INCDIR += $(OBJ_BASE)/include/linux-headers/asm/mach-default
endif
-PRIVATE_INCDIR += $(MY_DDE_INCDIR) $(MY_LINUX26_INCDIR)
$(PKGDIR)/../libddekit/include
+PRIVATE_INCDIR += $(MY_DDE_INCDIR) $(MY_LINUX26_INCDIR) $(PKGDIR)/../libddekit
DEFINES += -D__KERNEL__ -DDDE_LINUX $(KBUILD_DEFINES)
CPPFLAGS += $(KBUILD_CPPFLAGS)
diff --git a/libdde_linux26/mk/prog.mk b/libdde_linux26/mk/prog.mk
index d54c38e..c1d5d9a 100644
--- a/libdde_linux26/mk/prog.mk
+++ b/libdde_linux26/mk/prog.mk
@@ -56,7 +56,6 @@ TARGET_STANDARD := $(TARGET) $(TARGET_$(OSYSTEM))
TARGET_PROFILE := $(addsuffix .pr,$(filter $(BUILD_PROFILE),$(TARGET)))
TARGET += $(TARGET_$(OSYSTEM)) $(TARGET_PROFILE)
-CFLAGS += $(DDEKITINCDIR)
# define some variables different for lib.mk and prog.mk
ifeq ($(MODE),loader)
LDFLAGS += --dynamic-linker libld-l4.s.so
diff --git a/libddekit/Makefile b/libddekit/Makefile
index 3dbaeee..4f6e8aa 100644
--- a/libddekit/Makefile
+++ b/libddekit/Makefile
@@ -22,17 +22,20 @@ libname = libddekit
SRCS= condvar.c init.c interrupt.c lock.c malloc.c memory.c \
pci.c pgtab.c printf.c resources.c list.c panic.c \
thread.c timer.c initcall.c
-LCLHDRS = include/ddekit/condvar.h include/ddekit/lock.h \
- include/ddekit/semaphore.h include/ddekit/debug.h \
- include/ddekit/inline.h include/ddekit/panic.h \
- include/ddekit/thread.h include/ddekit/types.h \
- include/ddekit/pgtab.h include/ddekit/printf.h \
- include/ddekit/pci.h include/ddekit/assert.h \
- include/ddekit/interrupt.h include/ddekit/resources.h \
- include/ddekit/memory.h include/ddekit/timer.h \
- include/dde.h \
+installhdrs = ddekit/condvar.h ddekit/lock.h \
+ ddekit/semaphore.h ddekit/debug.h \
+ ddekit/inline.h ddekit/panic.h \
+ ddekit/thread.h ddekit/types.h \
+ ddekit/pgtab.h ddekit/printf.h \
+ ddekit/pci.h ddekit/assert.h \
+ ddekit/interrupt.h ddekit/resources.h \
+ ddekit/memory.h ddekit/timer.h \
+ ddekit/initcall.h
+
+installhdrsubdir = .
+LCLHDRS = $(installhdrs) \
+ dde.h \
config.h list.h util.h
-installhdrs =
MIGSTUBS = experimentalUser.o
OBJS = $(sort $(SRCS:.c=.o) $(MIGSTUBS))
@@ -43,8 +46,7 @@ MIGCOMSFLAGS = -prefix dde_
include ../Makeconf
-LDFLAGS += -lpciaccess
-CFLAGS += -I$(srcdir)/include
+LIBS += -lpciaccess
$(libname).so.$(hurd-version):
echo "INPUT ( $(libname).a )" > $@
diff --git a/libddekit/include/dde.h b/libddekit/dde.h
similarity index 100%
rename from libddekit/include/dde.h
rename to libddekit/dde.h
diff --git a/libddekit/include/ddekit/assert.h b/libddekit/ddekit/assert.h
similarity index 100%
rename from libddekit/include/ddekit/assert.h
rename to libddekit/ddekit/assert.h
diff --git a/libddekit/include/ddekit/condvar.h b/libddekit/ddekit/condvar.h
similarity index 100%
rename from libddekit/include/ddekit/condvar.h
rename to libddekit/ddekit/condvar.h
diff --git a/libddekit/include/ddekit/debug.h b/libddekit/ddekit/debug.h
similarity index 100%
rename from libddekit/include/ddekit/debug.h
rename to libddekit/ddekit/debug.h
diff --git a/libddekit/include/ddekit/initcall.h b/libddekit/ddekit/initcall.h
similarity index 100%
rename from libddekit/include/ddekit/initcall.h
rename to libddekit/ddekit/initcall.h
diff --git a/libddekit/include/ddekit/inline.h b/libddekit/ddekit/inline.h
similarity index 100%
rename from libddekit/include/ddekit/inline.h
rename to libddekit/ddekit/inline.h
diff --git a/libddekit/include/ddekit/interrupt.h b/libddekit/ddekit/interrupt.h
similarity index 100%
rename from libddekit/include/ddekit/interrupt.h
rename to libddekit/ddekit/interrupt.h
diff --git a/libddekit/include/ddekit/lock.h b/libddekit/ddekit/lock.h
similarity index 100%
rename from libddekit/include/ddekit/lock.h
rename to libddekit/ddekit/lock.h
diff --git a/libddekit/include/ddekit/memory.h b/libddekit/ddekit/memory.h
similarity index 100%
rename from libddekit/include/ddekit/memory.h
rename to libddekit/ddekit/memory.h
diff --git a/libddekit/include/ddekit/panic.h b/libddekit/ddekit/panic.h
similarity index 100%
rename from libddekit/include/ddekit/panic.h
rename to libddekit/ddekit/panic.h
diff --git a/libddekit/include/ddekit/pci.h b/libddekit/ddekit/pci.h
similarity index 100%
rename from libddekit/include/ddekit/pci.h
rename to libddekit/ddekit/pci.h
diff --git a/libddekit/include/ddekit/pgtab.h b/libddekit/ddekit/pgtab.h
similarity index 100%
rename from libddekit/include/ddekit/pgtab.h
rename to libddekit/ddekit/pgtab.h
diff --git a/libddekit/include/ddekit/printf.h b/libddekit/ddekit/printf.h
similarity index 100%
rename from libddekit/include/ddekit/printf.h
rename to libddekit/ddekit/printf.h
diff --git a/libddekit/include/ddekit/resources.h b/libddekit/ddekit/resources.h
similarity index 100%
rename from libddekit/include/ddekit/resources.h
rename to libddekit/ddekit/resources.h
diff --git a/libddekit/include/ddekit/semaphore.h b/libddekit/ddekit/semaphore.h
similarity index 100%
rename from libddekit/include/ddekit/semaphore.h
rename to libddekit/ddekit/semaphore.h
diff --git a/libddekit/include/ddekit/thread.h b/libddekit/ddekit/thread.h
similarity index 100%
rename from libddekit/include/ddekit/thread.h
rename to libddekit/ddekit/thread.h
diff --git a/libddekit/include/ddekit/timer.h b/libddekit/ddekit/timer.h
similarity index 100%
rename from libddekit/include/ddekit/timer.h
rename to libddekit/ddekit/timer.h
diff --git a/libddekit/include/ddekit/types.h b/libddekit/ddekit/types.h
similarity index 100%
rename from libddekit/include/ddekit/types.h
rename to libddekit/ddekit/types.h
diff --git a/libddekit/memory.c b/libddekit/memory.c
index b4723b9..34b283b 100644
--- a/libddekit/memory.c
+++ b/libddekit/memory.c
@@ -18,7 +18,7 @@
#include <sys/mman.h>
#include "mach_U.h"
-#include "libhurd-slab/slab.h"
+#include <hurd/slab.h>
#include "util.h"
#include "ddekit/memory.h"
diff --git a/libhurd-slab/Makefile b/libhurd-slab/Makefile
index 4682a93..f109f59 100644
--- a/libhurd-slab/Makefile
+++ b/libhurd-slab/Makefile
@@ -21,7 +21,7 @@ makemode := library
libname = libhurd-slab
SRCS= slab.c
LCLHDRS = slab.h
-installhdrs =
+installhdrs = slab.h
MIGSTUBS =
OBJS = $(sort $(SRCS:.c=.o) $(MIGSTUBS))
diff --git a/libmachdev/Makefile b/libmachdev/Makefile
index 15bc973..ad090ca 100644
--- a/libmachdev/Makefile
+++ b/libmachdev/Makefile
@@ -25,13 +25,11 @@ LCLHDRS = dev_hdr.h device_emul.h ds_routines.h vm_param.h \
util.h queue.h io_req.h if_ether.h machdev.h linux-errno.h \
errno-base.h
installhdrs = machdev.h
-HURDLIBS = ports threads trivfs
+HURDLIBS = ports threads trivfs ddekit bpf
OBJS = $(SRCS:.c=.o) $(MIGSTUBS)
include ../Makeconf
-CFLAGS += -I$(top_srcdir)/libddekit/include -I$(top_srcdir)/libbpf
-
ourdevice.defs: device.defs
$(CPP) $(CPPFLAGS) -x c $< | sed -e '/out[ ]*device[ ]*:[
]*device_t/s/device_t/mach_port_send_t/' > $@
diff --git a/libmachdev/if_hdr.h b/libmachdev/if_hdr.h
index 74d0fa8..3249720 100644
--- a/libmachdev/if_hdr.h
+++ b/libmachdev/if_hdr.h
@@ -62,7 +62,7 @@
#include <queue.h>
#include <cthreads.h>
-#include <bpf_impl.h>
+#include <hurd/bpf_impl.h>
#if 0
/*
--
Debian GNU Hurd packaging
- [SCM] Debian GNU Hurd packaging branch, master, updated. debian/20120219-1-14-g95aa400,
Samuel Thibault <=
- [SCM] Debian GNU Hurd packaging branch, master, updated. debian/20120219-1-14-g95aa400, Samuel Thibault, 2012/02/21
- [SCM] Debian GNU Hurd packaging branch, master, updated. debian/20120219-1-14-g95aa400, Samuel Thibault, 2012/02/21
- [SCM] Debian GNU Hurd packaging branch, master, updated. debian/20120219-1-14-g95aa400, Samuel Thibault, 2012/02/21