diff options
author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2012-11-25 23:49:29 +0000 |
---|---|---|
committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2012-11-25 23:49:29 +0000 |
commit | 36318d1929e9437df0402a78ff63a70f78d6a89e (patch) | |
tree | 38588eaa8b400d7abf384a17e21dea75b104b177 /dde_ne2k_pci/Makefile | |
parent | eaa21da4ea94937a1bc2157c042a233d524d17ce (diff) | |
parent | d261675a592f6109826ccbdb07c7f485c4c88683 (diff) |
Merge branch 'dde-upstream' into dde
Conflicts:
dde_e100/Makefile
dde_e1000/Makefile
dde_ne2k_pci/Makefile
dde_pcnet32/Makefile
dde_rtl8139/Makefile
Diffstat (limited to 'dde_ne2k_pci/Makefile')
-rw-r--r-- | dde_ne2k_pci/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/dde_ne2k_pci/Makefile b/dde_ne2k_pci/Makefile index 5bb27da9..932d5ad0 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 -lz -lthreads -lshouldbeinlibc -lports $(libslab_path) $(libbpf_path) +LIBS += $(libmachdev_path) -ldde_linux26.o -ldde_linux26_net $(libddekit_path) -lfshelp -ltrivfs -lpciaccess -lz -lpthread -lshouldbeinlibc -lports $(libslab_path) $(libbpf_path) CFLAGS += -g -I$(PKGDIR)/include -I$(BUILDDIR)/include # DDE configuration |