link w/ libflux.la not watcher.lo

flux-framework · Dec 15, 2024 · e5f3da4 · e5f3da4
1 parent eb36970
commit e5f3da4
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 17 deletions.
diff --git a/src/cmd/Makefile.am b/src/cmd/Makefile.am
@@ -175,19 +175,19 @@ flux_start_LDADD = \
 
 flux_job_LDADD = \
 	$(top_builddir)/src/common/libsubprocess/libsubprocess.la \
-	$(top_builddir)/src/common/libflux/watcher.lo \
 	$(top_builddir)/src/shell/libmpir.la \
 	$(top_builddir)/src/common/libjob/libjob.la \
 	$(top_builddir)/src/common/libutil/libutil.la \
 	$(top_builddir)/src/common/libczmqcontainers/libczmqcontainers.la \
 	$(top_builddir)/src/common/libdebugged/libdebugged.la \
 	$(top_builddir)/src/common/libterminus/libterminus.la \
-	$(fluxcmd_ldadd)
+	$(fluxcmd_ldadd) \
+	$(top_builddir)/src/common/libflux/libflux.la
 
 flux_exec_LDADD = \
 	$(top_builddir)/src/common/libsubprocess/libsubprocess.la \
-	$(top_builddir)/src/common/libflux/watcher.lo \
-	$(fluxcmd_ldadd)
+	$(fluxcmd_ldadd) \
+	$(top_builddir)/src/common/libflux/libflux.la
 
 flux_terminus_LDADD = \
 	$(top_builddir)/src/common/libterminus/libterminus.la \

diff --git a/src/common/libsubprocess/Makefile.am b/src/common/libsubprocess/Makefile.am
@@ -79,8 +79,8 @@ test_ldadd = \
         $(top_builddir)/src/common/libtestutil/libtestutil.la \
         $(top_builddir)/src/common/libtap/libtap.la \
         $(top_builddir)/src/common/libsubprocess/libsubprocess.la \
-        $(top_builddir)/src/common/libflux/watcher.lo \
         $(top_builddir)/src/common/libflux-core.la \
+        $(top_builddir)/src/common/libflux/libflux.la \
         $(top_builddir)/src/common/libflux-internal.la
 
 test_ldflags = \

diff --git a/src/modules/Makefile.am b/src/modules/Makefile.am
@@ -142,9 +142,9 @@ job_exec_la_LIBADD = \
 	$(builddir)/job-exec/libjob-exec.la \
 	$(top_builddir)/src/common/libjob/libjob.la \
 	$(top_builddir)/src/common/libsubprocess/libsubprocess.la \
-	$(top_builddir)/src/common/libflux/watcher.lo \
 	$(top_builddir)/src/common/libflux-internal.la \
 	$(top_builddir)/src/common/libflux-core.la \
+	$(top_builddir)/src/common/libflux/libflux.la \
 	$(JANSSON_LIBS)
 job_exec_la_LDFLAGS = $(fluxmod_ldflags) -module
 
@@ -207,9 +207,9 @@ job_manager_la_LIBADD = \
 	$(builddir)/job-manager/libjob-manager.la \
 	$(top_builddir)/src/common/libjob/libjob.la \
 	$(top_builddir)/src/common/libsubprocess/libsubprocess.la \
-	$(top_builddir)/src/common/libflux/watcher.lo \
 	$(top_builddir)/src/common/libflux-internal.la \
 	$(top_builddir)/src/common/libflux-core.la \
+	$(top_builddir)/src/common/libflux/libflux.la \
 	$(top_builddir)/src/common/libflux-optparse.la \
 	$(top_builddir)/src/common/librlist/librlist.la \
 	$(JANSSON_LIBS)
@@ -284,8 +284,8 @@ sdexec_la_LDFLAGS = $(fluxmod_ldflags) -module
 sdbus_la_SOURCES =
 sdbus_la_LIBADD = \
 	$(builddir)/sdbus/libsdbus.la \
-	$(top_builddir)/src/common/libflux/watcher.lo \
 	$(top_builddir)/src/common/libflux-core.la \
+	$(top_builddir)/src/common/libflux/libflux.la \
 	$(top_builddir)/src/common/libflux-internal.la \
 	$(JANSSON_LIBS)
 if HAVE_LIBSYSTEMD

