Changeset 796cea3

Timestamp:

Mar 8, 2017, 3:17:58 PM (7 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, deferred_resn, demangler, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, with_gc

Children:

6363ad1

Parents:

64cb860

Message:

Added proper argument to rename cfa

Files:

• configure (modified) (3 diffs)
• configure.ac (modified) (1 diff)
• src/driver/Makefile.am (modified) (2 diffs)
• src/driver/Makefile.in (modified) (10 diffs)
• src/libcfa/Makefile.am (modified) (1 diff)
• src/libcfa/Makefile.in (modified) (1 diff)

configure

@@ -742 +742 @@
 enable_silent_rules
 enable_maintainer_mode
+with_cfa_name
 with_backend_compiler
 enable_target_release
@@ -1398 +1399 @@
   --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
   --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
+  --with-cfa-name=NAME     NAME too which cfa will be installed
   --with-backend-compiler=PROGRAM     PROGRAM that performs the final code compilation (must be gcc-compatible)
 
@@ -3024 +3026 @@
                 Use -program-transform-name='s/cfa$/[Desired name here]/' instead" "$LINENO" 5
 fi
+
+
+# Check whether --with-cfa-name was given.
+if test "${with_cfa_name+set}" = set; then :
+  withval=$with_cfa_name; cfa_name=$withval
+else
+  cfa_name="cfa"
+fi
+
 
 #Define the new name of the installed command

configure.ac

@@ -40 +40 @@
                 Use -program-transform-name='s/cfa$/[[Desired name here]]/' instead])
 fi
+
+AC_ARG_WITH(cfa-name,
+        [  --with-cfa-name=NAME     NAME too which cfa will be installed],
+        cfa_name=$withval, cfa_name="cfa")
 
 #Define the new name of the installed command

src/driver/Makefile.am

@@ -28 +28 @@
 endif
 
-bin_PROGRAMS = cfa
+noinst_PROGRAMS = cfa
 cfa_SOURCES = cfa.cc
+
+install-exec-hook:
+        @echo " $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) cfa '$(CFA_BINDIR)/$(CFA_NAME)'"; \
+        $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) cfa $(CFA_BINDIR)/$(CFA_NAME) || exit $$?
+
+uninstall-hook:
+        @echo " ( cd '$(CFA_BINDIR)' && rm -f $(CFA_NAME) )"; \
+        cd "$(CFA_BINDIR)" && rm -f $(CFA_NAME)
 
 # put into lib for now
@@ -36 +44 @@
 cc1_SOURCES = cc1.cc
 
-MAINTAINERCLEANFILES = @CFA_PREFIX@/bin/${bin_PROGRAMS} @CFA_PREFIX@/lib/${cc1lib_PROGRAMS}
+MAINTAINERCLEANFILES = $(CFA_BINDIR)/$(CFA_NAME) @CFA_PREFIX@/lib/${cc1lib_PROGRAMS}

src/driver/Makefile.in

@@ -41 +41 @@
 @BUILD_DEBUG_TRUE@am__append_2 = -DHAVE_LIBCFA_DEBUG
 @BUILD_RELEASE_TRUE@am__append_3 = -DHAVE_LIBCFA_RELEASE
-bin_PROGRAMS = cfa$(EXEEXT)
+noinst_PROGRAMS = cfa$(EXEEXT)
 cc1lib_PROGRAMS = cc1$(EXEEXT)
 subdir = src/driver
@@ -53 +53 @@
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
-am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(cc1libdir)"
-PROGRAMS = $(bin_PROGRAMS) $(cc1lib_PROGRAMS)
+am__installdirs = "$(DESTDIR)$(cc1libdir)"
+PROGRAMS = $(cc1lib_PROGRAMS) $(noinst_PROGRAMS)
 am_cc1_OBJECTS = cc1.$(OBJEXT)
 cc1_OBJECTS = $(am_cc1_OBJECTS)
@@ -215 +215 @@
 cc1libdir = ${CFA_LIBDIR}
 cc1_SOURCES = cc1.cc
-MAINTAINERCLEANFILES = @CFA_PREFIX@/bin/${bin_PROGRAMS} @CFA_PREFIX@/lib/${cc1lib_PROGRAMS}
+MAINTAINERCLEANFILES = $(CFA_BINDIR)/$(CFA_NAME) @CFA_PREFIX@/lib/${cc1lib_PROGRAMS}
 all: all-am
 
@@ -250 +250 @@
         cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(am__aclocal_m4_deps):
