diff --git a/WINGs/Makefile.am b/WINGs/Makefile.am index 5f8fa51a..3ada7950 100644 --- a/WINGs/Makefile.am +++ b/WINGs/Makefile.am @@ -10,12 +10,10 @@ libWUtil_la_LDFLAGS = -version-info @WUTIL_VERSION@ lib_LTLIBRARIES = libWUtil.la libWINGs.la -wutilrs = $(top_builddir)/wutil-rs/target/debug/libwutil_rs.a wraster = $(top_builddir)/wrlib/libwraster.la -LDADD= libWUtil.la libWINGs.la $(wraster) $(wutilrs) @INTLIBS@ -libWINGs_la_LIBADD = libWUtil.la $(wraster) $(wutilrs) @XLIBS@ @XFT_LIBS@ @FCLIBS@ @LIBM@ @PANGO_LIBS@ -libWUtil_la_LIBADD = $(wutilrs) +LDADD= libWUtil.la libWINGs.la $(wraster) @INTLIBS@ +libWINGs_la_LIBADD = libWUtil.la $(wraster) @XLIBS@ @XFT_LIBS@ @FCLIBS@ @LIBM@ @PANGO_LIBS@ EXTRA_DIST = BUGS make-rgb Examples Extras Tests diff --git a/WINGs/wings-rs-tests/Makefile.am b/WINGs/wings-rs-tests/Makefile.am index 78d6f4c8..8be4b65f 100644 --- a/WINGs/wings-rs-tests/Makefile.am +++ b/WINGs/wings-rs-tests/Makefile.am @@ -23,11 +23,6 @@ RUST_EXTRA = \ Cargo.lock \ Cargo.toml -wutil_c_lib = $(top_builddir)/WINGs/libWUtil.la -wings_c_lib = $(top_builddir)/WINGs/libWINGs.la -wings_rs_lib = $(top_builddir)/WINGs/wings-rs/target/debug/libwings_rs.a -wings_rs_test_lib = target/debug/libwings_rs_tests.rlib - rustlib: $(RUST_SOURCES) $(RUST_EXTRA) cargo build diff --git a/WINGs/wings-rs-tests/build.rs b/WINGs/wings-rs-tests/build.rs index 4dacd121..830385df 100644 --- a/WINGs/wings-rs-tests/build.rs +++ b/WINGs/wings-rs-tests/build.rs @@ -1,13 +1,9 @@ fn main() { - println!("cargo:rustc-link-lib=static=X11"); - println!("cargo:rustc-link-lib=static=xcb"); - println!("cargo:rustc-link-lib=static=Xau"); - println!("cargo:rustc-link-lib=static=Xdmcp"); - println!("cargo::rustc-link-search=../.libs"); + println!("cargo::rustc-link-arg=-lX11"); + println!("cargo::rustc-link-arg-tests=-lWUtil"); println!("cargo::rustc-link-arg-tests=-lWINGs"); - println!("cargo::rustc-link-arg-tests=-lX11"); println!("cargo::rustc-link-arg-tests=-lXft"); println!("cargo::rustc-link-arg-tests=-lpango-1.0"); println!("cargo::rustc-link-arg-tests=-lpangoxft-1.0"); diff --git a/WINGs/wings-rs/Cargo.toml b/WINGs/wings-rs/Cargo.toml index 3d12b5ed..0ddf2dac 100644 --- a/WINGs/wings-rs/Cargo.toml +++ b/WINGs/wings-rs/Cargo.toml @@ -4,7 +4,7 @@ version = "0.1.0" edition = "2024" [lib] -crate-type = ["staticlib", "rlib"] +crate-type = ["cdylib", "rlib"] [dependencies] libc = "0.2.177" diff --git a/WINGs/wings-rs/Makefile.am b/WINGs/wings-rs/Makefile.am index ea2e386b..6c22a04a 100644 --- a/WINGs/wings-rs/Makefile.am +++ b/WINGs/wings-rs/Makefile.am @@ -60,7 +60,7 @@ src/WINGsP.rs: ../WINGs/WINGsP.h ../../wrlib/wraster.h ../WINGs/WINGs.h ../WINGs Cargo.lock: $(CARGO) build -target/debug/libwings_rs.a: $(RUST_SOURCES) $(RUST_EXTRA) +target/debug/libwings_rs.so: $(RUST_SOURCES) $(RUST_EXTRA) $(CARGO) build check-local: @@ -70,4 +70,4 @@ clean-local: $(CARGO) clean rm -f src/WINGsP.rs -all: target/debug/libwings_rs.a +all: target/debug/libwings_rs.so diff --git a/WPrefs.app/Makefile.am b/WPrefs.app/Makefile.am index 13621007..37c34b87 100644 --- a/WPrefs.app/Makefile.am +++ b/WPrefs.app/Makefile.am @@ -66,9 +66,9 @@ AM_CPPFLAGS = -DRESOURCE_PATH=\"$(wpdatadir)\" -DWMAKER_RESOURCE_PATH=\"$(pkgdat WPrefs_DEPENDENCIES = $(top_builddir)/WINGs/libWINGs.la WPrefs_LDADD = \ - $(top_builddir)/wutil-rs/target/debug/libwutil_rs.a\ + $(top_builddir)/wutil-rs/target/debug/libwutil_rs.so\ $(top_builddir)/WINGs/libWINGs.la\ - $(top_builddir)/WINGs/wings-rs/target/debug/libwings_rs.a\ + $(top_builddir)/WINGs/wings-rs/target/debug/libwings_rs.so\ $(top_builddir)/WINGs/libWUtil.la\ $(top_builddir)/wrlib/libwraster.la \ @PANGO_LIBS@ \ diff --git a/src/Makefile.am b/src/Makefile.am index b967829b..18fc976c 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -155,14 +155,18 @@ AM_CPPFLAGS = $(DFLAGS) \ -I$(top_srcdir)/WINGs -I$(top_builddir)/WINGs \ @HEADER_SEARCH_PATH@ +wmaker_LDFLAGS = \ + -L$(top_builddir)/wutil-rs/target/debug \ + -L$(top_builddir)/WINGs/wings-rs/target/debug \ + -L$(top_builddir)/wmaker-rs/target/debug wmaker_LDADD = \ $(top_builddir)/WINGs/libWINGs.la\ $(top_builddir)/WINGs/libWUtil.la\ $(top_builddir)/wrlib/libwraster.la\ - $(top_builddir)/wutil-rs/target/debug/libwutil_rs.a\ - $(top_builddir)/WINGs/wings-rs/target/debug/libwings_rs.a\ - $(top_builddir)/wmaker-rs/target/debug/libwmaker_rs.a\ + -lwutil_rs\ + -lwings_rs\ + -lwmaker_rs\ @PANGO_LIBS@ \ @FCLIBS@ \ @XLFLAGS@ \ diff --git a/start-captive-wmaker.sh b/start-captive-wmaker.sh index 35278414..55240284 100755 --- a/start-captive-wmaker.sh +++ b/start-captive-wmaker.sh @@ -54,7 +54,7 @@ rename_dir_if_possible "$wm_style" "$wm_styles" make_dir_if_needed "$wm_styles" make_dir_if_needed "$wm_themes" -export LD_LIBRARY_PATH="$project_base/wrlib/.libs:$project_base/WINGs/.libs:$LD_LIBRARY_PATH" +export LD_LIBRARY_PATH="$project_base/WINGs/wings-rs/target/debug:$project_base/wutil-rs/target/debug:$project_base/wmaker-rs/target/debug:$project_base/wrlib/.libs:$project_base/WINGs/.libs:$LD_LIBRARY_PATH" copy_defaults_if_needed WindowMaker copy_defaults_if_needed WMRootMenu diff --git a/util/Makefile.am b/util/Makefile.am index c4d6bec6..9271326d 100644 --- a/util/Makefile.am +++ b/util/Makefile.am @@ -18,77 +18,115 @@ AM_CPPFLAGS = \ liblist= @LIBRARY_SEARCH_PATH@ @INTLIBS@ +wdwrite_LDFLAGS = \ + -L$(top_builddir)/wutil-rs/target/debug + wdwrite_LDADD = \ $(top_builddir)/WINGs/libWUtil.la \ - $(top_builddir)/wutil-rs/target/debug/libwutil_rs.a \ + -lwutil_rs \ $(liblist) +wdread_LDFLAGS = \ + -L$(top_builddir)/wutil-rs/target/debug + wdread_LDADD = \ $(top_builddir)/WINGs/libWUtil.la \ - $(top_builddir)/wutil-rs/target/debug/libwutil_rs.a \ + -lwutil_rs \ $(liblist) -wxcopy_LDADD = @XLFLAGS@ @XLIBS@ \ - $(top_builddir)/wutil-rs/target/debug/libwutil_rs.a +wxcopy_LDFLAGS = \ + -L$(top_builddir)/wutil-rs/target/debug + +wxcopy_LDADD = @XLFLAGS@ @XLIBS@ -lwutil_rs wxpaste_LDADD = @XLFLAGS@ @XLIBS@ +getstyle_LDFLAGS = \ + -L$(top_builddir)/wutil-rs/target/debug + getstyle_LDADD = \ $(top_builddir)/WINGs/libWUtil.la \ - $(top_builddir)/wutil-rs/target/debug/libwutil_rs.a \ + -lwutil_rs \ $(liblist) getstyle_SOURCES = getstyle.c fontconv.c common.h +setstyle_LDFLAGS = \ + -L$(top_builddir)/wutil-rs/target/debug + setstyle_LDADD = \ $(top_builddir)/WINGs/libWUtil.la \ - $(top_builddir)/wutil-rs/target/debug/libwutil_rs.a \ + -lwutil_rs \ @XLFLAGS@ @XLIBS@ $(liblist) setstyle_SOURCES = setstyle.c fontconv.c common.h +convertfonts_LDFLAGS = \ + -L$(top_builddir)/wutil-rs/target/debug + convertfonts_LDADD = \ $(top_builddir)/WINGs/libWUtil.la \ - $(top_builddir)/wutil-rs/target/debug/libwutil_rs.a \ + -lwutil_rs \ $(liblist) convertfonts_SOURCES = convertfonts.c fontconv.c common.h +seticons_LDFLAGS = \ + -L$(top_builddir)/wutil-rs/target/debug + seticons_LDADD= \ $(top_builddir)/WINGs/libWUtil.la \ - $(top_builddir)/wutil-rs/target/debug/libwutil_rs.a \ + -lwutil_rs \ $(liblist) +geticonset_LDFLAGS = \ + -L$(top_builddir)/wutil-rs/target/debug + geticonset_LDADD= \ $(top_builddir)/WINGs/libWUtil.la \ - $(top_builddir)/wutil-rs/target/debug/libwutil_rs.a \ + -lwutil_rs \ $(liblist) +wmagnify_LDFLAGS = \ + -L$(top_builddir)/WINGs/wings-rs/target/debug \ + -L$(top_builddir)/wutil-rs/target/debug + wmagnify_LDADD = \ $(top_builddir)/WINGs/libWINGs.la \ $(top_builddir)/WINGs/libWUtil.la \ - $(top_builddir)/WINGs/wings-rs/target/debug/libwings_rs.a \ $(top_builddir)/wrlib/libwraster.la \ + -lwutil_rs \ + -lwings_rs \ @XLFLAGS@ @XLIBS@ @INTLIBS@ @FCLIBS@ @PANGO_LIBS@ +wmsetbg_LDFLAGS = \ + -L$(top_builddir)/wutil-rs/target/debug \ + -L$(top_builddir)/WINGs/wings-rs/target/debug + wmsetbg_LDADD = \ $(top_builddir)/WINGs/libWINGs.la \ - $(top_builddir)/wutil-rs/target/debug/libwutil_rs.a \ - $(top_builddir)/WINGs/wings-rs/target/debug/libwings_rs.a \ $(top_builddir)/WINGs/libWUtil.la \ $(top_builddir)/wrlib/libwraster.la \ + -lwings_rs \ + -lwutil_rs \ @XLFLAGS@ @LIBXINERAMA@ @XLIBS@ @INTLIBS@ @FCLIBS@ @PANGO_LIBS@ +wmgenmenu_LDFLAGS = \ + -L$(top_builddir)/wutil-rs/target/debug + wmgenmenu_LDADD = \ $(top_builddir)/WINGs/libWUtil.la \ - $(top_builddir)/wutil-rs/target/debug/libwutil_rs.a \ + -lwutil_rs \ @INTLIBS@ wmgenmenu_SOURCES = wmgenmenu.c wmgenmenu.h +wmmenugen_LDFLAGS = \ + -L$(top_builddir)/wutil-rs/target/debug + wmmenugen_LDADD = \ - $(top_builddir)/wutil-rs/target/debug/libwutil_rs.a \ $(top_builddir)/WINGs/libWUtil.la \ + -lwutil_rs \ @INTLIBS@ wmmenugen_SOURCES = wmmenugen.c wmmenugen.h wmmenugen_misc.c \ @@ -97,12 +135,16 @@ wmmenugen_SOURCES = wmmenugen.c wmmenugen.h wmmenugen_misc.c \ wmiv_CFLAGS = @PANGO_CFLAGS@ @PTHREAD_CFLAGS@ +wmiv_LDFLAGS = \ + -L$(top_builddir)/WINGs/wings-rs/target/debug \ + -L$(top_builddir)/wutil-rs/target/debug + wmiv_LDADD = \ $(top_builddir)/wrlib/libwraster.la \ - $(top_builddir)/WINGs/libWINGs.la \ $(top_builddir)/WINGs/libWUtil.la \ - $(top_builddir)/wutil-rs/target/debug/libwutil_rs.a \ - $(top_builddir)/WINGs/wings-rs/target/debug/libwings_rs.a \ + $(top_builddir)/WINGs/libWINGs.la \ + -lwings_rs \ + -lwutil_rs \ @XLFLAGS@ @XLIBS@ @GFXLIBS@ \ @PANGO_LIBS@ @PTHREAD_LIBS@ @LIBEXIF@ diff --git a/wmaker-rs/Cargo.toml b/wmaker-rs/Cargo.toml index bc2c4d82..48dab099 100644 --- a/wmaker-rs/Cargo.toml +++ b/wmaker-rs/Cargo.toml @@ -4,7 +4,7 @@ version = "0.1.0" edition = "2024" [lib] -crate-type = ["staticlib"] +crate-type = ["cdylib"] [dependencies] x11 = "2.21.0" diff --git a/wmaker-rs/Makefile.am b/wmaker-rs/Makefile.am index 1301fc1b..ff3ae410 100644 --- a/wmaker-rs/Makefile.am +++ b/wmaker-rs/Makefile.am @@ -21,7 +21,7 @@ RUST_SOURCES = \ RUST_EXTRA = \ Cargo.lock -target/debug/libwmaker_rs.a: $(RUST_SOURCES) $(RUST_EXTRA) +target/debug/libwmaker_rs.so: $(RUST_SOURCES) $(RUST_EXTRA) $(CARGO) build check-local: @@ -30,4 +30,4 @@ check-local: clean-local: $(CARGO) clean -all: target/debug/libwmaker_rs.a +all: target/debug/libwmaker_rs.so diff --git a/wutil-rs/Cargo.toml b/wutil-rs/Cargo.toml index d9f7277b..b4b1c6c5 100644 --- a/wutil-rs/Cargo.toml +++ b/wutil-rs/Cargo.toml @@ -4,7 +4,7 @@ version = "0.1.0" edition = "2024" [lib] -crate-type = ["staticlib","rlib"] +crate-type = ["cdylib","rlib"] [build-dependencies] cc = "1.0" diff --git a/wutil-rs/Makefile.am b/wutil-rs/Makefile.am index fa126788..6b845741 100644 --- a/wutil-rs/Makefile.am +++ b/wutil-rs/Makefile.am @@ -24,7 +24,7 @@ RUST_EXTRA = \ Cargo.lock: $(CARGO) build -target/debug/libwutil_rs.a: $(RUST_SOURCES) $(RUST_EXTRA) +target/debug/libwutil_rs.so: $(RUST_SOURCES) $(RUST_EXTRA) $(CARGO) build check-local: @@ -33,4 +33,4 @@ check-local: clean-local: $(CARGO) clean -all: target/debug/libwutil_rs.a +all: target/debug/libwutil_rs.so