diff --git a/src/modules/job-manager/Makefile.am b/src/modules/job-manager/Makefile.am
@@ -111,8 +111,9 @@ plugins_perilog_la_SOURCES = \
 	plugins/perilog.c
 plugins_perilog_la_LIBADD = \
 	$(top_builddir)/src/common/libsubprocess/libsubprocess.la \
-	$(top_builddir)/src/common/libflux/watcher.lo \
 	$(top_builddir)/src/common/libflux-internal.la \
+	$(top_builddir)/src/common/libflux-core.la \
+	$(top_builddir)/src/common/libflux/libflux.la \
 	$(top_builddir)/src/common/librlist/librlist.la \
 	$(top_builddir)/src/common/libjob/libjob.la
 plugins_perilog_la_LDFLAGS = \
@@ -132,10 +133,10 @@ test_ldadd = \
 	libjob-manager.la \
 	$(top_builddir)/src/common/libtap/libtap.la \
 	$(top_builddir)/src/common/libsubprocess/libsubprocess.la \
-	$(top_builddir)/src/common/libflux/watcher.lo \
 	$(top_builddir)/src/common/librlist/librlist.la \
 	$(top_builddir)/src/common/libjob/libjob.la \
 	$(top_builddir)/src/common/libflux-core.la \
+	$(top_builddir)/src/common/libflux/libflux.la \
 	$(top_builddir)/src/common/libflux-internal.la \
 	$(LIBPTHREAD) \
 	$(JANSSON_LIBS)

diff --git a/src/shell/Makefile.am b/src/shell/Makefile.am
@@ -116,7 +116,7 @@ flux_shell_LDADD = \
 	$(top_builddir)/src/common/libflux-taskmap.la \
 	$(top_builddir)/src/common/libflux-idset.la \
 	$(top_builddir)/src/common/libsubprocess/libsubprocess.la \
-	$(top_builddir)/src/common/libflux/watcher.lo \
+	$(top_builddir)/src/common/libflux/libflux.la \
 	$(top_builddir)/src/common/libpmi/libpmi_server.la \
 	$(top_builddir)/src/common/libpmi/libpmi_common.la \
 	$(top_builddir)/src/common/libczmqcontainers/libczmqcontainers.la \

diff --git a/t/Makefile.am b/t/Makefile.am
@@ -749,16 +749,16 @@ reactor_reactorcat_CPPFLAGS = $(test_cppflags)
 reactor_reactorcat_LDADD = $(test_ldadd)
 reactor_reactorcat_LDFLAGS = \
 	$(top_builddir)/src/common/libsubprocess/libsubprocess.la \
-	$(top_builddir)/src/common/libflux/watcher.lo \
-	$(test_ldflags)
+	$(test_ldflags) \
+	$(top_builddir)/src/common/libflux/libflux.la
 
 rexec_rexec_SOURCES = rexec/rexec.c
 rexec_rexec_CPPFLAGS = $(test_cppflags)
 rexec_rexec_LDADD = $(test_ldadd)
 rexec_rexec_LDFLAGS = \
 	$(top_builddir)/src/common/libsubprocess/libsubprocess.la \
-	$(top_builddir)/src/common/libflux/watcher.lo \
-	$(test_ldflags)
+	$(test_ldflags) \
+	$(top_builddir)/src/common/libflux/libflux.la
 
 rexec_rexec_count_stdout_SOURCES = rexec/rexec_count_stdout.c
 rexec_rexec_count_stdout_CPPFLAGS = $(test_cppflags)
@@ -770,8 +770,8 @@ rexec_rexec_getline_CPPFLAGS = $(test_cppflags)
 rexec_rexec_getline_LDADD = $(test_ldadd)
 rexec_rexec_getline_LDFLAGS = \
 	$(top_builddir)/src/common/libsubprocess/libsubprocess.la \
-	$(top_builddir)/src/common/libflux/watcher.lo \
-	$(test_ldflags)
+	$(test_ldflags) \
+	$(top_builddir)/src/common/libflux/libflux.la
 
 ingest_job_manager_la_SOURCES = ingest/job-manager.c
 ingest_job_manager_la_CPPFLAGS = $(test_cppflags)