Changeset 107b01a for benchmark


Ignore:
Timestamp:
Dec 19, 2018, 1:47:03 PM (6 years ago)
Author:
Thierry Delisle <tdelisle@…>
Branches:
ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, deferred_resn, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, no_list, persistent-indexer, pthread-emulation, qualifiedEnum
Children:
84b4d607
Parents:
a2dbcff1
Message:

Several changes to the makefiles

  • change .c tests to .cfa
  • add require for libtool in configure
  • libtoolize to fix some warnings
Location:
benchmark
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • benchmark/Makefile.am

    ra2dbcff1 r107b01a  
    1616
    1717AUTOMAKE_OPTIONS = foreign    # do not require all the GNU file names
     18ACLOCAL_AMFLAGS  = -I automake
    1819
    1920# applies to both programs

  • benchmark/Makefile.in

    ra2dbcff1 r107b01a  
    9898subdir = benchmark
    9999ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
    100 am__aclocal_m4_deps = $(top_srcdir)/automake/cfa.m4 \
    101         $(top_srcdir)/configure.ac
     100am__aclocal_m4_deps = $(top_srcdir)/automake/libtool.m4 \
     101        $(top_srcdir)/automake/ltoptions.m4 \
     102        $(top_srcdir)/automake/ltsugar.m4 \
     103        $(top_srcdir)/automake/ltversion.m4 \
     104        $(top_srcdir)/automake/lt~obsolete.m4 \
     105        $(top_srcdir)/automake/cfa.m4 $(top_srcdir)/configure.ac
    102106am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
    103107        $(ACLOCAL_M4)
    … …  
    110114dummy_OBJECTS = $(am_dummy_OBJECTS)
    111115dummy_LDADD = $(LDADD)
     116AM_V_lt = $(am__v_lt_@AM_V@)
     117am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
     118am__v_lt_0 = --silent
     119am__v_lt_1 =
    112120AM_V_P = $(am__v_P_@AM_V@)
    113121am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
    … …  
    128136COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
    129137        $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
     138LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
     139        $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
     140        $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
     141        $(AM_CFLAGS) $(CFLAGS)
    130142AM_V_CC = $(am__v_CC_@AM_V@)
    131143am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
    … …  
    133145am__v_CC_1 =
    134146CCLD = $(CC)
    135 LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
     147LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
     148        $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
     149        $(AM_LDFLAGS) $(LDFLAGS) -o $@
    136150AM_V_CCLD = $(am__v_CCLD_@AM_V@)
    137151am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
    … …  
    140154CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
    141155        $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
     156LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
     157        $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) \
     158        $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
     159        $(AM_CXXFLAGS) $(CXXFLAGS)
    142160AM_V_CXX = $(am__v_CXX_@AM_V@)
    143161am__v_CXX_ = $(am__v_CXX_@AM_DEFAULT_V@)
    … …  
    145163am__v_CXX_1 =
    146164CXXLD = $(CXX)
    147 CXXLINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) \
    148         -o $@
     165CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
     166        $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
     167        $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
    149168AM_V_CXXLD = $(am__v_CXXLD_@AM_V@)
    150169am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@)
    … …  
    184203AMTAR = @AMTAR@
    185204AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
     205AR = @AR@
    186206AUTOCONF = @AUTOCONF@
    187207AUTOHEADER = @AUTOHEADER@
    … …  
    207227CPPFLAGS = @CPPFLAGS@
    208228CXX = @CXX@
     229CXXCPP = @CXXCPP@
    209230CXXDEPMODE = @CXXDEPMODE@
    210231CXXFLAGS = @CXXFLAGS@
    … …  
    212233DEFS = @DEFS@
    213234DEPDIR = @DEPDIR@
     235DLLTOOL = @DLLTOOL@
    214236DRIVER_DIR = @DRIVER_DIR@
     237DSYMUTIL = @DSYMUTIL@
     238DUMPBIN = @DUMPBIN@
    215239ECHO_C = @ECHO_C@
    216240ECHO_N = @ECHO_N@
    … …  
    218242EGREP = @EGREP@
    219243EXEEXT = @EXEEXT@
     244FGREP = @FGREP@
    220245GREP = @GREP@
    221246HOST_FLAGS = @HOST_FLAGS@
    … …  
    225250INSTALL_SCRIPT = @INSTALL_SCRIPT@
    226251INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
     252LD = @LD@
    227253LDFLAGS = @LDFLAGS@
    228254LEX = @LEX@
    … …  
    233259LIBOBJS = @LIBOBJS@
    234260LIBS = @LIBS@
     261LIBTOOL = @LIBTOOL@
     262LIPO = @LIPO@
     263LN_S = @LN_S@
    235264LTLIBOBJS = @LTLIBOBJS@
     265LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
    236266MAKEINFO = @MAKEINFO@
     267MANIFEST_TOOL = @MANIFEST_TOOL@
    237268MKDIR_P = @MKDIR_P@
     269NM = @NM@
     270NMEDIT = @NMEDIT@
     271OBJDUMP = @OBJDUMP@
    238272OBJEXT = @OBJEXT@
     273OTOOL = @OTOOL@
     274OTOOL64 = @OTOOL64@
    239275PACKAGE = @PACKAGE@
    240276PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
    … …  
    246282PATH_SEPARATOR = @PATH_SEPARATOR@
    247283RANLIB = @RANLIB@
     284SED = @SED@
    248285SET_MAKE = @SET_MAKE@
    249286SHELL = @SHELL@
    … …  
    257294abs_top_builddir = @abs_top_builddir@
    258295abs_top_srcdir = @abs_top_srcdir@
     296ac_ct_AR = @ac_ct_AR@
    259297ac_ct_CC = @ac_ct_CC@
    260298ac_ct_CXX = @ac_ct_CXX@
     299ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
    261300am__include = @am__include@
    262301am__leading_dot = @am__leading_dot@
    … …  
    306345top_srcdir = @top_srcdir@
    307346AUTOMAKE_OPTIONS = foreign    # do not require all the GNU file names
     347ACLOCAL_AMFLAGS = -I automake
    308348CFACOMPILE = $(CFACC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CFAFLAGS) $(CFAFLAGS) $(AM_CFLAGS) $(CFLAGS)
    309349LTCFACOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
    … …  
    414454@am__fastdepCC_FALSE@   $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
    415455
     456.c.lo:
     457@am__fastdepCC_TRUE@    $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\
     458@am__fastdepCC_TRUE@    $(LTCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
     459@am__fastdepCC_TRUE@    $(am__mv) $$depbase.Tpo $$depbase.Plo
     460@AMDEP_TRUE@@am__fastdepCC_FALSE@       $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
     461@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     462@am__fastdepCC_FALSE@   $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
     463
    416464.cpp.o:
    417465@am__fastdepCXX_TRUE@   $(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
    … …  
    429477@AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    430478@am__fastdepCXX_FALSE@  $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
     479
     480.cpp.lo:
     481@am__fastdepCXX_TRUE@   $(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\
     482@am__fastdepCXX_TRUE@   $(LTCXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
     483@am__fastdepCXX_TRUE@   $(am__mv) $$depbase.Tpo $$depbase.Plo
     484@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(AM_V_CXX)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
     485@AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     486@am__fastdepCXX_FALSE@  $(AM_V_CXX@am__nodep@)$(LTCXXCOMPILE) -c -o $@ $<
     487
     488mostlyclean-libtool:
     489        -rm -f *.lo
     490
     491clean-libtool:
     492        -rm -rf .libs _libs
    431493
    432494ID: $(am__tagged_files)
    … …  
    548610clean: clean-am
    549611
    550 clean-am: clean-generic mostlyclean-am
     612clean-am: clean-generic clean-libtool mostlyclean-am
    551613
    552614distclean: distclean-am
    … …  
    603665mostlyclean: mostlyclean-am
    604666
    605 mostlyclean-am: mostlyclean-compile mostlyclean-generic
     667mostlyclean-am: mostlyclean-compile mostlyclean-generic \
     668        mostlyclean-libtool
    606669
    607670pdf: pdf-am
    … …  
    618681
    619682.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \
    620         cscopelist-am ctags ctags-am distclean distclean-compile \
    621         distclean-generic distclean-tags distdir dvi dvi-am html \
    622         html-am info info-am install install-am install-data \
    623         install-data-am install-dvi install-dvi-am install-exec \
    624         install-exec-am install-html install-html-am install-info \
    625         install-info-am install-man install-pdf install-pdf-am \
    626         install-ps install-ps-am install-strip installcheck \
    627         installcheck-am installdirs maintainer-clean \
    628         maintainer-clean-generic mostlyclean mostlyclean-compile \
    629         mostlyclean-generic pdf pdf-am ps ps-am tags tags-am uninstall \
    630         uninstall-am
     683        clean-libtool cscopelist-am ctags ctags-am distclean \
     684        distclean-compile distclean-generic distclean-libtool \
     685        distclean-tags distdir dvi dvi-am html html-am info info-am \
     686        install install-am install-data install-data-am install-dvi \
     687        install-dvi-am install-exec install-exec-am install-html \
     688        install-html-am install-info install-info-am install-man \
     689        install-pdf install-pdf-am install-ps install-ps-am \
     690        install-strip installcheck installcheck-am installdirs \
     691        maintainer-clean maintainer-clean-generic mostlyclean \
     692        mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
     693        pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am
    631694
    632695.PRECIOUS: Makefile
Note: See TracChangeset for help on using the changeset viewer.