Changeset 107b01a for driver


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:
driver
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • driver/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

  • driver/Makefile.in

    ra2dbcff1 r107b01a  
    9696subdir = driver
    9797ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
    98 am__aclocal_m4_deps = $(top_srcdir)/automake/cfa.m4 \
    99         $(top_srcdir)/configure.ac
     98am__aclocal_m4_deps = $(top_srcdir)/automake/libtool.m4 \
     99        $(top_srcdir)/automake/ltoptions.m4 \
     100        $(top_srcdir)/automake/ltsugar.m4 \
     101        $(top_srcdir)/automake/ltversion.m4 \
     102        $(top_srcdir)/automake/lt~obsolete.m4 \
     103        $(top_srcdir)/automake/cfa.m4 $(top_srcdir)/configure.ac
    100104am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
    101105        $(ACLOCAL_M4)
    … …  
    110114as_OBJECTS = $(am_as_OBJECTS)
    111115as_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_cc1_OBJECTS = cc1.$(OBJEXT)
    113121cc1_OBJECTS = $(am_cc1_OBJECTS)
    … …  
    134142CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
    135143        $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
     144LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
     145        $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) \
     146        $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
     147        $(AM_CXXFLAGS) $(CXXFLAGS)
    136148AM_V_CXX = $(am__v_CXX_@AM_V@)
    137149am__v_CXX_ = $(am__v_CXX_@AM_DEFAULT_V@)
    … …  
    139151am__v_CXX_1 =
    140152CXXLD = $(CXX)
    141 CXXLINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) \
    142         -o $@
     153CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
     154        $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
     155        $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
    143156AM_V_CXXLD = $(am__v_CXXLD_@AM_V@)
    144157am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@)
    … …  
    177190AMTAR = @AMTAR@
    178191AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
     192AR = @AR@
    179193AUTOCONF = @AUTOCONF@
    180194AUTOHEADER = @AUTOHEADER@
    … …  
    200214CPPFLAGS = @CPPFLAGS@
    201215CXX = @CXX@
     216CXXCPP = @CXXCPP@
    202217CXXDEPMODE = @CXXDEPMODE@
    203218CXXFLAGS = @CXXFLAGS@
    … …  
    205220DEFS = @DEFS@
    206221DEPDIR = @DEPDIR@
     222DLLTOOL = @DLLTOOL@
    207223DRIVER_DIR = @DRIVER_DIR@
     224DSYMUTIL = @DSYMUTIL@
     225DUMPBIN = @DUMPBIN@
    208226ECHO_C = @ECHO_C@
    209227ECHO_N = @ECHO_N@
    … …  
    211229EGREP = @EGREP@
    212230EXEEXT = @EXEEXT@
     231FGREP = @FGREP@
    213232GREP = @GREP@
    214233HOST_FLAGS = @HOST_FLAGS@
    … …  
    218237INSTALL_SCRIPT = @INSTALL_SCRIPT@
    219238INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
     239LD = @LD@
    220240LDFLAGS = @LDFLAGS@
    221241LEX = @LEX@
    … …  
    226246LIBOBJS = @LIBOBJS@
    227247LIBS = @LIBS@
     248LIBTOOL = @LIBTOOL@
     249LIPO = @LIPO@
     250LN_S = @LN_S@
    228251LTLIBOBJS = @LTLIBOBJS@
     252LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
    229253MAKEINFO = @MAKEINFO@
     254MANIFEST_TOOL = @MANIFEST_TOOL@
    230255MKDIR_P = @MKDIR_P@
     256NM = @NM@
     257NMEDIT = @NMEDIT@
     258OBJDUMP = @OBJDUMP@
    231259OBJEXT = @OBJEXT@
     260OTOOL = @OTOOL@
     261OTOOL64 = @OTOOL64@
    232262PACKAGE = @PACKAGE@
    233263PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
    … …  
    239269PATH_SEPARATOR = @PATH_SEPARATOR@
    240270RANLIB = @RANLIB@
     271SED = @SED@
    241272SET_MAKE = @SET_MAKE@
    242273SHELL = @SHELL@
    … …  
    250281abs_top_builddir = @abs_top_builddir@
    251282abs_top_srcdir = @abs_top_srcdir@
     283ac_ct_AR = @ac_ct_AR@
    252284ac_ct_CC = @ac_ct_CC@
    253285ac_ct_CXX = @ac_ct_CXX@
     286ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
    254287am__include = @am__include@
    255288am__leading_dot = @am__leading_dot@
    … …  
    299332top_srcdir = @top_srcdir@
    300333AUTOMAKE_OPTIONS = foreign    # do not require all the GNU file names
     334ACLOCAL_AMFLAGS = -I automake
    301335
    302336# applies to both programs
    … …  
    312346
    313347.SUFFIXES:
    314 .SUFFIXES: .cc .o .obj
     348.SUFFIXES: .cc .lo .o .obj
    315349$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
    316350        @for dep in $?; do \
    … …  
    352386        sed 's/$(EXEEXT)$$//' | \
    353387        while read p p1; do if test -f $$p \
     388         || test -f $$p1 \
    354389          ; then echo "$$p"; echo "$$p"; else :; fi; \
    355390        done | \
    … …  
    366401            if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \
    367402            test -z "$$files" || { \
    368               echo " $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(cc1libdir)$$dir'"; \
    369               $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(cc1libdir)$$dir" || exit $$?; \
     403            echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(cc1libdir)$$dir'"; \
     404            $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(cc1libdir)$$dir" || exit $$?; \
    370405            } \
    371406        ; done
    … …  
    383418
    384419clean-cc1libPROGRAMS:
    385         -test -z "$(cc1lib_PROGRAMS)" || rm -f $(cc1lib_PROGRAMS)
     420        @list='$(cc1lib_PROGRAMS)'; test -n "$$list" || exit 0; \
     421        echo " rm -f" $$list; \
     422        rm -f $$list || exit $$?; \
     423        test -n "$(EXEEXT)" || exit 0; \
     424        list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
     425        echo " rm -f" $$list; \
     426        rm -f $$list
    386427
    387428clean-noinstPROGRAMS:
    388         -test -z "$(noinst_PROGRAMS)" || rm -f $(noinst_PROGRAMS)
     429        @list='$(noinst_PROGRAMS)'; test -n "$$list" || exit 0; \
     430        echo " rm -f" $$list; \
     431        rm -f $$list || exit $$?; \
     432        test -n "$(EXEEXT)" || exit 0; \
     433        list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
     434        echo " rm -f" $$list; \
     435        rm -f $$list
    389436
    390437as$(EXEEXT): $(as_OBJECTS) $(as_DEPENDENCIES) $(EXTRA_as_DEPENDENCIES)
    … …  
    425472@AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    426473@am__fastdepCXX_FALSE@  $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
     474
     475.cc.lo:
     476@am__fastdepCXX_TRUE@   $(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\
     477@am__fastdepCXX_TRUE@   $(LTCXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
     478@am__fastdepCXX_TRUE@   $(am__mv) $$depbase.Tpo $$depbase.Plo
     479@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(AM_V_CXX)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
     480@AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     481@am__fastdepCXX_FALSE@  $(AM_V_CXX@am__nodep@)$(LTCXXCOMPILE) -c -o $@ $<
     482
     483mostlyclean-libtool:
     484        -rm -f *.lo
     485
     486clean-libtool:
     487        -rm -rf .libs _libs
    427488
    428489ID: $(am__tagged_files)
    … …  
    548609clean: clean-am
    549610
    550 clean-am: clean-cc1libPROGRAMS clean-generic clean-noinstPROGRAMS \
    551         mostlyclean-am
     611clean-am: clean-cc1libPROGRAMS clean-generic clean-libtool \
     612        clean-noinstPROGRAMS mostlyclean-am
    552613
    553614distclean: distclean-am
    … …  
    605666mostlyclean: mostlyclean-am
    606667
    607 mostlyclean-am: mostlyclean-compile mostlyclean-generic
     668mostlyclean-am: mostlyclean-compile mostlyclean-generic \
     669        mostlyclean-libtool
    608670
    609671pdf: pdf-am
    … …  
    621683
    622684.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean \
    623         clean-cc1libPROGRAMS clean-generic clean-noinstPROGRAMS \
    624         cscopelist-am ctags ctags-am distclean distclean-compile \
    625         distclean-generic distclean-tags distdir dvi dvi-am html \
    626         html-am info info-am install install-am install-cc1libPROGRAMS \
    627         install-data install-data-am install-dvi install-dvi-am \
    628         install-exec install-exec-am install-exec-hook install-html \
    629         install-html-am install-info install-info-am install-man \
    630         install-pdf install-pdf-am install-ps install-ps-am \
    631         install-strip installcheck installcheck-am installdirs \
    632         maintainer-clean maintainer-clean-generic mostlyclean \
    633         mostlyclean-compile mostlyclean-generic pdf pdf-am ps ps-am \
     685        clean-cc1libPROGRAMS clean-generic clean-libtool \
     686        clean-noinstPROGRAMS cscopelist-am ctags ctags-am distclean \
     687        distclean-compile distclean-generic distclean-libtool \
     688        distclean-tags distdir dvi dvi-am html html-am info info-am \
     689        install install-am install-cc1libPROGRAMS install-data \
     690        install-data-am install-dvi install-dvi-am install-exec \
     691        install-exec-am install-exec-hook install-html install-html-am \
     692        install-info install-info-am install-man install-pdf \
     693        install-pdf-am install-ps install-ps-am install-strip \
     694        installcheck installcheck-am installdirs maintainer-clean \
     695        maintainer-clean-generic mostlyclean mostlyclean-compile \
     696        mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
    634697        tags tags-am uninstall uninstall-am uninstall-cc1libPROGRAMS \
    635698        uninstall-hook
Note: See TracChangeset for help on using the changeset viewer.