From d20c44ea65fc28a1634ce7db6746e3c0b1ab9409 Mon Sep 17 00:00:00 2001 From: Zheng Da Date: Mon, 1 Feb 2010 15:14:12 +0100 Subject: check in dde_pcnet32. --- dde_pcnet32/Makefile | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 dde_pcnet32/Makefile (limited to 'dde_pcnet32/Makefile') diff --git a/dde_pcnet32/Makefile b/dde_pcnet32/Makefile new file mode 100644 index 00000000..812bb6cf --- /dev/null +++ b/dde_pcnet32/Makefile @@ -0,0 +1,18 @@ +PKGDIR ?= ../libdde_linux26 +L4DIR ?= $(PKGDIR) + +SYSTEMS = x86-l4v2 + +include Makeconf.local + +TARGET = dde_pcnet32 + +SRC_C = main.c pcnet32.c + +LIBS += ../libmachdev/libmachdev.a -ldde_linux26.o -ldde_linux26_net ../libddekit/libddekit.a -lfshelp -ltrivfs -lpciaccess -lthreads -lshouldbeinlibc -lports +CFLAGS += -g + +# DDE configuration +include $(L4DIR)/Makeconf + +include $(L4DIR)/mk/prog.mk -- cgit v1.2.3 From 61cbf207a16ec76e4fefba4e5a3ad91c84dee447 Mon Sep 17 00:00:00 2001 From: Zheng Da Date: Fri, 28 May 2010 16:20:39 +0200 Subject: link to libhurd-slab while building dde drivers. --- dde_e100/Makefile | 2 +- dde_e1000/Makefile | 2 +- dde_ne2k_pci/Makefile | 2 +- dde_pcnet32/Makefile | 2 +- dde_rtl8139/Makefile | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) (limited to 'dde_pcnet32/Makefile') diff --git a/dde_e100/Makefile b/dde_e100/Makefile index 835e00c8..fb1ed61e 100644 --- a/dde_e100/Makefile +++ b/dde_e100/Makefile @@ -9,7 +9,7 @@ TARGET = dde_e100 SRC_C = main.c e100.c -LIBS += ../libmachdev/libmachdev.a -ldde_linux26.o -ldde_linux26_net ../libddekit/libddekit.a -lfshelp -ltrivfs -lpciaccess -lthreads -lshouldbeinlibc -lports +LIBS += ../libmachdev/libmachdev.a -ldde_linux26.o -ldde_linux26_net ../libddekit/libddekit.a -lfshelp -ltrivfs -lpciaccess -lthreads -lshouldbeinlibc -lports -lhurd-slab CFLAGS += -g # DDE configuration diff --git a/dde_e1000/Makefile b/dde_e1000/Makefile index 17252a47..bfe7dbaf 100644 --- a/dde_e1000/Makefile +++ b/dde_e1000/Makefile @@ -9,7 +9,7 @@ TARGET = dde_e1000 SRC_C = main.c e1000_ethtool.c e1000_hw.c e1000_main.c e1000_param.c -LIBS += ../libmachdev/libmachdev.a -ldde_linux26.o -ldde_linux26_net ../libddekit/libddekit.a -lfshelp -ltrivfs -lpciaccess -lthreads -lshouldbeinlibc -lports +LIBS += ../libmachdev/libmachdev.a -ldde_linux26.o -ldde_linux26_net ../libddekit/libddekit.a -lfshelp -ltrivfs -lpciaccess -lthreads -lshouldbeinlibc -lports -lhurd-slab CFLAGS += -g # DDE configuration diff --git a/dde_ne2k_pci/Makefile b/dde_ne2k_pci/Makefile index d4bc3050..6cc27279 100644 --- a/dde_ne2k_pci/Makefile +++ b/dde_ne2k_pci/Makefile @@ -9,7 +9,7 @@ TARGET = dde_ne2k_pci SRC_C = main.c ne2k-pci.c 8390.c -LIBS += ../libmachdev/libmachdev.a -ldde_linux26.o -ldde_linux26_net ../libddekit/libddekit.a -lfshelp -ltrivfs -lpciaccess -lthreads -lshouldbeinlibc -lports +LIBS += ../libmachdev/libmachdev.a -ldde_linux26.o -ldde_linux26_net ../libddekit/libddekit.a -lfshelp -ltrivfs -lpciaccess -lthreads -lshouldbeinlibc -lports -lhurd-slab CFLAGS += -g # DDE configuration diff --git a/dde_pcnet32/Makefile b/dde_pcnet32/Makefile index 812bb6cf..89e67efd 100644 --- a/dde_pcnet32/Makefile +++ b/dde_pcnet32/Makefile @@ -9,7 +9,7 @@ TARGET = dde_pcnet32 SRC_C = main.c pcnet32.c -LIBS += ../libmachdev/libmachdev.a -ldde_linux26.o -ldde_linux26_net ../libddekit/libddekit.a -lfshelp -ltrivfs -lpciaccess -lthreads -lshouldbeinlibc -lports +LIBS += ../libmachdev/libmachdev.a -ldde_linux26.o -ldde_linux26_net ../libddekit/libddekit.a -lfshelp -ltrivfs -lpciaccess -lthreads -lshouldbeinlibc -lports -lhurd-slab CFLAGS += -g # DDE configuration diff --git a/dde_rtl8139/Makefile b/dde_rtl8139/Makefile index acc4cfcb..dcc4a4f1 100644 --- a/dde_rtl8139/Makefile +++ b/dde_rtl8139/Makefile @@ -9,7 +9,7 @@ TARGET = dde_rtl8139 SRC_C = main.c 8139cp.c -LIBS += ../libmachdev/libmachdev.a -ldde_linux26.o -ldde_linux26_net ../libddekit/libddekit.a -lfshelp -ltrivfs -lpciaccess -lthreads -lshouldbeinlibc -lports +LIBS += ../libmachdev/libmachdev.a -ldde_linux26.o -ldde_linux26_net ../libddekit/libddekit.a -lfshelp -ltrivfs -lpciaccess -lthreads -lshouldbeinlibc -lports -lhurd-slab CFLAGS += -g # DDE configuration -- cgit v1.2.3 From 2fe1437bd35016309e9ac4cfe57fb3daca3ba0a0 Mon Sep 17 00:00:00 2001 From: Zheng Da Date: Mon, 31 May 2010 17:21:47 +0200 Subject: make glue code of networking more independant. This change is required for block device drivers. When block device drivers are linked to the glue code, the linker should be able to perform garbage collection and exclude the code of networking from the driver programs. --- dde_e100/Makefile | 2 +- dde_e100/main.c | 6 +++--- dde_e1000/Makefile | 2 +- dde_e1000/main.c | 6 +++--- dde_ne2k_pci/Makefile | 2 +- dde_ne2k_pci/main.c | 6 +++--- dde_pcnet32/Makefile | 2 +- dde_pcnet32/main.c | 6 +++--- dde_rtl8139/Makefile | 2 +- dde_rtl8139/main.c | 6 +++--- libmachdev/Makefile | 3 ++- libmachdev/device_emul.h | 2 +- libmachdev/ds_routines.c | 14 +++++++++----- libmachdev/machdev.h | 32 ++++++++++++++++++++++++++++++++ libmachdev/net.c | 25 +++++++++++++++---------- 15 files changed, 79 insertions(+), 37 deletions(-) create mode 100644 libmachdev/machdev.h (limited to 'dde_pcnet32/Makefile') diff --git a/dde_e100/Makefile b/dde_e100/Makefile index fb1ed61e..27504068 100644 --- a/dde_e100/Makefile +++ b/dde_e100/Makefile @@ -10,7 +10,7 @@ TARGET = dde_e100 SRC_C = main.c e100.c LIBS += ../libmachdev/libmachdev.a -ldde_linux26.o -ldde_linux26_net ../libddekit/libddekit.a -lfshelp -ltrivfs -lpciaccess -lthreads -lshouldbeinlibc -lports -lhurd-slab -CFLAGS += -g +CFLAGS += -g -I/include # DDE configuration include $(L4DIR)/Makeconf diff --git a/dde_e100/main.c b/dde_e100/main.c index 8f04bfeb..98f4452a 100644 --- a/dde_e100/main.c +++ b/dde_e100/main.c @@ -6,13 +6,12 @@ #include // initcall() #include // msleep() -int using_std = 1; +#include -void netif_rx_handle (char *data, int len, struct net_device *dev); +int using_std = 1; int main(int argc, char **argv) { - extern void ds_server(void); l4dde26_init(); l4dde26_process_init(); l4dde26_softirq_init(); @@ -22,6 +21,7 @@ int main(int argc, char **argv) l4dde26_do_initcalls(); + register_net(); mach_device_init(); trivfs_init(); diff --git a/dde_e1000/Makefile b/dde_e1000/Makefile index bfe7dbaf..ffdc17ab 100644 --- a/dde_e1000/Makefile +++ b/dde_e1000/Makefile @@ -10,7 +10,7 @@ TARGET = dde_e1000 SRC_C = main.c e1000_ethtool.c e1000_hw.c e1000_main.c e1000_param.c LIBS += ../libmachdev/libmachdev.a -ldde_linux26.o -ldde_linux26_net ../libddekit/libddekit.a -lfshelp -ltrivfs -lpciaccess -lthreads -lshouldbeinlibc -lports -lhurd-slab -CFLAGS += -g +CFLAGS += -g -I/include # DDE configuration include $(L4DIR)/Makeconf diff --git a/dde_e1000/main.c b/dde_e1000/main.c index 8f04bfeb..98f4452a 100644 --- a/dde_e1000/main.c +++ b/dde_e1000/main.c @@ -6,13 +6,12 @@ #include // initcall() #include // msleep() -int using_std = 1; +#include -void netif_rx_handle (char *data, int len, struct net_device *dev); +int using_std = 1; int main(int argc, char **argv) { - extern void ds_server(void); l4dde26_init(); l4dde26_process_init(); l4dde26_softirq_init(); @@ -22,6 +21,7 @@ int main(int argc, char **argv) l4dde26_do_initcalls(); + register_net(); mach_device_init(); trivfs_init(); diff --git a/dde_ne2k_pci/Makefile b/dde_ne2k_pci/Makefile index 6cc27279..879904e1 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/libmachdev.a -ldde_linux26.o -ldde_linux26_net ../libddekit/libddekit.a -lfshelp -ltrivfs -lpciaccess -lthreads -lshouldbeinlibc -lports -lhurd-slab -CFLAGS += -g +CFLAGS += -g -I/include # DDE configuration include $(L4DIR)/Makeconf diff --git a/dde_ne2k_pci/main.c b/dde_ne2k_pci/main.c index 8f04bfeb..98f4452a 100644 --- a/dde_ne2k_pci/main.c +++ b/dde_ne2k_pci/main.c @@ -6,13 +6,12 @@ #include // initcall() #include // msleep() -int using_std = 1; +#include -void netif_rx_handle (char *data, int len, struct net_device *dev); +int using_std = 1; int main(int argc, char **argv) { - extern void ds_server(void); l4dde26_init(); l4dde26_process_init(); l4dde26_softirq_init(); @@ -22,6 +21,7 @@ int main(int argc, char **argv) l4dde26_do_initcalls(); + register_net(); mach_device_init(); trivfs_init(); diff --git a/dde_pcnet32/Makefile b/dde_pcnet32/Makefile index 89e67efd..ebbb271e 100644 --- a/dde_pcnet32/Makefile +++ b/dde_pcnet32/Makefile @@ -10,7 +10,7 @@ TARGET = dde_pcnet32 SRC_C = main.c pcnet32.c LIBS += ../libmachdev/libmachdev.a -ldde_linux26.o -ldde_linux26_net ../libddekit/libddekit.a -lfshelp -ltrivfs -lpciaccess -lthreads -lshouldbeinlibc -lports -lhurd-slab -CFLAGS += -g +CFLAGS += -g -I/include # DDE configuration include $(L4DIR)/Makeconf diff --git a/dde_pcnet32/main.c b/dde_pcnet32/main.c index 8f04bfeb..98f4452a 100644 --- a/dde_pcnet32/main.c +++ b/dde_pcnet32/main.c @@ -6,13 +6,12 @@ #include // initcall() #include // msleep() -int using_std = 1; +#include -void netif_rx_handle (char *data, int len, struct net_device *dev); +int using_std = 1; int main(int argc, char **argv) { - extern void ds_server(void); l4dde26_init(); l4dde26_process_init(); l4dde26_softirq_init(); @@ -22,6 +21,7 @@ int main(int argc, char **argv) l4dde26_do_initcalls(); + register_net(); mach_device_init(); trivfs_init(); diff --git a/dde_rtl8139/Makefile b/dde_rtl8139/Makefile index dcc4a4f1..1af8e179 100644 --- a/dde_rtl8139/Makefile +++ b/dde_rtl8139/Makefile @@ -10,7 +10,7 @@ TARGET = dde_rtl8139 SRC_C = main.c 8139cp.c LIBS += ../libmachdev/libmachdev.a -ldde_linux26.o -ldde_linux26_net ../libddekit/libddekit.a -lfshelp -ltrivfs -lpciaccess -lthreads -lshouldbeinlibc -lports -lhurd-slab -CFLAGS += -g +CFLAGS += -g -I/include # DDE configuration include $(L4DIR)/Makeconf diff --git a/dde_rtl8139/main.c b/dde_rtl8139/main.c index 8f04bfeb..98f4452a 100644 --- a/dde_rtl8139/main.c +++ b/dde_rtl8139/main.c @@ -6,13 +6,12 @@ #include // initcall() #include // msleep() -int using_std = 1; +#include -void netif_rx_handle (char *data, int len, struct net_device *dev); +int using_std = 1; int main(int argc, char **argv) { - extern void ds_server(void); l4dde26_init(); l4dde26_process_init(); l4dde26_softirq_init(); @@ -22,6 +21,7 @@ int main(int argc, char **argv) l4dde26_do_initcalls(); + register_net(); mach_device_init(); trivfs_init(); diff --git a/libmachdev/Makefile b/libmachdev/Makefile index daf13a82..f64e281a 100644 --- a/libmachdev/Makefile +++ b/libmachdev/Makefile @@ -22,7 +22,8 @@ libname = libmachdev SRCS = deviceUser.c machUser.c net.c ds_routines.c queue.c trivfs_server.c \ device_replyUser.c deviceServer.c notifyServer.c LCLHDRS = dev_hdr.h device_emul.h ds_routines.h vm_param.h \ - util.h queue.h io_req.h if_ether.h + util.h queue.h io_req.h if_ether.h machdev.h +installhdrs = machdev.h device_emul.h HURDLIBS = ports threads trivfs OBJS = $(SRCS:.c=.o) $(MIGSTUBS) diff --git a/libmachdev/device_emul.h b/libmachdev/device_emul.h index edcf6d07..a5bc4f77 100644 --- a/libmachdev/device_emul.h +++ b/libmachdev/device_emul.h @@ -31,7 +31,7 @@ /* Each emulation layer provides these operations. */ struct device_emulation_ops { - void (*init) (); + void (*init) (void); void (*reference) (void *); void (*dealloc) (void *); mach_port_t (*dev_to_port) (void *); diff --git a/libmachdev/ds_routines.c b/libmachdev/ds_routines.c index 1961a2f3..f6a8e76c 100644 --- a/libmachdev/ds_routines.c +++ b/libmachdev/ds_routines.c @@ -73,13 +73,12 @@ static struct port_class *dev_class; extern struct device_emulation_ops linux_net_emulation_ops; -#define NUM_EMULATION (sizeof (emulation_list) / sizeof (emulation_list[0])) +#define NUM_EMULATION num_emul +#define MAX_NUM_EMULATION 32 /* List of emulations. */ -static struct device_emulation_ops *emulation_list[] = -{ - &linux_net_emulation_ops, -}; +static struct device_emulation_ops *emulation_list[MAX_NUM_EMULATION]; +static int num_emul; boolean_t is_master_device (mach_port_t port); @@ -447,6 +446,11 @@ demuxer (mach_msg_header_t *inp, mach_msg_header_t *outp) return ret; } +void reg_dev_emul (struct device_emulation_ops *ops) +{ + emulation_list[num_emul++] = ops; +} + void ds_server() { /* Launch. */ diff --git a/libmachdev/machdev.h b/libmachdev/machdev.h new file mode 100644 index 00000000..27c488a5 --- /dev/null +++ b/libmachdev/machdev.h @@ -0,0 +1,32 @@ +/* + Copyright (C) 2010 Free Software Foundation, Inc. + Written by Zheng Da. + + This file is part of the GNU Hurd. + + The GNU Hurd 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. + + The GNU Hurd 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 the GNU Hurd; see the file COPYING. If not, write to + the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */ + +/* This file declares interfaces used by driver programs. */ + +#ifndef __MACHDEV_H__ +#define __MACHDEV_H__ + +void ds_server(void); +void mach_device_init(void); +void register_net(void); +void trivfs_server(void); +int trivfs_init(void); + +#endif diff --git a/libmachdev/net.c b/libmachdev/net.c index ca6bca63..e785a5c8 100644 --- a/libmachdev/net.c +++ b/libmachdev/net.c @@ -102,7 +102,6 @@ struct skb_reply struct sk_buff; void skb_done_queue(struct sk_buff *skb); struct sk_buff *skb_done_dequeue(); -void linux_net_emulation_init (); void *skb_reply(struct sk_buff *skb); int netdev_flags(struct net_device *dev); char *netdev_addr(struct net_device *dev); @@ -116,7 +115,7 @@ int dev_open(struct net_device *dev); void *l4dde26_register_rx_callback(void *cb); void skb_done_head_init(); -struct net_data *nd_head; +static struct net_data *nd_head; /* Forward declarations. */ @@ -124,7 +123,7 @@ extern struct device_emulation_ops linux_net_emulation_ops; static int print_packet_size = 1; -mach_msg_type_t header_type = +static mach_msg_type_t header_type = { MACH_MSG_TYPE_BYTE, 8, @@ -135,7 +134,7 @@ mach_msg_type_t header_type = 0 }; -mach_msg_type_t packet_type = +static mach_msg_type_t packet_type = { MACH_MSG_TYPE_BYTE, /* name */ 8, /* size */ @@ -145,7 +144,7 @@ mach_msg_type_t packet_type = FALSE /* deallocate */ }; -struct net_data *search_nd (struct net_device *dev) +static struct net_data *search_nd (struct net_device *dev) { struct net_data *nd = nd_head; @@ -163,7 +162,7 @@ struct net_data *search_nd (struct net_device *dev) /* actions before freeing the sk_buff SKB. * If it returns 1, the packet will be deallocated later. */ -int +static int pre_kfree_skb (struct sk_buff *skb, void *data) { struct skb_reply *reply = data; @@ -190,7 +189,7 @@ pre_kfree_skb (struct sk_buff *skb, void *data) * Deliver the message to all right pfinet servers that * connects to the virtual network interface. */ -int +static int deliver_msg(mach_port_t dest, struct net_rcv_msg *msg) { mach_msg_return_t err; @@ -217,7 +216,7 @@ deliver_msg(mach_port_t dest, struct net_rcv_msg *msg) } /* Accept packet SKB received on an interface. */ -void +static void netif_rx_handle (char *data, int len, struct net_device *dev) { int pack_size; @@ -438,7 +437,7 @@ device_write (void *d, mach_port_t reply_port, /* * Other network operations */ -io_return_t +static io_return_t net_getstat(dev, flavor, status, count) struct net_device *dev; dev_flavor_t flavor; @@ -641,7 +640,7 @@ device_set_filter (void *d, mach_port_t port, int priority, } /* Do any initialization required for network devices. */ -void linux_net_emulation_init () +static void linux_net_emulation_init () { skb_done_head_init(); l4dde26_register_rx_callback(netif_rx_handle); @@ -667,3 +666,9 @@ struct device_emulation_ops linux_net_emulation_ops = NULL, NULL }; + +void register_net() +{ + extern void reg_dev_emul (struct device_emulation_ops *ops); + reg_dev_emul (&linux_net_emulation_ops); +} -- cgit v1.2.3 From e0c7d9e618426c0cf8764a6ff126af6ea638e0b1 Mon Sep 17 00:00:00 2001 From: Zheng Da Date: Tue, 15 Jun 2010 17:50:34 +0200 Subject: handle the case hurd is built in a separate dir. if hurd is built in its source tree, nothing needs to be changed. but if hurd is built in a separate directory, BUILDDIR has to specify the path where hurd is built. --- dde_e100/Makeconf.local | 20 ++++++++++++++++++++ dde_e100/Makefile | 6 ++---- dde_e100/main.c | 2 +- dde_e1000/Makeconf.local | 20 ++++++++++++++++++++ dde_e1000/Makefile | 6 ++---- dde_e1000/main.c | 2 +- dde_ne2k_pci/Makeconf.local | 20 ++++++++++++++++++++ dde_ne2k_pci/Makefile | 4 ++-- dde_ne2k_pci/main.c | 2 +- dde_pcnet32/Makeconf.local | 20 ++++++++++++++++++++ dde_pcnet32/Makefile | 6 ++---- dde_pcnet32/main.c | 2 +- dde_rtl8139/Makeconf.local | 20 ++++++++++++++++++++ dde_rtl8139/Makefile | 4 ++-- dde_rtl8139/main.c | 2 +- 15 files changed, 115 insertions(+), 21 deletions(-) (limited to 'dde_pcnet32/Makefile') diff --git a/dde_e100/Makeconf.local b/dde_e100/Makeconf.local index 3d03134b..c52bc65c 100644 --- a/dde_e100/Makeconf.local +++ b/dde_e100/Makeconf.local @@ -2,6 +2,26 @@ SYSTEMS = x86-l4v2 ARCH = x86 SYSTEM = x86-l4v2 +BUILDDIR ?= + +libmachdev_path := ../libmachdev/libmachdev.a +has_libmachdev := $(wildcard $(libmachdev_path)) +ifeq ($(strip $(has_libmachdev)),) + libmachdev_path := $(BUILDDIR)/libmachdev/libmachdev.a +endif + +libddekit_path := ../libddekit/libddekit.a +has_libddekit := $(wildcard $(libddekit_path)) +ifeq ($(strip $(has_libddekit)),) + libddekit_path := $(BUILDDIR)/libddekit/libddekit.a +endif + +libslab_path := ../libhurd-slab/libhurd-slab.a +has_libslab := $(wildcard $(libslab_path)) +ifeq ($(strip $(has_libslab)),) + libslab_path := $(BUILDDIR)/libhurd-slab/libhurd-slab.a +endif + DDEKITLIBDIR = $(PKGDIR)/../libddekit/ DDEKITINCDIR = $(PKGDIR)/../libddekit/include DDE26LIBDIR = $(PKGDIR)/lib/src diff --git a/dde_e100/Makefile b/dde_e100/Makefile index 27504068..eee7043a 100644 --- a/dde_e100/Makefile +++ b/dde_e100/Makefile @@ -1,16 +1,14 @@ PKGDIR ?= ../libdde_linux26 L4DIR ?= $(PKGDIR) -SYSTEMS = x86-l4v2 - include Makeconf.local TARGET = dde_e100 SRC_C = main.c e100.c -LIBS += ../libmachdev/libmachdev.a -ldde_linux26.o -ldde_linux26_net ../libddekit/libddekit.a -lfshelp -ltrivfs -lpciaccess -lthreads -lshouldbeinlibc -lports -lhurd-slab -CFLAGS += -g -I/include +LIBS += $(libmachdev_path) -ldde_linux26.o -ldde_linux26_net $(libddekit_path) -lfshelp -ltrivfs -lpciaccess -lthreads -lshouldbeinlibc -lports $(libslab_path) +CFLAGS += -g -I$(PKGDIR)/include -I../libmachdev # DDE configuration include $(L4DIR)/Makeconf diff --git a/dde_e100/main.c b/dde_e100/main.c index 98f4452a..63ab182f 100644 --- a/dde_e100/main.c +++ b/dde_e100/main.c @@ -6,7 +6,7 @@ #include // initcall() #include // msleep() -#include +#include int using_std = 1; diff --git a/dde_e1000/Makeconf.local b/dde_e1000/Makeconf.local index 3d03134b..5b2e9082 100644 --- a/dde_e1000/Makeconf.local +++ b/dde_e1000/Makeconf.local @@ -2,6 +2,26 @@ SYSTEMS = x86-l4v2 ARCH = x86 SYSTEM = x86-l4v2 +BUILDDIR ?= + +libmachdev_path := ../libmachdev/libmachdev.a +has_libmachdev := $(wildcard $(libmachdev_path)) +ifeq ($(strip $(has_libmachdev)),) + libmachdev_path := $(BUILDDIR)/libmachdev/libmachdev.a +endif + +libddekit_path := ../libddekit/libddekit.a +has_libddekit := $(wildcard $(libddekit_path)) +ifeq ($(strip $(has_libddekit)),) + libddekit_path := $(BUILDDIR)/libddekit/libddekit.a +endif + +libslab_path := ../libhurd-slab/libhurd-slab.a +has_libslab := $(wildcard $(libslab_path)) +ifeq ($(strip $(has_libslab)),) + libslab_path := $(BUILDDIR)/libhurd-slab/libhurd-slab.a +endif + DDEKITLIBDIR = $(PKGDIR)/../libddekit/ DDEKITINCDIR = $(PKGDIR)/../libddekit/include DDE26LIBDIR = $(PKGDIR)/lib/src diff --git a/dde_e1000/Makefile b/dde_e1000/Makefile index ffdc17ab..ea73128d 100644 --- a/dde_e1000/Makefile +++ b/dde_e1000/Makefile @@ -1,16 +1,14 @@ PKGDIR ?= ../libdde_linux26 L4DIR ?= $(PKGDIR) -SYSTEMS = x86-l4v2 - include Makeconf.local TARGET = dde_e1000 SRC_C = main.c e1000_ethtool.c e1000_hw.c e1000_main.c e1000_param.c -LIBS += ../libmachdev/libmachdev.a -ldde_linux26.o -ldde_linux26_net ../libddekit/libddekit.a -lfshelp -ltrivfs -lpciaccess -lthreads -lshouldbeinlibc -lports -lhurd-slab -CFLAGS += -g -I/include +LIBS += $(libmachdev_path) -ldde_linux26.o -ldde_linux26_net $(libddekit_path) -lfshelp -ltrivfs -lpciaccess -lthreads -lshouldbeinlibc -lports $(libslab_path) +CFLAGS += -g -I$(PKGDIR)/include -I../libmachdev # DDE configuration include $(L4DIR)/Makeconf diff --git a/dde_e1000/main.c b/dde_e1000/main.c index 98f4452a..63ab182f 100644 --- a/dde_e1000/main.c +++ b/dde_e1000/main.c @@ -6,7 +6,7 @@ #include // initcall() #include // msleep() -#include +#include int using_std = 1; diff --git a/dde_ne2k_pci/Makeconf.local b/dde_ne2k_pci/Makeconf.local index 3d03134b..5b2e9082 100644 --- a/dde_ne2k_pci/Makeconf.local +++ b/dde_ne2k_pci/Makeconf.local @@ -2,6 +2,26 @@ SYSTEMS = x86-l4v2 ARCH = x86 SYSTEM = x86-l4v2 +BUILDDIR ?= + +libmachdev_path := ../libmachdev/libmachdev.a +has_libmachdev := $(wildcard $(libmachdev_path)) +ifeq ($(strip $(has_libmachdev)),) + libmachdev_path := $(BUILDDIR)/libmachdev/libmachdev.a +endif + +libddekit_path := ../libddekit/libddekit.a +has_libddekit := $(wildcard $(libddekit_path)) +ifeq ($(strip $(has_libddekit)),) + libddekit_path := $(BUILDDIR)/libddekit/libddekit.a +endif + +libslab_path := ../libhurd-slab/libhurd-slab.a +has_libslab := $(wildcard $(libslab_path)) +ifeq ($(strip $(has_libslab)),) + libslab_path := $(BUILDDIR)/libhurd-slab/libhurd-slab.a +endif + DDEKITLIBDIR = $(PKGDIR)/../libddekit/ DDEKITINCDIR = $(PKGDIR)/../libddekit/include DDE26LIBDIR = $(PKGDIR)/lib/src diff --git a/dde_ne2k_pci/Makefile b/dde_ne2k_pci/Makefile index 879904e1..32a64d27 100644 --- a/dde_ne2k_pci/Makefile +++ b/dde_ne2k_pci/Makefile @@ -9,8 +9,8 @@ TARGET = dde_ne2k_pci SRC_C = main.c ne2k-pci.c 8390.c -LIBS += ../libmachdev/libmachdev.a -ldde_linux26.o -ldde_linux26_net ../libddekit/libddekit.a -lfshelp -ltrivfs -lpciaccess -lthreads -lshouldbeinlibc -lports -lhurd-slab -CFLAGS += -g -I/include +LIBS += $(libmachdev_path) -ldde_linux26.o -ldde_linux26_net $(libddekit_path) -lfshelp -ltrivfs -lpciaccess -lthreads -lshouldbeinlibc -lports $(libslab_path) +CFLAGS += -g -I$(PKGDIR)/include -I../libmachdev # DDE configuration include $(L4DIR)/Makeconf diff --git a/dde_ne2k_pci/main.c b/dde_ne2k_pci/main.c index 98f4452a..63ab182f 100644 --- a/dde_ne2k_pci/main.c +++ b/dde_ne2k_pci/main.c @@ -6,7 +6,7 @@ #include // initcall() #include // msleep() -#include +#include int using_std = 1; diff --git a/dde_pcnet32/Makeconf.local b/dde_pcnet32/Makeconf.local index 3d03134b..5b2e9082 100644 --- a/dde_pcnet32/Makeconf.local +++ b/dde_pcnet32/Makeconf.local @@ -2,6 +2,26 @@ SYSTEMS = x86-l4v2 ARCH = x86 SYSTEM = x86-l4v2 +BUILDDIR ?= + +libmachdev_path := ../libmachdev/libmachdev.a +has_libmachdev := $(wildcard $(libmachdev_path)) +ifeq ($(strip $(has_libmachdev)),) + libmachdev_path := $(BUILDDIR)/libmachdev/libmachdev.a +endif + +libddekit_path := ../libddekit/libddekit.a +has_libddekit := $(wildcard $(libddekit_path)) +ifeq ($(strip $(has_libddekit)),) + libddekit_path := $(BUILDDIR)/libddekit/libddekit.a +endif + +libslab_path := ../libhurd-slab/libhurd-slab.a +has_libslab := $(wildcard $(libslab_path)) +ifeq ($(strip $(has_libslab)),) + libslab_path := $(BUILDDIR)/libhurd-slab/libhurd-slab.a +endif + DDEKITLIBDIR = $(PKGDIR)/../libddekit/ DDEKITINCDIR = $(PKGDIR)/../libddekit/include DDE26LIBDIR = $(PKGDIR)/lib/src diff --git a/dde_pcnet32/Makefile b/dde_pcnet32/Makefile index ebbb271e..9543477a 100644 --- a/dde_pcnet32/Makefile +++ b/dde_pcnet32/Makefile @@ -1,16 +1,14 @@ PKGDIR ?= ../libdde_linux26 L4DIR ?= $(PKGDIR) -SYSTEMS = x86-l4v2 - include Makeconf.local TARGET = dde_pcnet32 SRC_C = main.c pcnet32.c -LIBS += ../libmachdev/libmachdev.a -ldde_linux26.o -ldde_linux26_net ../libddekit/libddekit.a -lfshelp -ltrivfs -lpciaccess -lthreads -lshouldbeinlibc -lports -lhurd-slab -CFLAGS += -g -I/include +LIBS += $(libmachdev_path) -ldde_linux26.o -ldde_linux26_net $(libddekit_path) -lfshelp -ltrivfs -lpciaccess -lthreads -lshouldbeinlibc -lports $(libslab_path) +CFLAGS += -g -I$(PKGDIR)/include -I../libmachdev # DDE configuration include $(L4DIR)/Makeconf diff --git a/dde_pcnet32/main.c b/dde_pcnet32/main.c index 98f4452a..63ab182f 100644 --- a/dde_pcnet32/main.c +++ b/dde_pcnet32/main.c @@ -6,7 +6,7 @@ #include // initcall() #include // msleep() -#include +#include int using_std = 1; diff --git a/dde_rtl8139/Makeconf.local b/dde_rtl8139/Makeconf.local index 3d03134b..5b2e9082 100644 --- a/dde_rtl8139/Makeconf.local +++ b/dde_rtl8139/Makeconf.local @@ -2,6 +2,26 @@ SYSTEMS = x86-l4v2 ARCH = x86 SYSTEM = x86-l4v2 +BUILDDIR ?= + +libmachdev_path := ../libmachdev/libmachdev.a +has_libmachdev := $(wildcard $(libmachdev_path)) +ifeq ($(strip $(has_libmachdev)),) + libmachdev_path := $(BUILDDIR)/libmachdev/libmachdev.a +endif + +libddekit_path := ../libddekit/libddekit.a +has_libddekit := $(wildcard $(libddekit_path)) +ifeq ($(strip $(has_libddekit)),) + libddekit_path := $(BUILDDIR)/libddekit/libddekit.a +endif + +libslab_path := ../libhurd-slab/libhurd-slab.a +has_libslab := $(wildcard $(libslab_path)) +ifeq ($(strip $(has_libslab)),) + libslab_path := $(BUILDDIR)/libhurd-slab/libhurd-slab.a +endif + DDEKITLIBDIR = $(PKGDIR)/../libddekit/ DDEKITINCDIR = $(PKGDIR)/../libddekit/include DDE26LIBDIR = $(PKGDIR)/lib/src diff --git a/dde_rtl8139/Makefile b/dde_rtl8139/Makefile index 1af8e179..9c490a8f 100644 --- a/dde_rtl8139/Makefile +++ b/dde_rtl8139/Makefile @@ -9,8 +9,8 @@ TARGET = dde_rtl8139 SRC_C = main.c 8139cp.c -LIBS += ../libmachdev/libmachdev.a -ldde_linux26.o -ldde_linux26_net ../libddekit/libddekit.a -lfshelp -ltrivfs -lpciaccess -lthreads -lshouldbeinlibc -lports -lhurd-slab -CFLAGS += -g -I/include +LIBS += $(libmachdev_path) -ldde_linux26.o -ldde_linux26_net $(libddekit_path) -lfshelp -ltrivfs -lpciaccess -lthreads -lshouldbeinlibc -lports $(libslab_path) +CFLAGS += -g -I$(PKGDIR)/include -I../libmachdev # DDE configuration include $(L4DIR)/Makeconf diff --git a/dde_rtl8139/main.c b/dde_rtl8139/main.c index 98f4452a..63ab182f 100644 --- a/dde_rtl8139/main.c +++ b/dde_rtl8139/main.c @@ -6,7 +6,7 @@ #include // initcall() #include // msleep() -#include +#include int using_std = 1; -- cgit v1.2.3 From 08e7e43c2b332098920bd13b6dd25607b71c15a6 Mon Sep 17 00:00:00 2001 From: Zheng Da Date: Sun, 1 Aug 2010 16:05:21 +0200 Subject: link DDE drivers with BPF library. --- dde_e100/Makefile | 2 +- dde_e1000/Makefile | 2 +- dde_ne2k_pci/Makefile | 2 +- dde_pcnet32/Makefile | 2 +- dde_rtl8139/Makefile | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) (limited to 'dde_pcnet32/Makefile') diff --git a/dde_e100/Makefile b/dde_e100/Makefile index eee7043a..ed16f4cb 100644 --- a/dde_e100/Makefile +++ b/dde_e100/Makefile @@ -7,7 +7,7 @@ TARGET = dde_e100 SRC_C = main.c e100.c -LIBS += $(libmachdev_path) -ldde_linux26.o -ldde_linux26_net $(libddekit_path) -lfshelp -ltrivfs -lpciaccess -lthreads -lshouldbeinlibc -lports $(libslab_path) +LIBS += $(libmachdev_path) -ldde_linux26.o -ldde_linux26_net $(libddekit_path) -lfshelp -ltrivfs -lpciaccess -lthreads -lshouldbeinlibc -lports $(libslab_path) -lbpf CFLAGS += -g -I$(PKGDIR)/include -I../libmachdev # DDE configuration diff --git a/dde_e1000/Makefile b/dde_e1000/Makefile index ea73128d..d9025d9d 100644 --- a/dde_e1000/Makefile +++ b/dde_e1000/Makefile @@ -7,7 +7,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 -lthreads -lshouldbeinlibc -lports $(libslab_path) +LIBS += $(libmachdev_path) -ldde_linux26.o -ldde_linux26_net $(libddekit_path) -lfshelp -ltrivfs -lpciaccess -lthreads -lshouldbeinlibc -lports $(libslab_path) -lbpf CFLAGS += -g -I$(PKGDIR)/include -I../libmachdev # DDE configuration diff --git a/dde_ne2k_pci/Makefile b/dde_ne2k_pci/Makefile index 32a64d27..33b5cdfd 100644 --- a/dde_ne2k_pci/Makefile +++ b/dde_ne2k_pci/Makefile @@ -9,7 +9,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 -lthreads -lshouldbeinlibc -lports $(libslab_path) +LIBS += $(libmachdev_path) -ldde_linux26.o -ldde_linux26_net $(libddekit_path) -lfshelp -ltrivfs -lpciaccess -lthreads -lshouldbeinlibc -lports $(libslab_path) -lbpf CFLAGS += -g -I$(PKGDIR)/include -I../libmachdev # DDE configuration diff --git a/dde_pcnet32/Makefile b/dde_pcnet32/Makefile index 9543477a..e2aa5338 100644 --- a/dde_pcnet32/Makefile +++ b/dde_pcnet32/Makefile @@ -7,7 +7,7 @@ TARGET = dde_pcnet32 SRC_C = main.c pcnet32.c -LIBS += $(libmachdev_path) -ldde_linux26.o -ldde_linux26_net $(libddekit_path) -lfshelp -ltrivfs -lpciaccess -lthreads -lshouldbeinlibc -lports $(libslab_path) +LIBS += $(libmachdev_path) -ldde_linux26.o -ldde_linux26_net $(libddekit_path) -lfshelp -ltrivfs -lpciaccess -lthreads -lshouldbeinlibc -lports $(libslab_path) -lbpf CFLAGS += -g -I$(PKGDIR)/include -I../libmachdev # DDE configuration diff --git a/dde_rtl8139/Makefile b/dde_rtl8139/Makefile index 9c490a8f..4f76cd2b 100644 --- a/dde_rtl8139/Makefile +++ b/dde_rtl8139/Makefile @@ -9,7 +9,7 @@ TARGET = dde_rtl8139 SRC_C = main.c 8139cp.c -LIBS += $(libmachdev_path) -ldde_linux26.o -ldde_linux26_net $(libddekit_path) -lfshelp -ltrivfs -lpciaccess -lthreads -lshouldbeinlibc -lports $(libslab_path) +LIBS += $(libmachdev_path) -ldde_linux26.o -ldde_linux26_net $(libddekit_path) -lfshelp -ltrivfs -lpciaccess -lthreads -lshouldbeinlibc -lports $(libslab_path) -lbpf CFLAGS += -g -I$(PKGDIR)/include -I../libmachdev # DDE configuration -- cgit v1.2.3 From 460c6d143b81dd38941ee28c59486fb96e87995b Mon Sep 17 00:00:00 2001 From: Samuel Thibault Date: Sat, 18 Feb 2012 22:19:45 +0000 Subject: include bpf in link --- dde_e100/Makeconf.local | 6 ++++++ dde_e100/Makefile | 2 +- dde_e1000/Makeconf.local | 6 ++++++ dde_e1000/Makefile | 2 +- dde_ne2k_pci/Makeconf.local | 6 ++++++ dde_ne2k_pci/Makefile | 2 +- dde_pcnet32/Makeconf.local | 6 ++++++ dde_pcnet32/Makefile | 2 +- dde_rtl8139/Makeconf.local | 6 ++++++ dde_rtl8139/Makefile | 2 +- 10 files changed, 35 insertions(+), 5 deletions(-) (limited to 'dde_pcnet32/Makefile') diff --git a/dde_e100/Makeconf.local b/dde_e100/Makeconf.local index c52bc65c..074df6e0 100644 --- a/dde_e100/Makeconf.local +++ b/dde_e100/Makeconf.local @@ -22,6 +22,12 @@ ifeq ($(strip $(has_libslab)),) libslab_path := $(BUILDDIR)/libhurd-slab/libhurd-slab.a endif +libbpf_path := ../libbpf/libbpf.a +has_libbpf := $(wildcard $(libbpf_path)) +ifeq ($(strip $(has_libbpf)),) + libbpf_path := $(BUILDDIR)/libbpf/libbpf.a +endif + DDEKITLIBDIR = $(PKGDIR)/../libddekit/ DDEKITINCDIR = $(PKGDIR)/../libddekit/include DDE26LIBDIR = $(PKGDIR)/lib/src diff --git a/dde_e100/Makefile b/dde_e100/Makefile index ed16f4cb..f5b2294a 100644 --- a/dde_e100/Makefile +++ b/dde_e100/Makefile @@ -7,7 +7,7 @@ TARGET = dde_e100 SRC_C = main.c e100.c -LIBS += $(libmachdev_path) -ldde_linux26.o -ldde_linux26_net $(libddekit_path) -lfshelp -ltrivfs -lpciaccess -lthreads -lshouldbeinlibc -lports $(libslab_path) -lbpf +LIBS += $(libmachdev_path) -ldde_linux26.o -ldde_linux26_net $(libddekit_path) -lfshelp -ltrivfs -lpciaccess -lthreads -lshouldbeinlibc -lports $(libslab_path) $(libbpf_path) CFLAGS += -g -I$(PKGDIR)/include -I../libmachdev # DDE configuration diff --git a/dde_e1000/Makeconf.local b/dde_e1000/Makeconf.local index 5b2e9082..44f70ab8 100644 --- a/dde_e1000/Makeconf.local +++ b/dde_e1000/Makeconf.local @@ -22,6 +22,12 @@ ifeq ($(strip $(has_libslab)),) libslab_path := $(BUILDDIR)/libhurd-slab/libhurd-slab.a endif +libbpf_path := ../libbpf/libbpf.a +has_libbpf := $(wildcard $(libbpf_path)) +ifeq ($(strip $(has_libbpf)),) + libbpf_path := $(BUILDDIR)/libbpf/libbpf.a +endif + DDEKITLIBDIR = $(PKGDIR)/../libddekit/ DDEKITINCDIR = $(PKGDIR)/../libddekit/include DDE26LIBDIR = $(PKGDIR)/lib/src diff --git a/dde_e1000/Makefile b/dde_e1000/Makefile index d9025d9d..137a69ef 100644 --- a/dde_e1000/Makefile +++ b/dde_e1000/Makefile @@ -7,7 +7,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 -lthreads -lshouldbeinlibc -lports $(libslab_path) -lbpf +LIBS += $(libmachdev_path) -ldde_linux26.o -ldde_linux26_net $(libddekit_path) -lfshelp -ltrivfs -lpciaccess -lthreads -lshouldbeinlibc -lports $(libslab_path) $(libbpf_path) CFLAGS += -g -I$(PKGDIR)/include -I../libmachdev # DDE configuration diff --git a/dde_ne2k_pci/Makeconf.local b/dde_ne2k_pci/Makeconf.local index 5b2e9082..44f70ab8 100644 --- a/dde_ne2k_pci/Makeconf.local +++ b/dde_ne2k_pci/Makeconf.local @@ -22,6 +22,12 @@ ifeq ($(strip $(has_libslab)),) libslab_path := $(BUILDDIR)/libhurd-slab/libhurd-slab.a endif +libbpf_path := ../libbpf/libbpf.a +has_libbpf := $(wildcard $(libbpf_path)) +ifeq ($(strip $(has_libbpf)),) + libbpf_path := $(BUILDDIR)/libbpf/libbpf.a +endif + DDEKITLIBDIR = $(PKGDIR)/../libddekit/ DDEKITINCDIR = $(PKGDIR)/../libddekit/include DDE26LIBDIR = $(PKGDIR)/lib/src diff --git a/dde_ne2k_pci/Makefile b/dde_ne2k_pci/Makefile index 33b5cdfd..44e805e0 100644 --- a/dde_ne2k_pci/Makefile +++ b/dde_ne2k_pci/Makefile @@ -9,7 +9,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 -lthreads -lshouldbeinlibc -lports $(libslab_path) -lbpf +LIBS += $(libmachdev_path) -ldde_linux26.o -ldde_linux26_net $(libddekit_path) -lfshelp -ltrivfs -lpciaccess -lthreads -lshouldbeinlibc -lports $(libslab_path) $(libbpf_path) CFLAGS += -g -I$(PKGDIR)/include -I../libmachdev # DDE configuration diff --git a/dde_pcnet32/Makeconf.local b/dde_pcnet32/Makeconf.local index 5b2e9082..44f70ab8 100644 --- a/dde_pcnet32/Makeconf.local +++ b/dde_pcnet32/Makeconf.local @@ -22,6 +22,12 @@ ifeq ($(strip $(has_libslab)),) libslab_path := $(BUILDDIR)/libhurd-slab/libhurd-slab.a endif +libbpf_path := ../libbpf/libbpf.a +has_libbpf := $(wildcard $(libbpf_path)) +ifeq ($(strip $(has_libbpf)),) + libbpf_path := $(BUILDDIR)/libbpf/libbpf.a +endif + DDEKITLIBDIR = $(PKGDIR)/../libddekit/ DDEKITINCDIR = $(PKGDIR)/../libddekit/include DDE26LIBDIR = $(PKGDIR)/lib/src diff --git a/dde_pcnet32/Makefile b/dde_pcnet32/Makefile index e2aa5338..5b45cc14 100644 --- a/dde_pcnet32/Makefile +++ b/dde_pcnet32/Makefile @@ -7,7 +7,7 @@ TARGET = dde_pcnet32 SRC_C = main.c pcnet32.c -LIBS += $(libmachdev_path) -ldde_linux26.o -ldde_linux26_net $(libddekit_path) -lfshelp -ltrivfs -lpciaccess -lthreads -lshouldbeinlibc -lports $(libslab_path) -lbpf +LIBS += $(libmachdev_path) -ldde_linux26.o -ldde_linux26_net $(libddekit_path) -lfshelp -ltrivfs -lpciaccess -lthreads -lshouldbeinlibc -lports $(libslab_path) $(libbpf_path) CFLAGS += -g -I$(PKGDIR)/include -I../libmachdev # DDE configuration diff --git a/dde_rtl8139/Makeconf.local b/dde_rtl8139/Makeconf.local index 5b2e9082..44f70ab8 100644 --- a/dde_rtl8139/Makeconf.local +++ b/dde_rtl8139/Makeconf.local @@ -22,6 +22,12 @@ ifeq ($(strip $(has_libslab)),) libslab_path := $(BUILDDIR)/libhurd-slab/libhurd-slab.a endif +libbpf_path := ../libbpf/libbpf.a +has_libbpf := $(wildcard $(libbpf_path)) +ifeq ($(strip $(has_libbpf)),) + libbpf_path := $(BUILDDIR)/libbpf/libbpf.a +endif + DDEKITLIBDIR = $(PKGDIR)/../libddekit/ DDEKITINCDIR = $(PKGDIR)/../libddekit/include DDE26LIBDIR = $(PKGDIR)/lib/src diff --git a/dde_rtl8139/Makefile b/dde_rtl8139/Makefile index 4f76cd2b..16d3b764 100644 --- a/dde_rtl8139/Makefile +++ b/dde_rtl8139/Makefile @@ -9,7 +9,7 @@ TARGET = dde_rtl8139 SRC_C = main.c 8139cp.c -LIBS += $(libmachdev_path) -ldde_linux26.o -ldde_linux26_net $(libddekit_path) -lfshelp -ltrivfs -lpciaccess -lthreads -lshouldbeinlibc -lports $(libslab_path) -lbpf +LIBS += $(libmachdev_path) -ldde_linux26.o -ldde_linux26_net $(libddekit_path) -lfshelp -ltrivfs -lpciaccess -lthreads -lshouldbeinlibc -lports $(libslab_path) $(libbpf_path) CFLAGS += -g -I$(PKGDIR)/include -I../libmachdev # DDE configuration -- cgit v1.2.3 From 998885c7f9b23a5576fc11d3d2fc71508d46089d Mon Sep 17 00:00:00 2001 From: Samuel Thibault Date: Sun, 19 Feb 2012 01:27:51 +0000 Subject: fix link --- dde_e100/Makefile | 2 +- dde_ne2k_pci/Makefile | 2 +- dde_pcnet32/Makefile | 2 +- dde_rtl8139/Makefile | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) (limited to 'dde_pcnet32/Makefile') diff --git a/dde_e100/Makefile b/dde_e100/Makefile index f5b2294a..1fa82e1a 100644 --- a/dde_e100/Makefile +++ b/dde_e100/Makefile @@ -7,7 +7,7 @@ TARGET = dde_e100 SRC_C = main.c e100.c -LIBS += $(libmachdev_path) -ldde_linux26.o -ldde_linux26_net $(libddekit_path) -lfshelp -ltrivfs -lpciaccess -lthreads -lshouldbeinlibc -lports $(libslab_path) $(libbpf_path) +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 # DDE configuration diff --git a/dde_ne2k_pci/Makefile b/dde_ne2k_pci/Makefile index 44e805e0..0f25544f 100644 --- a/dde_ne2k_pci/Makefile +++ b/dde_ne2k_pci/Makefile @@ -9,7 +9,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 -lthreads -lshouldbeinlibc -lports $(libslab_path) $(libbpf_path) +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 # DDE configuration diff --git a/dde_pcnet32/Makefile b/dde_pcnet32/Makefile index 5b45cc14..bcdcb425 100644 --- a/dde_pcnet32/Makefile +++ b/dde_pcnet32/Makefile @@ -7,7 +7,7 @@ TARGET = dde_pcnet32 SRC_C = main.c pcnet32.c -LIBS += $(libmachdev_path) -ldde_linux26.o -ldde_linux26_net $(libddekit_path) -lfshelp -ltrivfs -lpciaccess -lthreads -lshouldbeinlibc -lports $(libslab_path) $(libbpf_path) +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 # DDE configuration diff --git a/dde_rtl8139/Makefile b/dde_rtl8139/Makefile index 16d3b764..a9acda45 100644 --- a/dde_rtl8139/Makefile +++ b/dde_rtl8139/Makefile @@ -9,7 +9,7 @@ TARGET = dde_rtl8139 SRC_C = main.c 8139cp.c -LIBS += $(libmachdev_path) -ldde_linux26.o -ldde_linux26_net $(libddekit_path) -lfshelp -ltrivfs -lpciaccess -lthreads -lshouldbeinlibc -lports $(libslab_path) $(libbpf_path) +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 # DDE configuration -- cgit v1.2.3