-install-binPROGRAMS: $(bin_PROGRAMS)
-        @$(NORMAL_INSTALL)
-        test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
-        @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
-        for p in $$list; do echo "$$p $$p"; done | \
-        sed 's/$(EXEEXT)$$//' | \
-        while read p p1; do if test -f $$p; \
-          then echo "$$p"; echo "$$p"; else :; fi; \
-        done | \
-        sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \
-            -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \
-        sed 'N;N;N;s,\n, ,g' | \
-        $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \
-          { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \
-            if ($$2 == $$4) files[d] = files[d] " " $$1; \
-            else { print "f", $$3 "/" $$4, $$1; } } \
-          END { for (d in files) print "f", d, files[d] }' | \
-        while read type dir files; do \
-            if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \
-            test -z "$$files" || { \
-              echo " $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(bindir)$$dir'"; \
-              $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(bindir)$$dir" || exit $$?; \
-            } \
-        ; done
-
-uninstall-binPROGRAMS:
-        @$(NORMAL_UNINSTALL)
-        @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
-        files=`for p in $$list; do echo "$$p"; done | \
-          sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \
-              -e 's/$$/$(EXEEXT)/' `; \
-        test -n "$$list" || exit 0; \
-        echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \
-        cd "$(DESTDIR)$(bindir)" && rm -f $$files
-
-clean-binPROGRAMS:
-        -test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS)
 install-cc1libPROGRAMS: $(cc1lib_PROGRAMS)
         @$(NORMAL_INSTALL)
@@ -324 +287 @@
 clean-cc1libPROGRAMS:
         -test -z "$(cc1lib_PROGRAMS)" || rm -f $(cc1lib_PROGRAMS)
+
+clean-noinstPROGRAMS:
+        -test -z "$(noinst_PROGRAMS)" || rm -f $(noinst_PROGRAMS)
 cc1$(EXEEXT): $(cc1_OBJECTS) $(cc1_DEPENDENCIES) $(EXTRA_cc1_DEPENDENCIES) 
         @rm -f cc1$(EXEEXT)
@@ -440 +406 @@
 all-am: Makefile $(PROGRAMS)
 installdirs:
-        for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(cc1libdir)"; do \
+        for dir in "$(DESTDIR)$(cc1libdir)"; do \
           test -z "$$dir" || $(MKDIR_P) "$$dir"; \
         done
@@ -476 +442 @@
 clean: clean-am
 
-clean-am: clean-binPROGRAMS clean-cc1libPROGRAMS clean-generic \
+clean-am: clean-cc1libPROGRAMS clean-generic clean-noinstPROGRAMS \
         mostlyclean-am
 
@@ -503 +469 @@
 install-dvi-am:
 
-install-exec-am: install-binPROGRAMS
-
+install-exec-am:
+        @$(NORMAL_INSTALL)
+        $(MAKE) $(AM_MAKEFLAGS) install-exec-hook
 install-html: install-html-am
 
@@ -542 +509 @@
 ps-am:
 
-uninstall-am: uninstall-binPROGRAMS uninstall-cc1libPROGRAMS
-
-.MAKE: install-am install-strip
-
-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \
-        clean-cc1libPROGRAMS clean-generic ctags distclean \
-        distclean-compile distclean-generic distclean-tags distdir dvi \
-        dvi-am html html-am info info-am install install-am \
-        install-binPROGRAMS install-cc1libPROGRAMS install-data \
-        install-data-am install-dvi install-dvi-am install-exec \
-        install-exec-am install-html install-html-am install-info \
+uninstall-am: uninstall-cc1libPROGRAMS
+        @$(NORMAL_INSTALL)
+        $(MAKE) $(AM_MAKEFLAGS) uninstall-hook
+.MAKE: install-am install-exec-am install-strip uninstall-am
+
+.PHONY: CTAGS GTAGS all all-am check check-am clean \
+        clean-cc1libPROGRAMS clean-generic clean-noinstPROGRAMS ctags \
+        distclean distclean-compile distclean-generic distclean-tags \
+        distdir dvi dvi-am html html-am info info-am install \
+        install-am install-cc1libPROGRAMS install-data install-data-am \
+        install-dvi install-dvi-am install-exec install-exec-am \
+        install-exec-hook install-html install-html-am install-info \
         install-info-am install-man install-pdf install-pdf-am \
         install-ps install-ps-am install-strip installcheck \
@@ -558 +526 @@
         maintainer-clean-generic mostlyclean mostlyclean-compile \
         mostlyclean-generic pdf pdf-am ps ps-am tags uninstall \
-        uninstall-am uninstall-binPROGRAMS uninstall-cc1libPROGRAMS
-
+        uninstall-am uninstall-cc1libPROGRAMS uninstall-hook
+
+
+install-exec-hook:
+        @echo " $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) cfa '$(CFA_BINDIR)/$(CFA_NAME)'"; \
+        $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) cfa $(CFA_BINDIR)/$(CFA_NAME) || exit $$?
+
+uninstall-hook:
+        @echo " ( cd '$(CFA_BINDIR)' && rm -f $(CFA_NAME) )"; \
+        cd "$(CFA_BINDIR)" && rm -f $(CFA_NAME)
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.

src/libcfa/Makefile.am

@@ -81 +81 @@
 
 maintainer-clean-local:
-        -rm -rf ${includedir}/* ${libdir}/*
+        -rm -rf ${CFA_INCDIR} ${CFA_LIBDIR}

src/libcfa/Makefile.in

@@ -1161 +1161 @@
 
 maintainer-clean-local:
-        -rm -rf ${includedir}/* ${libdir}/*
+        -rm -rf ${CFA_INCDIR} ${CFA_LIBDIR}
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.