comparison src/Makefile.am @ 12754:5ee4fc58585f stable

* Makefile.am (CLEANFILES): Remove $(bin_PROGRAMS) and $(bin_SCRIPTS) from the list. (all-local): Don't depend on $(bin_PROGRAMS) and $(bin_SCRIPTS). (install-exec-hook, uninstall-local): Delete targets. * src/Makefile.am (CLEANFILES): Include $(bin_PROGRAMS) and $(bin_SCRIPTS) in the list. (all-local): Depend on $(bin_PROGRAMS) and $(bin_SCRIPTS). (make-version-links, remove-version-links): Handle $(bin_SCRIPTS).
author John W. Eaton <jwe@octave.org>
date Sun, 19 Jun 2011 12:51:36 -0400
parents b67c2d580a25
children 59f5c239b9cf
comparison
equal deleted inserted replaced
12753:00fbb05f099c 12754:5ee4fc58585f
816 816
817 gendoc$(BUILD_EXEEXT): gendoc.cc 817 gendoc$(BUILD_EXEEXT): gendoc.cc
818 $(BUILD_CXX) $(BUILD_CXXFLAGS) -o $@ $^ $(BUILD_LDFLAGS) 818 $(BUILD_CXX) $(BUILD_CXXFLAGS) -o $@ $^ $(BUILD_LDFLAGS)
819 819
820 820
821 all-local: $(OCT_STAMP_FILES) DLD-FUNCTIONS/PKG_ADD .DOCSTRINGS 821 all-local: $(bin_PROGRAMS) $(bin_SCRIPTS) $(OCT_STAMP_FILES) DLD-FUNCTIONS/PKG_ADD .DOCSTRINGS
822 822
823 if AMCOND_BUILD_COMPILED_AUX_PROGRAMS 823 if AMCOND_BUILD_COMPILED_AUX_PROGRAMS
824 octave-config.cc: octave-config.cc.in Makefile 824 octave-config.cc: octave-config.cc.in Makefile
825 @$(do_subst_default_vals) 825 @$(do_subst_default_vals)
826 826
842 842
843 uninstall-local: remove-version-links uninstall-oct 843 uninstall-local: remove-version-links uninstall-oct
844 844
845 make-version-links: 845 make-version-links:
846 cd $(DESTDIR)$(bindir) && \ 846 cd $(DESTDIR)$(bindir) && \
847 mv octave$(EXEEXT) octave-$(version)$(EXEEXT) && \ 847 for f in $(basename $(bin_PROGRAMS)); do \
848 $(LN_S) octave-$(version)$(EXEEXT) octave$(EXEEXT) 848 mv $$f$(EXEEXT) $$f-$(version)$(EXEEXT) && \
849 .PHONY: make-version-links 849 $(LN_S) $$f-$(version)$(EXEEXT) $$f$(EXEEXT); \
850 done
851 if ! AMCOND_BUILD_COMPILED_AUX_PROGRAMS
852 cd $(DESTDIR)$(bindir) && \
853 for f in $(basename $(bin_SCRIPTS)); do \
854 mv $$f $$f-$(version) && \
855 $(LN_S) $$f-$(version) $$f; \
856 done
857 endif
850 858
851 remove-version-links: 859 remove-version-links:
852 rm -f $(DESTDIR)$(bindir)/octave-$(version)$(EXEEXT) 860 for f in $(basename $(bin_PROGRAMS)); do \
853 .PHONY: remove-version-links 861 rm -f $(DESTDIR)$(bindir)/$$f-$(version)$(EXEEXT); \
862 done
863 if ! AMCOND_BUILD_COMPILED_AUX_PROGRAMS
864 for f in $(basename $(bin_SCRIPTS)); do \
865 rm -f $(DESTDIR)$(bindir)/$$f-$(version); \
866 done
867 endif
868
869 .PHONY: make-version-links remove-version-links
854 870
855 if AMCOND_ENABLE_DYNAMIC_LINKING 871 if AMCOND_ENABLE_DYNAMIC_LINKING
856 install-oct: 872 install-oct:
857 $(top_srcdir)/build-aux/mkinstalldirs $(DESTDIR)$(octfiledir) 873 $(top_srcdir)/build-aux/mkinstalldirs $(DESTDIR)$(octfiledir)
858 if [ -n "`cat DLD-FUNCTIONS/PKG_ADD`" ]; then \ 874 if [ -n "`cat DLD-FUNCTIONS/PKG_ADD`" ]; then \
880 done 896 done
881 rm -f $(DESTDIR)$(octfiledir)/PKG_ADD 897 rm -f $(DESTDIR)$(octfiledir)/PKG_ADD
882 endif 898 endif
883 .PHONY: install-oct uninstall-oct 899 .PHONY: install-oct uninstall-oct
884 900
885
886 CLEANFILES = \ 901 CLEANFILES = \
902 $(bin_PROGRAMS) \
903 $(bin_SCRIPTS) \
887 DLD-FUNCTIONS/PKG_ADD \ 904 DLD-FUNCTIONS/PKG_ADD \
888 doc-files \ 905 doc-files \
889 gendoc.cc \ 906 gendoc.cc \
890 gendoc$(BUILD_EXEEXT) \ 907 gendoc$(BUILD_EXEEXT) \
891 graphics-props.cc \ 908 graphics-props.cc \
898 $(OCT_FILES) \ 915 $(OCT_FILES) \
899 $(OCT_STAMP_FILES) 916 $(OCT_STAMP_FILES)
900 917
901 MAINTAINERCLEANFILES = \ 918 MAINTAINERCLEANFILES = \
902 $(BUILT_DISTFILES) 919 $(BUILT_DISTFILES)
903