[Compbench-devel] CompBenchmarks++ Makefile.am, 1.5, 1.6 Makefile.in, 1.6, 1.7
Brought to you by:
xfred
|
From: Frederic T. <xf...@us...> - 2006-09-24 18:19:29
|
Update of /cvsroot/compbench/CompBenchmarks++ In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv29274 Modified Files: Makefile.am Makefile.in Log Message: Fix in man-page handling. Index: Makefile.in =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/Makefile.in,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** Makefile.in 20 Sep 2006 16:47:21 -0000 1.6 --- Makefile.in 24 Sep 2006 18:19:25 -0000 1.7 *************** *** 117,123 **** noinst_HEADERS = cloptions.h main.h ! EXTRA_DIST = compbenchmarks-config Doxyfile INCLUDES = -I $(top_srcdir) ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs --- 117,125 ---- noinst_HEADERS = cloptions.h main.h ! EXTRA_DIST = compbenchmarks-config Doxyfile compbenchmarks-config.1 INCLUDES = -I $(top_srcdir) + + man_MANS = compbenchmarks-config.1 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs *************** *** 141,144 **** --- 143,150 ---- CXXLD = $(CXX) CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@ + man1dir = $(mandir)/man1 + MANS = $(man_MANS) + + NROFF = nroff HEADERS = $(noinst_HEADERS) *************** *** 276,279 **** --- 282,324 ---- $(LTCXXCOMPILE) -c $< + install-man1: + $(mkinstalldirs) $(DESTDIR)$(man1dir) + @list='$(man1_MANS)'; \ + l2='$(man_MANS)'; for i in $$l2; do \ + case "$$i" in \ + *.1*) list="$$list $$i" ;; \ + esac; \ + done; \ + for i in $$list; do \ + if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \ + else file=$$i; fi; \ + ext=`echo $$i | sed -e 's/^.*\\.//'`; \ + inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \ + inst=`echo $$inst | sed '$(transform)'`.$$ext; \ + echo " $(INSTALL_DATA) $$file $(DESTDIR)$(man1dir)/$$inst"; \ + $(INSTALL_DATA) $$file $(DESTDIR)$(man1dir)/$$inst; \ + done + + uninstall-man1: + @list='$(man1_MANS)'; \ + l2='$(man_MANS)'; for i in $$l2; do \ + case "$$i" in \ + *.1*) list="$$list $$i" ;; \ + esac; \ + done; \ + for i in $$list; do \ + ext=`echo $$i | sed -e 's/^.*\\.//'`; \ + inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \ + inst=`echo $$inst | sed '$(transform)'`.$$ext; \ + echo " rm -f $(DESTDIR)$(man1dir)/$$inst"; \ + rm -f $(DESTDIR)$(man1dir)/$$inst; \ + done + install-man: $(MANS) + @$(NORMAL_INSTALL) + $(MAKE) $(AM_MAKEFLAGS) install-man1 + uninstall-man: + @$(NORMAL_UNINSTALL) + $(MAKE) $(AM_MAKEFLAGS) uninstall-man1 + # This directory's subdirectories are mostly independent; you can cd # into them and run `make' without going through this Makefile. *************** *** 495,499 **** install-exec: install-exec-recursive ! install-data-am: install-data: install-data-recursive --- 540,544 ---- install-exec: install-exec-recursive ! install-data-am: install-man install-data: install-data-recursive *************** *** 501,507 **** @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am install: install-recursive ! uninstall-am: uninstall-binPROGRAMS uninstall: uninstall-recursive ! all-am: Makefile $(PROGRAMS) $(HEADERS) config.h all-redirect: all-recursive-am install-strip: --- 546,552 ---- @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am install: install-recursive ! uninstall-am: uninstall-binPROGRAMS uninstall-man uninstall: uninstall-recursive ! all-am: Makefile $(PROGRAMS) $(MANS) $(HEADERS) config.h all-redirect: all-recursive-am install-strip: *************** *** 509,513 **** installdirs: installdirs-recursive installdirs-am: ! $(mkinstalldirs) $(DESTDIR)$(bindir) --- 554,558 ---- installdirs: installdirs-recursive installdirs-am: ! $(mkinstalldirs) $(DESTDIR)$(bindir) $(DESTDIR)$(mandir)/man1 *************** *** 555,559 **** mostlyclean-compile distclean-compile clean-compile \ maintainer-clean-compile mostlyclean-libtool distclean-libtool \ ! clean-libtool maintainer-clean-libtool install-data-recursive \ uninstall-data-recursive install-exec-recursive \ uninstall-exec-recursive installdirs-recursive uninstalldirs-recursive \ --- 600,605 ---- mostlyclean-compile distclean-compile clean-compile \ maintainer-clean-compile mostlyclean-libtool distclean-libtool \ ! clean-libtool maintainer-clean-libtool install-man1 uninstall-man1 \ ! install-man uninstall-man install-data-recursive \ uninstall-data-recursive install-exec-recursive \ uninstall-exec-recursive installdirs-recursive uninstalldirs-recursive \ *************** *** 571,574 **** --- 617,623 ---- + compbenchmarks-config.1: compbenchmarks-config + pod2man $< > $@ + install-exec-hook: cp compbenchmarks-config $(DESTDIR)$(bindir) Index: Makefile.am =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/Makefile.am,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** Makefile.am 20 Sep 2006 16:47:21 -0000 1.5 --- Makefile.am 24 Sep 2006 18:19:25 -0000 1.6 *************** *** 12,19 **** noinst_HEADERS = cloptions.h main.h ! EXTRA_DIST = compbenchmarks-config Doxyfile INCLUDES = -I $(top_srcdir) install-exec-hook: ! cp compbenchmarks-config $(DESTDIR)$(bindir) \ No newline at end of file --- 12,24 ---- noinst_HEADERS = cloptions.h main.h ! EXTRA_DIST = compbenchmarks-config Doxyfile compbenchmarks-config.1 INCLUDES = -I $(top_srcdir) + man_MANS = compbenchmarks-config.1 + + compbenchmarks-config.1: compbenchmarks-config + pod2man $< > $@ + install-exec-hook: ! cp compbenchmarks-config $(DESTDIR)$(bindir) |