From ce2f1b845fbd94013e36377aaa7375466cf1241d Mon Sep 17 00:00:00 2001 From: Tim Schumacher Date: Fri, 21 Oct 2022 21:43:56 +0200 Subject: Everywhere: Mark dependencies of most targets as PRIVATE Otherwise, we end up propagating those dependencies into targets that link against that library, which creates unnecessary link-time dependencies. Also included are changes to readd now missing dependencies to tools that actually need them. --- Userland/Utilities/CMakeLists.txt | 374 +++++++++++++++++++------------------- 1 file changed, 187 insertions(+), 187 deletions(-) (limited to 'Userland/Utilities') diff --git a/Userland/Utilities/CMakeLists.txt b/Userland/Utilities/CMakeLists.txt index 26bed7db37..1d97b3983c 100644 --- a/Userland/Utilities/CMakeLists.txt +++ b/Userland/Utilities/CMakeLists.txt @@ -40,14 +40,14 @@ foreach(CMD_SRC ${CMD_SOURCES}) endif() if (CMD_NAME IN_LIST SPECIAL_TARGETS) add_executable(${TARGET_NAME} ${CMD_SRC}) - target_link_libraries(${TARGET_NAME} LibCore LibMain) + target_link_libraries(${TARGET_NAME} PRIVATE LibCore LibMain) serenity_set_implicit_links(${TARGET_NAME}) install(TARGETS ${TARGET_NAME} RUNTIME DESTINATION bin) install(CODE "file(RENAME ${CMAKE_INSTALL_PREFIX}/bin/${CMD_NAME}-bin ${CMAKE_INSTALL_PREFIX}/bin/${CMD_NAME})") else() add_executable(${CMD_NAME} ${CMD_SRC}) set_target_properties(${CMD_NAME} PROPERTIES EXCLUDE_FROM_ALL TRUE) - target_link_libraries(${CMD_NAME} LibCore) + target_link_libraries(${CMD_NAME} PRIVATE LibCore) serenity_set_implicit_links(${TARGET_NAME}) install(TARGETS ${CMD_NAME} RUNTIME DESTINATION bin OPTIONAL) endif() @@ -57,7 +57,7 @@ if (ENABLE_JAKT) add_jakt_executable(hello-jakt MAIN_SOURCE hello-world.jakt ) - target_link_libraries(hello-jakt LibC) + target_link_libraries(hello-jakt PRIVATE LibC) set_target_properties(hello-jakt PROPERTIES EXCLUDE_FROM_ALL TRUE) install(TARGETS hello-jakt RUNTIME DESTINATION bin OPTIONAL) serenity_component( @@ -70,188 +70,188 @@ endif() install(CODE "file(CREATE_LINK grep ${CMAKE_INSTALL_PREFIX}/bin/egrep SYMBOLIC)") install(CODE "file(CREATE_LINK grep ${CMAKE_INSTALL_PREFIX}/bin/rgrep SYMBOLIC)") -target_link_libraries(abench LibAudio LibMain LibCore) -target_link_libraries(adjtime LibMain) -target_link_libraries(allocate LibMain) -target_link_libraries(aplay LibAudio LibMain) -target_link_libraries(arp LibMain) -target_link_libraries(asctl LibAudio LibMain) -target_link_libraries(base64 LibMain) -target_link_libraries(basename LibMain) -target_link_libraries(beep LibMain) -target_link_libraries(blockdev LibMain) -target_link_libraries(bt LibSymbolication LibMain) -target_link_libraries(cal LibMain) -target_link_libraries(cat LibMain) -target_link_libraries(checksum LibCrypto LibMain) -target_link_libraries(chgrp LibMain) -target_link_libraries(chmod LibMain) -target_link_libraries(chown LibMain) -target_link_libraries(chres LibGUI LibMain) -target_link_libraries(cksum LibCrypto LibMain) -target_link_libraries(clear LibMain) -target_link_libraries(cmp LibMain) -target_link_libraries(comm LibMain) -target_link_libraries(config LibConfig LibMain) -target_link_libraries(copy LibGUI LibMain) -target_link_libraries(cp LibMain) -target_link_libraries(cpp-lexer LibCpp LibMain) -target_link_libraries(cpp-parser LibCpp LibMain) -target_link_libraries(cpp-preprocessor LibCpp LibMain) -target_link_libraries(cut LibMain) -target_link_libraries(date LibMain) -target_link_libraries(dd LibMain) -target_link_libraries(df LibMain) -target_link_libraries(diff LibDiff LibMain) -target_link_libraries(dirname LibMain) -target_link_libraries(disasm LibX86 LibMain) -target_link_libraries(disk_benchmark LibMain) -target_link_libraries(dmesg LibMain) -target_link_libraries(du LibMain) -target_link_libraries(echo LibMain) -target_link_libraries(env LibMain) -target_link_libraries(errno LibMain) -target_link_libraries(expr LibRegex LibMain) -target_link_libraries(false LibMain) -target_link_libraries(fdtdump LibDeviceTree LibMain) -target_link_libraries(fgrep LibMain) -target_link_libraries(file LibGfx LibIPC LibCompress LibMain) -target_link_libraries(find LibMain) -target_link_libraries(flock LibMain) -target_link_libraries(fortune LibMain) -target_link_libraries(functrace LibDebug LibX86 LibMain) -target_link_libraries(gml-format LibGUI LibMain) -target_link_libraries(grep LibRegex LibMain) -target_link_libraries(gron LibMain) -target_link_libraries(groupadd LibMain) -target_link_libraries(groupdel LibMain) -target_link_libraries(groups LibMain) -target_link_libraries(gunzip LibCompress LibMain) -target_link_libraries(gzip LibCompress LibMain) -target_link_libraries(head LibMain) -target_link_libraries(headless-browser LibCore LibGemini LibGfx LibHTTP LibWeb LibWebSocket LibMain) -target_link_libraries(hexdump LibMain) -target_link_libraries(host LibMain) -target_link_libraries(hostname LibMain) -target_link_libraries(id LibMain) -target_link_libraries(ifconfig LibMain) -target_link_libraries(ini LibMain) -target_link_libraries(install-bin LibMain) -target_link_libraries(js LibJS LibLine LibMain LibTextCodec) +target_link_libraries(abench PRIVATE LibAudio LibMain LibCore) +target_link_libraries(adjtime PRIVATE LibMain) +target_link_libraries(allocate PRIVATE LibMain) +target_link_libraries(aplay PRIVATE LibAudio LibIPC LibMain) +target_link_libraries(arp PRIVATE LibMain) +target_link_libraries(asctl PRIVATE LibAudio LibIPC LibMain) +target_link_libraries(base64 PRIVATE LibMain) +target_link_libraries(basename PRIVATE LibMain) +target_link_libraries(beep PRIVATE LibMain) +target_link_libraries(blockdev PRIVATE LibMain) +target_link_libraries(bt PRIVATE LibSymbolication LibMain) +target_link_libraries(cal PRIVATE LibMain) +target_link_libraries(cat PRIVATE LibMain) +target_link_libraries(checksum PRIVATE LibCrypto LibMain) +target_link_libraries(chgrp PRIVATE LibMain) +target_link_libraries(chmod PRIVATE LibMain) +target_link_libraries(chown PRIVATE LibMain) +target_link_libraries(chres PRIVATE LibGUI LibIPC LibMain) +target_link_libraries(cksum PRIVATE LibCrypto LibMain) +target_link_libraries(clear PRIVATE LibMain) +target_link_libraries(cmp PRIVATE LibMain) +target_link_libraries(comm PRIVATE LibMain) +target_link_libraries(config PRIVATE LibConfig LibIPC LibMain) +target_link_libraries(copy PRIVATE LibGUI LibMain) +target_link_libraries(cp PRIVATE LibMain) +target_link_libraries(cpp-lexer PRIVATE LibCpp LibMain) +target_link_libraries(cpp-parser PRIVATE LibCpp LibMain) +target_link_libraries(cpp-preprocessor PRIVATE LibCpp LibMain) +target_link_libraries(cut PRIVATE LibMain) +target_link_libraries(date PRIVATE LibMain) +target_link_libraries(dd PRIVATE LibMain) +target_link_libraries(df PRIVATE LibMain) +target_link_libraries(diff PRIVATE LibDiff LibMain) +target_link_libraries(dirname PRIVATE LibMain) +target_link_libraries(disasm PRIVATE LibX86 LibMain) +target_link_libraries(disk_benchmark PRIVATE LibMain) +target_link_libraries(dmesg PRIVATE LibMain) +target_link_libraries(du PRIVATE LibMain) +target_link_libraries(echo PRIVATE LibMain) +target_link_libraries(env PRIVATE LibMain) +target_link_libraries(errno PRIVATE LibMain) +target_link_libraries(expr PRIVATE LibRegex LibMain) +target_link_libraries(false PRIVATE LibMain) +target_link_libraries(fdtdump PRIVATE LibDeviceTree LibMain) +target_link_libraries(fgrep PRIVATE LibMain) +target_link_libraries(file PRIVATE LibGfx LibIPC LibCompress LibMain) +target_link_libraries(find PRIVATE LibMain) +target_link_libraries(flock PRIVATE LibMain) +target_link_libraries(fortune PRIVATE LibMain) +target_link_libraries(functrace PRIVATE LibDebug LibX86 LibMain) +target_link_libraries(gml-format PRIVATE LibGUI LibMain) +target_link_libraries(grep PRIVATE LibRegex LibMain) +target_link_libraries(gron PRIVATE LibMain) +target_link_libraries(groupadd PRIVATE LibMain) +target_link_libraries(groupdel PRIVATE LibMain) +target_link_libraries(groups PRIVATE LibMain) +target_link_libraries(gunzip PRIVATE LibCompress LibMain) +target_link_libraries(gzip PRIVATE LibCompress LibMain) +target_link_libraries(head PRIVATE LibMain) +target_link_libraries(headless-browser PRIVATE LibCore LibCrypto LibGemini LibGfx LibHTTP LibTLS LibWeb LibWebSocket LibMain) +target_link_libraries(hexdump PRIVATE LibMain) +target_link_libraries(host PRIVATE LibMain) +target_link_libraries(hostname PRIVATE LibMain) +target_link_libraries(id PRIVATE LibMain) +target_link_libraries(ifconfig PRIVATE LibMain) +target_link_libraries(ini PRIVATE LibMain) +target_link_libraries(install-bin PRIVATE LibMain) +target_link_libraries(js PRIVATE LibCrypto LibJS LibLine LibLocale LibMain LibTextCodec) link_with_locale_data(js) -target_link_libraries(json LibMain) -target_link_libraries(kcov-example LibMain) -target_link_libraries(keymap LibKeyboard LibMain) -target_link_libraries(kill LibMain) -target_link_libraries(killall LibCore LibMain) -target_link_libraries(less LibMain) -target_link_libraries(ln LibMain) -target_link_libraries(logout LibMain) -target_link_libraries(ls LibMain) -target_link_libraries(lscpu LibMain) -target_link_libraries(lsirq LibMain) -target_link_libraries(lsof LibMain) -target_link_libraries(lsblk LibMain) -target_link_libraries(lspci LibPCIDB LibMain) -target_link_libraries(lsusb LibUSBDB LibMain) -target_link_libraries(man LibMarkdown LibMain) -target_link_libraries(markdown-check LibMarkdown LibMain) -target_link_libraries(matroska LibMain LibVideo) -target_link_libraries(md LibMarkdown LibMain) -target_link_libraries(mkdir LibMain) -target_link_libraries(mkfifo LibMain) -target_link_libraries(mknod LibMain) -target_link_libraries(mktemp LibMain) -target_link_libraries(mv LibMain) -target_link_libraries(mount LibMain) -target_link_libraries(nc LibMain) -target_link_libraries(netstat LibMain) -target_link_libraries(nl LibMain) -target_link_libraries(nologin LibMain) -target_link_libraries(notify LibGUI LibMain) -target_link_libraries(nproc LibMain) -target_link_libraries(ntpquery LibMain) -target_link_libraries(open LibDesktop LibMain) -target_link_libraries(passwd LibCrypt LibMain) -target_link_libraries(paste LibGUI LibCore LibMain) -target_link_libraries(pathchk LibMain) -target_link_libraries(pgrep LibRegex LibMain) -target_link_libraries(pidof LibMain) -target_link_libraries(ping LibMain) -target_link_libraries(pkill LibRegex LibMain) -target_link_libraries(pledge LibMain) -target_link_libraries(pls LibCrypt LibMain) -target_link_libraries(pmap LibMain) -target_link_libraries(pmemdump LibMain) -target_link_libraries(printf LibMain) -target_link_libraries(pro LibMain LibProtocol) -target_link_libraries(profile LibMain) -target_link_libraries(ps LibMain) -target_link_libraries(purge LibMain) -target_link_libraries(pwd LibMain) -target_link_libraries(readelf LibMain) -target_link_libraries(readlink LibMain) -target_link_libraries(realpath LibMain) -target_link_libraries(reboot LibMain) -target_link_libraries(rev LibMain) -target_link_libraries(rm LibMain) -target_link_libraries(rmdir LibMain) -target_link_libraries(route LibMain) -target_link_libraries(run-tests LibRegex LibCoredump LibMain) -target_link_libraries(seq LibMain) -target_link_libraries(shot LibGUI LibMain) -target_link_libraries(shuf LibMain) -target_link_libraries(shutdown LibMain) -target_link_libraries(sleep LibMain) -target_link_libraries(sort LibMain) -target_link_libraries(sql LibLine LibMain LibSQL LibIPC) -target_link_libraries(stat LibMain) -target_link_libraries(strace LibMain) -target_link_libraries(stty LibMain) -target_link_libraries(su LibCrypt LibMain) -target_link_libraries(sync LibMain) -target_link_libraries(syscall LibMain) -target_link_libraries(sysctl LibMain) -target_link_libraries(tac LibMain) -target_link_libraries(tail LibMain) -target_link_libraries(tar LibMain LibArchive LibCompress) -target_link_libraries(tee LibMain) -target_link_libraries(telws LibProtocol LibLine LibMain) -target_link_libraries(test-bindtodevice LibMain) -target_link_libraries(test-fuzz LibCore LibGemini LibGfx LibHTTP LibIPC LibJS LibMarkdown LibShell LibMain) -target_link_libraries(test-imap LibIMAP LibMain) -target_link_libraries(test-pthread LibThreading LibMain) -target_link_libraries(test-unveil LibMain) -target_link_libraries(test_env LibMain) -target_link_libraries(timezone LibMain) -target_link_libraries(top LibMain) -target_link_libraries(touch LibMain) -target_link_libraries(tr LibMain) -target_link_libraries(traceroute LibMain) -target_link_libraries(tree LibMain) -target_link_libraries(true LibMain) -target_link_libraries(truncate LibMain) -target_link_libraries(tt LibMain) -target_link_libraries(tty LibMain) -target_link_libraries(umount LibMain) -target_link_libraries(uname LibMain) -target_link_libraries(uniq LibMain) -target_link_libraries(unzip LibArchive LibCompress LibMain) -target_link_libraries(update-cpp-test-results LibCpp LibCore LibMain) -target_link_libraries(uptime LibMain) -target_link_libraries(useradd LibMain) -target_link_libraries(userdel LibMain) -target_link_libraries(usermod LibMain) -target_link_libraries(utmpupdate LibMain) -target_link_libraries(w LibMain) -target_link_libraries(wallpaper LibGUI LibMain) -target_link_libraries(wasm LibMain LibWasm LibLine) -target_link_libraries(watch LibMain) -target_link_libraries(wc LibMain) -target_link_libraries(which LibMain) -target_link_libraries(whoami LibMain) -target_link_libraries(wsctl LibGUI LibMain) -target_link_libraries(xargs LibMain) -target_link_libraries(xml LibMain LibXML) -target_link_libraries(yes LibMain) -target_link_libraries(zip LibArchive LibCompress LibCrypto LibMain) +target_link_libraries(json PRIVATE LibMain) +target_link_libraries(kcov-example PRIVATE LibMain) +target_link_libraries(keymap PRIVATE LibKeyboard LibMain) +target_link_libraries(kill PRIVATE LibMain) +target_link_libraries(killall PRIVATE LibCore LibMain) +target_link_libraries(less PRIVATE LibMain) +target_link_libraries(ln PRIVATE LibMain) +target_link_libraries(logout PRIVATE LibMain) +target_link_libraries(ls PRIVATE LibMain) +target_link_libraries(lscpu PRIVATE LibMain) +target_link_libraries(lsirq PRIVATE LibMain) +target_link_libraries(lsof PRIVATE LibMain) +target_link_libraries(lsblk PRIVATE LibMain) +target_link_libraries(lspci PRIVATE LibPCIDB LibMain) +target_link_libraries(lsusb PRIVATE LibUSBDB LibMain) +target_link_libraries(man PRIVATE LibMarkdown LibMain) +target_link_libraries(markdown-check PRIVATE LibMarkdown LibMain) +target_link_libraries(matroska PRIVATE LibMain LibVideo) +target_link_libraries(md PRIVATE LibMarkdown LibMain) +target_link_libraries(mkdir PRIVATE LibMain) +target_link_libraries(mkfifo PRIVATE LibMain) +target_link_libraries(mknod PRIVATE LibMain) +target_link_libraries(mktemp PRIVATE LibMain) +target_link_libraries(mv PRIVATE LibMain) +target_link_libraries(mount PRIVATE LibMain) +target_link_libraries(nc PRIVATE LibMain) +target_link_libraries(netstat PRIVATE LibMain) +target_link_libraries(nl PRIVATE LibMain) +target_link_libraries(nologin PRIVATE LibMain) +target_link_libraries(notify PRIVATE LibGfx LibGUI LibMain) +target_link_libraries(nproc PRIVATE LibMain) +target_link_libraries(ntpquery PRIVATE LibMain) +target_link_libraries(open PRIVATE LibDesktop LibMain) +target_link_libraries(passwd PRIVATE LibCrypt LibMain) +target_link_libraries(paste PRIVATE LibGUI LibCore LibMain) +target_link_libraries(pathchk PRIVATE LibMain) +target_link_libraries(pgrep PRIVATE LibRegex LibMain) +target_link_libraries(pidof PRIVATE LibMain) +target_link_libraries(ping PRIVATE LibMain) +target_link_libraries(pkill PRIVATE LibRegex LibMain) +target_link_libraries(pledge PRIVATE LibMain) +target_link_libraries(pls PRIVATE LibCrypt LibMain) +target_link_libraries(pmap PRIVATE LibMain) +target_link_libraries(pmemdump PRIVATE LibMain) +target_link_libraries(printf PRIVATE LibMain) +target_link_libraries(pro PRIVATE LibMain LibProtocol) +target_link_libraries(profile PRIVATE LibMain) +target_link_libraries(ps PRIVATE LibMain) +target_link_libraries(purge PRIVATE LibMain) +target_link_libraries(pwd PRIVATE LibMain) +target_link_libraries(readelf PRIVATE LibMain) +target_link_libraries(readlink PRIVATE LibMain) +target_link_libraries(realpath PRIVATE LibMain) +target_link_libraries(reboot PRIVATE LibMain) +target_link_libraries(rev PRIVATE LibMain) +target_link_libraries(rm PRIVATE LibMain) +target_link_libraries(rmdir PRIVATE LibMain) +target_link_libraries(route PRIVATE LibMain) +target_link_libraries(run-tests PRIVATE LibRegex LibCoredump LibDebug LibMain) +target_link_libraries(seq PRIVATE LibMain) +target_link_libraries(shot PRIVATE LibGfx LibGUI LibIPC LibMain) +target_link_libraries(shuf PRIVATE LibMain) +target_link_libraries(shutdown PRIVATE LibMain) +target_link_libraries(sleep PRIVATE LibMain) +target_link_libraries(sort PRIVATE LibMain) +target_link_libraries(sql PRIVATE LibLine LibMain LibSQL LibIPC) +target_link_libraries(stat PRIVATE LibMain) +target_link_libraries(strace PRIVATE LibMain) +target_link_libraries(stty PRIVATE LibMain) +target_link_libraries(su PRIVATE LibCrypt LibMain) +target_link_libraries(sync PRIVATE LibMain) +target_link_libraries(syscall PRIVATE LibMain LibSystem) +target_link_libraries(sysctl PRIVATE LibMain) +target_link_libraries(tac PRIVATE LibMain) +target_link_libraries(tail PRIVATE LibMain) +target_link_libraries(tar PRIVATE LibMain LibArchive LibCompress) +target_link_libraries(tee PRIVATE LibMain) +target_link_libraries(telws PRIVATE LibProtocol LibLine LibMain) +target_link_libraries(test-bindtodevice PRIVATE LibMain) +target_link_libraries(test-fuzz PRIVATE LibCore LibGemini LibGfx LibHTTP LibIPC LibJS LibMarkdown LibRegex LibShell LibMain) +target_link_libraries(test-imap PRIVATE LibIMAP LibMain) +target_link_libraries(test-pthread PRIVATE LibThreading LibMain) +target_link_libraries(test-unveil PRIVATE LibMain) +target_link_libraries(test_env PRIVATE LibMain) +target_link_libraries(timezone PRIVATE LibMain) +target_link_libraries(top PRIVATE LibMain) +target_link_libraries(touch PRIVATE LibMain) +target_link_libraries(tr PRIVATE LibMain) +target_link_libraries(traceroute PRIVATE LibMain) +target_link_libraries(tree PRIVATE LibMain) +target_link_libraries(true PRIVATE LibMain) +target_link_libraries(truncate PRIVATE LibMain) +target_link_libraries(tt PRIVATE LibMain) +target_link_libraries(tty PRIVATE LibMain) +target_link_libraries(umount PRIVATE LibMain) +target_link_libraries(uname PRIVATE LibMain) +target_link_libraries(uniq PRIVATE LibMain) +target_link_libraries(unzip PRIVATE LibArchive LibCompress LibMain) +target_link_libraries(update-cpp-test-results PRIVATE LibCpp LibCore LibMain) +target_link_libraries(uptime PRIVATE LibMain) +target_link_libraries(useradd PRIVATE LibCrypt LibMain) +target_link_libraries(userdel PRIVATE LibMain) +target_link_libraries(usermod PRIVATE LibMain) +target_link_libraries(utmpupdate PRIVATE LibMain) +target_link_libraries(w PRIVATE LibMain) +target_link_libraries(wallpaper PRIVATE LibGfx LibGUI LibMain) +target_link_libraries(wasm PRIVATE LibMain LibWasm LibLine) +target_link_libraries(watch PRIVATE LibMain) +target_link_libraries(wc PRIVATE LibMain) +target_link_libraries(which PRIVATE LibMain) +target_link_libraries(whoami PRIVATE LibMain) +target_link_libraries(wsctl PRIVATE LibGUI LibIPC LibMain) +target_link_libraries(xargs PRIVATE LibMain) +target_link_libraries(xml PRIVATE LibMain LibXML) +target_link_libraries(yes PRIVATE LibMain) +target_link_libraries(zip PRIVATE LibArchive LibCompress LibCrypto LibMain) -- cgit v1.2.3