summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuel Thibault <samuel.thibault@ens-lyon.org>2020-03-30 00:15:44 +0200
committerSamuel Thibault <samuel.thibault@ens-lyon.org>2020-03-30 00:15:44 +0200
commite522045e0d2f2e3aaa5694e9e83ca2621ed5b9dc (patch)
tree109597e004761f3cdb173d47d5f92d81cfbe93d1
parent3487dcbe0e993929df1925f5cd774250b43bfd38 (diff)
Rename DDE-based libmachdev to libmachdevdde
Diffstat
-rw-r--r--Makefile2
-rw-r--r--dde_e100/Makefile2
-rw-r--r--dde_e1000/Makefile2
-rw-r--r--dde_ne2k_pci/Makefile2
-rw-r--r--dde_pcnet32/Makefile2
-rw-r--r--dde_rtl8139/Makefile2
-rw-r--r--libmachdevdde/Makefile (renamed from libmachdev/Makefile)4
-rw-r--r--libmachdevdde/block.c (renamed from libmachdev/block.c)0
-rw-r--r--libmachdevdde/dev_hdr.h (renamed from libmachdev/dev_hdr.h)0
-rw-r--r--libmachdevdde/device_emul.h (renamed from libmachdev/device_emul.h)0
-rw-r--r--libmachdevdde/ds_routines.c (renamed from libmachdev/ds_routines.c)0
-rw-r--r--libmachdevdde/ds_routines.h (renamed from libmachdev/ds_routines.h)0
-rw-r--r--libmachdevdde/errno-base.h (renamed from libmachdev/errno-base.h)0
-rw-r--r--libmachdevdde/if_ether.h (renamed from libmachdev/if_ether.h)0
-rw-r--r--libmachdevdde/if_hdr.h (renamed from libmachdev/if_hdr.h)0
-rw-r--r--libmachdevdde/io_req.h (renamed from libmachdev/io_req.h)0
-rw-r--r--libmachdevdde/linux-errno.h (renamed from libmachdev/linux-errno.h)0
-rw-r--r--libmachdevdde/mach.defs (renamed from libmachdev/mach.defs)0
-rw-r--r--libmachdevdde/mach_glue.h (renamed from libmachdev/mach_glue.h)0
-rw-r--r--libmachdevdde/machdev.h (renamed from libmachdev/machdev.h)0
-rw-r--r--libmachdevdde/mig-decls.h (renamed from libmachdev/mig-decls.h)0
-rw-r--r--libmachdevdde/mig-mutate.h (renamed from libmachdev/mig-mutate.h)0
-rw-r--r--libmachdevdde/misc.c (renamed from libmachdev/misc.c)0
-rw-r--r--libmachdevdde/net.c (renamed from libmachdev/net.c)0
-rw-r--r--libmachdevdde/queue.c (renamed from libmachdev/queue.c)0
-rw-r--r--libmachdevdde/queue.h (renamed from libmachdev/queue.h)0
-rw-r--r--libmachdevdde/trivfs_server.c (renamed from libmachdev/trivfs_server.c)0
-rw-r--r--libmachdevdde/util.h (renamed from libmachdev/util.h)0
-rw-r--r--libmachdevdde/vm_param.h (renamed from libmachdev/vm_param.h)0
-rw-r--r--windhoek/Makefile2
30 files changed, 9 insertions, 9 deletions
diff --git a/Makefile b/Makefile
index 9efd5477e..d755c0f9b 100644
--- a/Makefile
+++ b/Makefile
@@ -33,7 +33,7 @@ lib-subdirs = libshouldbeinlibc libihash libiohelp libports libthreads \
libbpf \
ifneq ($(LIBPCIACCESS),no)
-lib-subdirs += libmachdev libddekit
+lib-subdirs += libmachdevdde libddekit
endif
# Hurd programs
diff --git a/dde_e100/Makefile b/dde_e100/Makefile
index f8ce6063c..ce66468e6 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 -lpthread -lshouldbeinlibc -lports $(libslab_path) $(libbpf_path)
+LIBS += $(libmachdevdde_path) -ldde_linux26.o -ldde_linux26_net $(libddekit_path) -lfshelp -ltrivfs -lpciaccess -lpthread -lshouldbeinlibc -lports $(libslab_path) $(libbpf_path)
CFLAGS += -g -I$(PKGDIR)/include -I$(BUILDDIR)/include
# DDE configuration
diff --git a/dde_e1000/Makefile b/dde_e1000/Makefile
index 2062d0b53..5e8d21862 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 -lpthread -lshouldbeinlibc -lports $(libslab_path) $(libbpf_path)
+LIBS += $(libmachdevdde_path) -ldde_linux26.o -ldde_linux26_net $(libddekit_path) -lfshelp -ltrivfs -lpciaccess -lpthread -lshouldbeinlibc -lports $(libslab_path) $(libbpf_path)
CFLAGS += -g -I$(PKGDIR)/include -I$(BUILDDIR)/include
# DDE configuration
diff --git a/dde_ne2k_pci/Makefile b/dde_ne2k_pci/Makefile
index 293968569..2cea19ddc 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 -lpthread -lshouldbeinlibc -lports $(libslab_path) $(libbpf_path)
+LIBS += $(libmachdevdde_path) -ldde_linux26.o -ldde_linux26_net $(libddekit_path) -lfshelp -ltrivfs -lpciaccess -lpthread -lshouldbeinlibc -lports $(libslab_path) $(libbpf_path)
CFLAGS += -g -I$(PKGDIR)/include -I$(BUILDDIR)/include
# DDE configuration
diff --git a/dde_pcnet32/Makefile b/dde_pcnet32/Makefile
index 1bf47c4cf..006f93a24 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 -lpthread -lshouldbeinlibc -lports $(libslab_path) $(libbpf_path)
+LIBS += $(libmachdevdde_path) -ldde_linux26.o -ldde_linux26_net $(libddekit_path) -lfshelp -ltrivfs -lpciaccess -lpthread -lshouldbeinlibc -lports $(libslab_path) $(libbpf_path)
CFLAGS += -g -I$(PKGDIR)/include -I$(BUILDDIR)/include
# DDE configuration
diff --git a/dde_rtl8139/Makefile b/dde_rtl8139/Makefile
index 95b6fa0ae..d22d41cf6 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 -lpthread -lshouldbeinlibc -lports $(libslab_path) $(libbpf_path)
+LIBS += $(libmachdevdde_path) -ldde_linux26.o -ldde_linux26_net $(libddekit_path) -lfshelp -ltrivfs -lpciaccess -lpthread -lshouldbeinlibc -lports $(libslab_path) $(libbpf_path)
CFLAGS += -g -I$(PKGDIR)/include -I$(BUILDDIR)/include
# DDE configuration
diff --git a/libmachdev/Makefile b/libmachdevdde/Makefile
index 77d2a342f..1ce7d163a 100644
--- a/libmachdev/Makefile
+++ b/libmachdevdde/Makefile
@@ -15,9 +15,9 @@
# along with the GNU Hurd; see the file COPYING. If not, write to
# the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
-dir := libmachdev
+dir := libmachdevdde
makemode := library
-libname = libmachdev
+libname = libmachdevdde
SRCS = deviceUser.c machUser.c net.c ds_routines.c queue.c trivfs_server.c \
device_replyUser.c deviceServer.c notifyServer.c misc.c
diff --git a/libmachdev/block.c b/libmachdevdde/block.c
index 799620726..799620726 100644
--- a/libmachdev/block.c
+++ b/libmachdevdde/block.c
diff --git a/libmachdev/dev_hdr.h b/libmachdevdde/dev_hdr.h
index 79edc43a3..79edc43a3 100644
--- a/libmachdev/dev_hdr.h
+++ b/libmachdevdde/dev_hdr.h
diff --git a/libmachdev/device_emul.h b/libmachdevdde/device_emul.h
index e27799cbd..e27799cbd 100644
--- a/libmachdev/device_emul.h
+++ b/libmachdevdde/device_emul.h
diff --git a/libmachdev/ds_routines.c b/libmachdevdde/ds_routines.c
index e9fbe9445..e9fbe9445 100644
--- a/libmachdev/ds_routines.c
+++ b/libmachdevdde/ds_routines.c
diff --git a/libmachdev/ds_routines.h b/libmachdevdde/ds_routines.h
index 3706aa586..3706aa586 100644
--- a/libmachdev/ds_routines.h
+++ b/libmachdevdde/ds_routines.h
diff --git a/libmachdev/errno-base.h b/libmachdevdde/errno-base.h
index 651159785..651159785 100644
--- a/libmachdev/errno-base.h
+++ b/libmachdevdde/errno-base.h
diff --git a/libmachdev/if_ether.h b/libmachdevdde/if_ether.h
index 29974674a..29974674a 100644
--- a/libmachdev/if_ether.h
+++ b/libmachdevdde/if_ether.h
diff --git a/libmachdev/if_hdr.h b/libmachdevdde/if_hdr.h
index b20f7e354..b20f7e354 100644
--- a/libmachdev/if_hdr.h
+++ b/libmachdevdde/if_hdr.h
diff --git a/libmachdev/io_req.h b/libmachdevdde/io_req.h
index 9c810542d..9c810542d 100644
--- a/libmachdev/io_req.h
+++ b/libmachdevdde/io_req.h
diff --git a/libmachdev/linux-errno.h b/libmachdevdde/linux-errno.h
index be764a897..be764a897 100644
--- a/libmachdev/linux-errno.h
+++ b/libmachdevdde/linux-errno.h
diff --git a/libmachdev/mach.defs b/libmachdevdde/mach.defs
index 2750bcd52..2750bcd52 100644
--- a/libmachdev/mach.defs
+++ b/libmachdevdde/mach.defs
diff --git a/libmachdev/mach_glue.h b/libmachdevdde/mach_glue.h
index 7b1225833..7b1225833 100644
--- a/libmachdev/mach_glue.h
+++ b/libmachdevdde/mach_glue.h
diff --git a/libmachdev/machdev.h b/libmachdevdde/machdev.h
index b9186fbaf..b9186fbaf 100644
--- a/libmachdev/machdev.h
+++ b/libmachdevdde/machdev.h
diff --git a/libmachdev/mig-decls.h b/libmachdevdde/mig-decls.h
index 8302029d2..8302029d2 100644
--- a/libmachdev/mig-decls.h
+++ b/libmachdevdde/mig-decls.h
diff --git a/libmachdev/mig-mutate.h b/libmachdevdde/mig-mutate.h
index 902ff166f..902ff166f 100644
--- a/libmachdev/mig-mutate.h
+++ b/libmachdevdde/mig-mutate.h
diff --git a/libmachdev/misc.c b/libmachdevdde/misc.c
index 977159bd3..977159bd3 100644
--- a/libmachdev/misc.c
+++ b/libmachdevdde/misc.c
diff --git a/libmachdev/net.c b/libmachdevdde/net.c
index 220121aac..220121aac 100644
--- a/libmachdev/net.c
+++ b/libmachdevdde/net.c
diff --git a/libmachdev/queue.c b/libmachdevdde/queue.c
index a43a21b0e..a43a21b0e 100644
--- a/libmachdev/queue.c
+++ b/libmachdevdde/queue.c
diff --git a/libmachdev/queue.h b/libmachdevdde/queue.h
index 86ef74dc6..86ef74dc6 100644
--- a/libmachdev/queue.h
+++ b/libmachdevdde/queue.h
diff --git a/libmachdev/trivfs_server.c b/libmachdevdde/trivfs_server.c
index 3c0578fa0..3c0578fa0 100644
--- a/libmachdev/trivfs_server.c
+++ b/libmachdevdde/trivfs_server.c
diff --git a/libmachdev/util.h b/libmachdevdde/util.h
index 1c62b0d6c..1c62b0d6c 100644
--- a/libmachdev/util.h
+++ b/libmachdevdde/util.h
diff --git a/libmachdev/vm_param.h b/libmachdevdde/vm_param.h
index 7b615c8a0..7b615c8a0 100644
--- a/libmachdev/vm_param.h
+++ b/libmachdevdde/vm_param.h
diff --git a/windhoek/Makefile b/windhoek/Makefile
index 91646bba0..08723913e 100644
--- a/windhoek/Makefile
+++ b/windhoek/Makefile
@@ -27,7 +27,7 @@ SRC_C += $(IDEFILES) \
$(CDROMFILES) \
$(PARTITIONFILES)
-LIBS += --whole-archive --no-whole-archive ../libmachdev/libmachdev.a \
+LIBS += --whole-archive --no-whole-archive ../libmachdevdde/libmachdevdde.a \
-ldde_linux26.o -ldde_linux26_block ../libddekit/libddekit.a \
-lfshelp -ltrivfs -lpciaccess -lthreads -lshouldbeinlibc \
-lports -lhurd-slab
generated by cgit v1.2.3 (git 2.39.1) at 2024-04-25 21:07:36 +0000