# HG changeset patch # User Paul Boddie # Date 1709859526 -3600 # Node ID 8c11e4bd8f3c82776055bf86f86791b981c7fc07 # Parent 78348984c97724386064f09e46b4342c884d6a87 Removed direct l4re_c-util dependencies. diff -r 78348984c977 -r 8c11e4bd8f3c fsaccess/Makefile --- a/fsaccess/Makefile Fri Mar 08 01:25:10 2024 +0100 +++ b/fsaccess/Makefile Fri Mar 08 01:58:46 2024 +0100 @@ -10,6 +10,6 @@ op_copy_in.c op_list_objects.c op_make_dirs.c op_remove.c \ op_run.c op_script.c op_stat_objects.c -REQUIRES_LIBS = l4re_c-util libfsclient libmem libipc libsystypes libe2access libe2access_blockserver +REQUIRES_LIBS = libfsclient libmem libipc libsystypes libe2access libe2access_blockserver include $(L4DIR)/mk/prog.mk diff -r 78348984c977 -r 8c11e4bd8f3c libexec/lib/src/Makefile --- a/libexec/lib/src/Makefile Fri Mar 08 01:25:10 2024 +0100 +++ b/libexec/lib/src/Makefile Fri Mar 08 01:58:46 2024 +0100 @@ -48,7 +48,7 @@ $(SERVER_INTERFACES_SRC_CC) \ $(PLAIN_SRC_CC) -REQUIRES_LIBS = l4re_c-util libmem libipc libstdc++ libsystypes libfsclient libfsserver libresource +REQUIRES_LIBS = libmem libipc libstdc++ libsystypes libfsclient libfsserver libresource PRIVATE_INCDIR = $(PKGDIR)/include/exec $(IDL_BUILD_DIR) $(IDL_EXPORT_DIR) diff -r 78348984c977 -r 8c11e4bd8f3c libfsclient/lib/src/Makefile --- a/libfsclient/lib/src/Makefile Fri Mar 08 01:25:10 2024 +0100 +++ b/libfsclient/lib/src/Makefile Fri Mar 08 01:58:46 2024 +0100 @@ -31,7 +31,7 @@ $(CLIENT_INTERFACES_SRC_CC) \ $(PLAIN_SRC_CC) -REQUIRES_LIBS = l4re_c-util libipc libstdc++ libsystypes libmem libnotifier +REQUIRES_LIBS = libipc libstdc++ libsystypes libmem libnotifier PRIVATE_INCDIR = $(PKGDIR)/include/fsclient $(IDL_BUILD_DIR) $(IDL_EXPORT_DIR) CONTRIB_INCDIR = libfsclient diff -r 78348984c977 -r 8c11e4bd8f3c libfsserver/lib/Makefile --- a/libfsserver/lib/Makefile Fri Mar 08 01:25:10 2024 +0100 +++ b/libfsserver/lib/Makefile Fri Mar 08 01:58:46 2024 +0100 @@ -84,7 +84,7 @@ $(PLAIN_SRC_CC) REQUIRES_LIBS = \ - l4re_c-util libmem libipc libstdc++ libsystypes libfsclient \ + libmem libipc libstdc++ libsystypes libfsclient \ libresource libext2fs libext2fs_blockserver libe2access \ libe2access_blockserver diff -r 78348984c977 -r 8c11e4bd8f3c libnotifier/lib/src/Makefile --- a/libnotifier/lib/src/Makefile Fri Mar 08 01:25:10 2024 +0100 +++ b/libnotifier/lib/src/Makefile Fri Mar 08 01:58:46 2024 +0100 @@ -34,7 +34,7 @@ $(SERVER_INTERFACES_SRC_CC) \ $(PLAIN_SRC_CC) -REQUIRES_LIBS = l4re_c-util libipc libstdc++ libsystypes libresource +REQUIRES_LIBS = libipc libstdc++ libsystypes libresource PRIVATE_INCDIR = $(PKGDIR)/include/notifier $(IDL_BUILD_DIR) $(IDL_EXPORT_DIR) CONTRIB_INCDIR = libnotifier diff -r 78348984c977 -r 8c11e4bd8f3c libresource/lib/src/Makefile --- a/libresource/lib/src/Makefile Fri Mar 08 01:25:10 2024 +0100 +++ b/libresource/lib/src/Makefile Fri Mar 08 01:58:46 2024 +0100 @@ -6,7 +6,7 @@ SRC_CC = resource_server.cc -REQUIRES_LIBS = l4re_c-util libipc libstdc++ libsystypes +REQUIRES_LIBS = libipc libstdc++ libsystypes PRIVATE_INCDIR = $(PKGDIR)/include/resource CONTRIB_INCDIR = libresource diff -r 78348984c977 -r 8c11e4bd8f3c libsystypes/Control --- a/libsystypes/Control Fri Mar 08 01:25:10 2024 +0100 +++ b/libsystypes/Control Fri Mar 08 01:58:46 2024 +0100 @@ -1,3 +1,2 @@ provides: libsystypes -requires: l4re_c-util maintainer: paul@boddie.org.uk diff -r 78348984c977 -r 8c11e4bd8f3c libsystypes/lib/src/Makefile --- a/libsystypes/lib/src/Makefile Fri Mar 08 01:25:10 2024 +0100 +++ b/libsystypes/lib/src/Makefile Fri Mar 08 01:58:46 2024 +0100 @@ -6,8 +6,6 @@ SRC_C = base.c stat.c thread.c -REQUIRES_LIBS = l4re_c-util - PRIVATE_INCDIR = $(PKGDIR)/include/systypes CONTRIB_INCDIR = libsystypes diff -r 78348984c977 -r 8c11e4bd8f3c servers/Makefile --- a/servers/Makefile Fri Mar 08 01:25:10 2024 +0100 +++ b/servers/Makefile Fri Mar 08 01:58:46 2024 +0100 @@ -23,6 +23,6 @@ SRC_CC_test_server = test_file_server.cc -REQUIRES_LIBS = l4re_c-util libmem libfsserver libresource libipc libstdc++ libsystypes libe2access_blockserver libexec +REQUIRES_LIBS = libmem libfsserver libresource libipc libstdc++ libsystypes libe2access_blockserver libexec include $(L4DIR)/mk/prog.mk diff -r 78348984c977 -r 8c11e4bd8f3c test_files/Control --- a/test_files/Control Fri Mar 08 01:25:10 2024 +0100 +++ b/test_files/Control Fri Mar 08 01:58:46 2024 +0100 @@ -1,3 +1,3 @@ provides: fstest_files -requires: libc libstdc++ libexec libfsclient libsystypes l4re_c-util libe2access +requires: libc libstdc++ libexec libfsclient libsystypes libe2access maintainer: paul@boddie.org.uk diff -r 78348984c977 -r 8c11e4bd8f3c test_files/programs/Makefile --- a/test_files/programs/Makefile Fri Mar 08 01:25:10 2024 +0100 +++ b/test_files/programs/Makefile Fri Mar 08 01:58:46 2024 +0100 @@ -13,6 +13,6 @@ SRC_C_ls = ls.c -REQUIRES_LIBS = libc libfsclient l4re_c-util libsystypes libe2access +REQUIRES_LIBS = libc libfsclient libsystypes libe2access include $(L4DIR)/mk/prog.mk diff -r 78348984c977 -r 8c11e4bd8f3c tests/Makefile --- a/tests/Makefile Fri Mar 08 01:25:10 2024 +0100 +++ b/tests/Makefile Fri Mar 08 01:58:46 2024 +0100 @@ -77,7 +77,7 @@ SRC_CC_dstest_align = dstest_align.cc -REQUIRES_LIBS = l4re_c-util libfsclient libmem libipc libstdc++ libsystypes libe2access_blockserver +REQUIRES_LIBS = libfsclient libmem libipc libstdc++ libsystypes libe2access_blockserver PRIVATE_INCDIR = $(IDL_BUILD_DIR) $(IDL_EXPORT_DIR) include $(L4DIR)/mk/prog.mk