Skip to content
Snippets Groups Projects
Commit 2cefac42 authored by Tim Wickberg's avatar Tim Wickberg
Browse files

nss_slurm - adjust build options. 

Use lib_LTLIBRARIES instead of pkglib_LTLIBRARIES to avoid being installed
under the lib/slurm/ directory.

Change to -shrext .so.2 -avoid-version to install once, and avoid libtool's
automatic versioning. (Idea borrowed from nss-mdns's Makefile.am .)
parent 965d99b7
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
contribs/nss_slurm/Makefile.am
+ 3
− 3
View file @ 2cefac42
...@@ -4,10 +4,10 @@ ...@@ -4,10 +4,10 @@
AUTOMAKE_OPTIONS = foreign AUTOMAKE_OPTIONS = foreign
AM_CPPFLAGS = -fPIC -I$(top_srcdir) -I$(top_srcdir)/src/common AM_CPPFLAGS = -fPIC -I$(top_srcdir)/src/common
PLUGIN_FLAGS = --export-dynamic -version-info 2:0:0 PLUGIN_FLAGS = --export-dynamic -shrext .so.2 -avoid-version
pkglib_LTLIBRARIES = libnss_slurm.la lib_LTLIBRARIES = libnss_slurm.la
libnss_slurm_la_SOURCES = libnss_slurm.c libnss_slurm_la_SOURCES = libnss_slurm.c
......
contribs/nss_slurm/Makefile.in
+ 35
− 36
View file @ 2cefac42
...@@ -174,8 +174,8 @@ am__uninstall_files_from_dir = { \ ...@@ -174,8 +174,8 @@ am__uninstall_files_from_dir = { \
|| { echo " ( cd '$$dir' && rm -f" $$files ")"; \ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
$(am__cd) "$$dir" && rm -f $$files; }; \ $(am__cd) "$$dir" && rm -f $$files; }; \
} }
am__installdirs = "$(DESTDIR)$(pkglibdir)" am__installdirs = "$(DESTDIR)$(libdir)"
LTLIBRARIES = $(pkglib_LTLIBRARIES) LTLIBRARIES = $(lib_LTLIBRARIES)
libnss_slurm_la_DEPENDENCIES = $(top_builddir)/src/api/libslurm.la libnss_slurm_la_DEPENDENCIES = $(top_builddir)/src/api/libslurm.la
am_libnss_slurm_la_OBJECTS = libnss_slurm.lo am_libnss_slurm_la_OBJECTS = libnss_slurm.lo
libnss_slurm_la_OBJECTS = $(am_libnss_slurm_la_OBJECTS) libnss_slurm_la_OBJECTS = $(am_libnss_slurm_la_OBJECTS)
...@@ -495,9 +495,9 @@ top_build_prefix = @top_build_prefix@ ...@@ -495,9 +495,9 @@ top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@ top_builddir = @top_builddir@
top_srcdir = @top_srcdir@ top_srcdir = @top_srcdir@
AUTOMAKE_OPTIONS = foreign AUTOMAKE_OPTIONS = foreign
AM_CPPFLAGS = -fPIC -I$(top_srcdir) -I$(top_srcdir)/src/common AM_CPPFLAGS = -fPIC -I$(top_srcdir)/src/common
PLUGIN_FLAGS = --export-dynamic -version-info 2:0:0 PLUGIN_FLAGS = --export-dynamic -shrext .so.2 -avoid-version
pkglib_LTLIBRARIES = libnss_slurm.la lib_LTLIBRARIES = libnss_slurm.la
libnss_slurm_la_SOURCES = libnss_slurm.c libnss_slurm_la_SOURCES = libnss_slurm.c
libnss_slurm_la_LIBADD = $(top_builddir)/src/api/libslurm.la libnss_slurm_la_LIBADD = $(top_builddir)/src/api/libslurm.la
libnss_slurm_la_LDFLAGS = $(PLUGIN_FLAGS) $(LIB_LDFLAGS) libnss_slurm_la_LDFLAGS = $(PLUGIN_FLAGS) $(LIB_LDFLAGS)
...@@ -535,33 +535,33 @@ $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) ...@@ -535,33 +535,33 @@ $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
$(am__aclocal_m4_deps): $(am__aclocal_m4_deps):
install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES) install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL) @$(NORMAL_INSTALL)
@list='$(pkglib_LTLIBRARIES)'; test -n "$(pkglibdir)" || list=; \ @list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \
list2=; for p in $$list; do \ list2=; for p in $$list; do \
if test -f $$p; then \ if test -f $$p; then \
list2="$$list2 $$p"; \ list2="$$list2 $$p"; \
else :; fi; \ else :; fi; \
done; \ done; \
test -z "$$list2" || { \ test -z "$$list2" || { \
echo " $(MKDIR_P) '$(DESTDIR)$(pkglibdir)'"; \ echo " $(MKDIR_P) '$(DESTDIR)$(libdir)'"; \
$(MKDIR_P) "$(DESTDIR)$(pkglibdir)" || exit 1; \ $(MKDIR_P) "$(DESTDIR)$(libdir)" || exit 1; \
echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(pkglibdir)'"; \ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(libdir)'"; \
$(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(pkglibdir)"; \ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(libdir)"; \
} }
uninstall-pkglibLTLIBRARIES: uninstall-libLTLIBRARIES:
@$(NORMAL_UNINSTALL) @$(NORMAL_UNINSTALL)
@list='$(pkglib_LTLIBRARIES)'; test -n "$(pkglibdir)" || list=; \ @list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \
for p in $$list; do \ for p in $$list; do \
$(am__strip_dir) \ $(am__strip_dir) \
echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(pkglibdir)/$$f'"; \ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$f'"; \
$(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(pkglibdir)/$$f"; \ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$f"; \
done done
clean-pkglibLTLIBRARIES: clean-libLTLIBRARIES:
-test -z "$(pkglib_LTLIBRARIES)" || rm -f $(pkglib_LTLIBRARIES) -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
@list='$(pkglib_LTLIBRARIES)'; \ @list='$(lib_LTLIBRARIES)'; \
locs=`for p in $$list; do echo $$p; done | \ locs=`for p in $$list; do echo $$p; done | \
sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \
sort -u`; \ sort -u`; \
...@@ -571,7 +571,7 @@ clean-pkglibLTLIBRARIES: ...@@ -571,7 +571,7 @@ clean-pkglibLTLIBRARIES:
} }
libnss_slurm.la: $(libnss_slurm_la_OBJECTS) $(libnss_slurm_la_DEPENDENCIES) $(EXTRA_libnss_slurm_la_DEPENDENCIES) libnss_slurm.la: $(libnss_slurm_la_OBJECTS) $(libnss_slurm_la_DEPENDENCIES) $(EXTRA_libnss_slurm_la_DEPENDENCIES)
$(AM_V_CCLD)$(libnss_slurm_la_LINK) -rpath $(pkglibdir) $(libnss_slurm_la_OBJECTS) $(libnss_slurm_la_LIBADD) $(LIBS) $(AM_V_CCLD)$(libnss_slurm_la_LINK) -rpath $(libdir) $(libnss_slurm_la_OBJECTS) $(libnss_slurm_la_LIBADD) $(LIBS)
mostlyclean-compile: mostlyclean-compile:
-rm -f *.$(OBJEXT) -rm -f *.$(OBJEXT)
...@@ -703,7 +703,7 @@ check-am: all-am ...@@ -703,7 +703,7 @@ check-am: all-am
check: check-am check: check-am
all-am: Makefile $(LTLIBRARIES) all-am: Makefile $(LTLIBRARIES)
installdirs: installdirs:
for dir in "$(DESTDIR)$(pkglibdir)"; do \ for dir in "$(DESTDIR)$(libdir)"; do \
test -z "$$dir" || $(MKDIR_P) "$$dir"; \ test -z "$$dir" || $(MKDIR_P) "$$dir"; \
done done
install: install-am install: install-am
...@@ -738,7 +738,7 @@ maintainer-clean-generic: ...@@ -738,7 +738,7 @@ maintainer-clean-generic:
@echo "it deletes files that may require special tools to rebuild." @echo "it deletes files that may require special tools to rebuild."
clean: clean-am clean: clean-am
clean-am: clean-generic clean-libtool clean-pkglibLTLIBRARIES \ clean-am: clean-generic clean-libLTLIBRARIES clean-libtool \
mostlyclean-am mostlyclean-am
distclean: distclean-am distclean: distclean-am
...@@ -765,7 +765,7 @@ install-dvi: install-dvi-am ...@@ -765,7 +765,7 @@ install-dvi: install-dvi-am
install-dvi-am: install-dvi-am:
install-exec-am: install-pkglibLTLIBRARIES install-exec-am: install-libLTLIBRARIES
install-html: install-html-am install-html: install-html-am
...@@ -805,24 +805,23 @@ ps: ps-am ...@@ -805,24 +805,23 @@ ps: ps-am
ps-am: ps-am:
uninstall-am: uninstall-pkglibLTLIBRARIES uninstall-am: uninstall-libLTLIBRARIES
.MAKE: install-am install-strip .MAKE: install-am install-strip
.PHONY: CTAGS GTAGS TAGS all all-am am--depfiles check check-am clean \ .PHONY: CTAGS GTAGS TAGS all all-am am--depfiles check check-am clean \
clean-generic clean-libtool clean-pkglibLTLIBRARIES \ clean-generic clean-libLTLIBRARIES clean-libtool cscopelist-am \
cscopelist-am ctags ctags-am distclean distclean-compile \ ctags ctags-am distclean distclean-compile distclean-generic \
distclean-generic distclean-libtool distclean-tags distdir dvi \ distclean-libtool distclean-tags distdir dvi dvi-am html \
dvi-am html html-am info info-am install install-am \ html-am info info-am install install-am install-data \
install-data install-data-am install-dvi install-dvi-am \ install-data-am install-dvi install-dvi-am install-exec \
install-exec install-exec-am install-html install-html-am \ install-exec-am install-html install-html-am install-info \
install-info install-info-am install-man install-pdf \ install-info-am install-libLTLIBRARIES install-man install-pdf \
install-pdf-am install-pkglibLTLIBRARIES install-ps \ install-pdf-am install-ps install-ps-am install-strip \
install-ps-am install-strip installcheck installcheck-am \ installcheck installcheck-am installdirs maintainer-clean \
installdirs maintainer-clean maintainer-clean-generic \ maintainer-clean-generic mostlyclean mostlyclean-compile \
mostlyclean mostlyclean-compile mostlyclean-generic \ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
mostlyclean-libtool pdf pdf-am ps ps-am tags tags-am uninstall \ tags tags-am uninstall uninstall-am uninstall-libLTLIBRARIES
uninstall-am uninstall-pkglibLTLIBRARIES
.PRECIOUS: Makefile .PRECIOUS: Makefile
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
Nutzungsbedingungen | Datenschutzerklärung | Barrierefreiheitserklärung