diff --git a/common/Makefile.in b/common/Makefile.in index c31e3a58a..aed7b5f97 100644 --- a/common/Makefile.in +++ b/common/Makefile.in @@ -77,7 +77,7 @@ CONF_TEST_OBJS = conf_test.lo locale_stub.lo HLTQ_TEST_OBJS = hltq_test.lo locale_stub.lo -all: libcommon.la +all: libsudo_util.la Makefile: $(srcdir)/Makefile.in (cd $(top_builddir) && ./config.status --file common/Makefile) @@ -87,17 +87,17 @@ Makefile: $(srcdir)/Makefile.in .c.lo: $(LIBTOOL) --mode=compile $(CC) -c -o $@ $(CPPFLAGS) $(CFLAGS) $(PIE_CFLAGS) $(SSP_CFLAGS) $(DEFS) $< -libcommon.la: $(LTOBJS) +libsudo_util.la: $(LTOBJS) $(LIBTOOL) --mode=link $(CC) -o $@ $(LTOBJS) -no-install -conf_test: $(CONF_TEST_OBJS) libcommon.la - $(LIBTOOL) --mode=link $(CC) -o $@ $(CONF_TEST_OBJS) libcommon.la $(PIE_LDFLAGS) $(SSP_LDFLAGS) $(TEST_LDFLAGS) $(TEST_LIBS) +conf_test: $(CONF_TEST_OBJS) libsudo_util.la + $(LIBTOOL) --mode=link $(CC) -o $@ $(CONF_TEST_OBJS) libsudo_util.la $(PIE_LDFLAGS) $(SSP_LDFLAGS) $(TEST_LDFLAGS) $(TEST_LIBS) -parseln_test: $(PARSELN_TEST_OBJS) libcommon.la - $(LIBTOOL) --mode=link $(CC) -o $@ $(PARSELN_TEST_OBJS) libcommon.la $(PIE_LDFLAGS) $(SSP_LDFLAGS) $(TEST_LDFLAGS) $(TEST_LIBS) +parseln_test: $(PARSELN_TEST_OBJS) libsudo_util.la + $(LIBTOOL) --mode=link $(CC) -o $@ $(PARSELN_TEST_OBJS) libsudo_util.la $(PIE_LDFLAGS) $(SSP_LDFLAGS) $(TEST_LDFLAGS) $(TEST_LIBS) -hltq_test: $(HLTQ_TEST_OBJS) libcommon.la - $(LIBTOOL) --mode=link $(CC) -o $@ $(HLTQ_TEST_OBJS) libcommon.la $(PIE_LDFLAGS) $(SSP_LDFLAGS) $(TEST_LDFLAGS) $(TEST_LIBS) +hltq_test: $(HLTQ_TEST_OBJS) libsudo_util.la + $(LIBTOOL) --mode=link $(CC) -o $@ $(HLTQ_TEST_OBJS) libsudo_util.la $(PIE_LDFLAGS) $(SSP_LDFLAGS) $(TEST_LDFLAGS) $(TEST_LIBS) pre-install: diff --git a/plugins/sudoers/Makefile.in b/plugins/sudoers/Makefile.in index 60238663e..14d9cc3bd 100644 --- a/plugins/sudoers/Makefile.in +++ b/plugins/sudoers/Makefile.in @@ -46,7 +46,7 @@ PERL = perl INSTALL = $(SHELL) $(top_srcdir)/install-sh -c # Libraries -LT_LIBS = $(top_builddir)/common/libcommon.la $(LIBOBJDIR)libreplace.la +LT_LIBS = $(top_builddir)/common/libsudo_util.la $(LIBOBJDIR)libreplace.la LIBS = $(LT_LIBS) @LIBINTL@ NET_LIBS = @NET_LIBS@ SUDOERS_LIBS = @SUDOERS_LIBS@ @AFS_LIBS@ @GETGROUPS_LIB@ $(LIBS) $(NET_LIBS) @ZLIB@ @LIBDL@ diff --git a/src/Makefile.in b/src/Makefile.in index af3ea11b0..b5785a7c1 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -34,7 +34,7 @@ LIBTOOL = @LIBTOOL@ @LT_STATIC@ INSTALL = $(SHELL) $(top_srcdir)/install-sh -c # Libraries -LT_LIBS = $(top_builddir)/common/libcommon.la $(LIBOBJDIR)libreplace.la +LT_LIBS = $(top_builddir)/common/libsudo_util.la $(LIBOBJDIR)libreplace.la LIBS = @LIBS@ @SUDO_LIBS@ @GETGROUPS_LIB@ @NET_LIBS@ @LIBINTL@ $(LT_LIBS) @LIBDL@ # C preprocessor flags @@ -126,7 +126,7 @@ libsudo_noexec.la: sudo_noexec.lo sesh: $(SESH_OBJS) @LIBINTL@ $(LT_LIBS) $(LIBTOOL) --mode=link $(CC) -o $@ $(SESH_OBJS) $(LDFLAGS) $(PIE_LDFLAGS) $(SSP_LDFLAGS) @LIBINTL@ $(LIBS) -check_ttyname: $(CHECK_TTYNAME_OBJS) $(top_builddir)/common/libcommon.la $(LIBOBJDIR)libreplace.la +check_ttyname: $(CHECK_TTYNAME_OBJS) $(top_builddir)/common/libsudo_util.la $(LIBOBJDIR)libreplace.la $(LIBTOOL) --mode=link $(CC) -o $@ $(CHECK_TTYNAME_OBJS) $(TEST_LDFLAGS) $(PIE_LDFLAGS) $(SSP_LDFLAGS) $(TEST_LIBS) pre-install: