Changeset 485


Ignore:
Timestamp:
Feb 24, 2014 6:18:01 AM (6 years ago)
Author:
kulshres
Message:

Make sure that the C++ compiler is used for final linking not C Compiler

Signed-off-by: Kshitij Kulshreshtha <kshitij@…>

Location:
stable/2.5/ADOL-C
Files:
1 added
2 edited

Legend:

Unmodified
Added
Removed
  • stable/2.5/ADOL-C/Makefile.am

    r471 r485  
    3333lib_LTLIBRARIES = lib@adolclib@.la
    3434lib@adolclib@_la_LDFLAGS  = -version-info 3:0:2 -no-undefined
    35 lib@adolclib@_la_SOURCES  =
     35lib@adolclib@_la_SOURCES  = dummy.cpp
    3636
    3737lib@adolclib@_la_LIBADD = src/libadolcsrc.la
  • stable/2.5/ADOL-C/Makefile.in

    r472 r485  
    8585@SPARSE_TRUE@am__append_2 = src/sparse/libsparse.la
    8686subdir = ADOL-C
    87 DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am
     87DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
     88        $(top_srcdir)/autoconf/depcomp
    8889ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
    8990am__aclocal_m4_deps = $(top_srcdir)/autoconf/acx_builtin.m4 \
     
    134135        src/drivers/libdrivers.la src/tapedoc/libtapedoc.la \
    135136        $(am__append_2)
    136 am_lib@adolclib@_la_OBJECTS =
     137am_lib@adolclib@_la_OBJECTS = dummy.lo
    137138lib@adolclib@_la_OBJECTS = $(am_lib@adolclib@_la_OBJECTS)
    138139AM_V_lt = $(am__v_lt_@AM_V@)
     
    140141am__v_lt_0 = --silent
    141142am__v_lt_1 =
    142 lib@adolclib@_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
    143         $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
    144         $(AM_CFLAGS) $(CFLAGS) $(lib@adolclib@_la_LDFLAGS) $(LDFLAGS) \
    145         -o $@
     143lib@adolclib@_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX \
     144        $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CXXLD) \
     145        $(AM_CXXFLAGS) $(CXXFLAGS) $(lib@adolclib@_la_LDFLAGS) \
     146        $(LDFLAGS) -o $@
    146147AM_V_P = $(am__v_P_@AM_V@)
    147148am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
     
    157158am__v_at_1 =
    158159DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/ADOL-C/src
    159 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
    160         $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
    161 LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
    162         $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
     160depcomp = $(SHELL) $(top_srcdir)/autoconf/depcomp
     161am__depfiles_maybe = depfiles
     162am__mv = mv -f
     163CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
     164        $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
     165LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
     166        $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) \
    163167        $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
    164         $(AM_CFLAGS) $(CFLAGS)
    165 AM_V_CC = $(am__v_CC_@AM_V@)
    166 am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
    167 am__v_CC_0 = @echo "  CC      " $@;
    168 am__v_CC_1 =
    169 CCLD = $(CC)
    170 LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
    171         $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
    172         $(AM_LDFLAGS) $(LDFLAGS) -o $@
    173 AM_V_CCLD = $(am__v_CCLD_@AM_V@)
    174 am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
    175 am__v_CCLD_0 = @echo "  CCLD    " $@;
    176 am__v_CCLD_1 =
     168        $(AM_CXXFLAGS) $(CXXFLAGS)
     169AM_V_CXX = $(am__v_CXX_@AM_V@)
     170am__v_CXX_ = $(am__v_CXX_@AM_DEFAULT_V@)
     171am__v_CXX_0 = @echo "  CXX     " $@;
     172am__v_CXX_1 =
     173CXXLD = $(CXX)
     174CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
     175        $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
     176        $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
     177AM_V_CXXLD = $(am__v_CXXLD_@AM_V@)
     178am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@)
     179am__v_CXXLD_0 = @echo "  CXXLD   " $@;
     180am__v_CXXLD_1 =
    177181SOURCES = $(lib@adolclib@_la_SOURCES)
    178182DIST_SOURCES = $(lib@adolclib@_la_SOURCES)
     
    388392lib_LTLIBRARIES = lib@adolclib@.la
    389393lib@adolclib@_la_LDFLAGS = -version-info 3:0:2 -no-undefined
    390 lib@adolclib@_la_SOURCES =
     394lib@adolclib@_la_SOURCES = dummy.cpp
    391395lib@adolclib@_la_LIBADD = src/libadolcsrc.la $(am__append_1) \
    392396        src/drivers/libdrivers.la src/tapedoc/libtapedoc.la \
     
    395399
    396400.SUFFIXES:
     401.SUFFIXES: .cpp .lo .o .obj
    397402$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
    398403        @for dep in $?; do \
     
    462467
    463468lib@adolclib@.la: $(lib@adolclib@_la_OBJECTS) $(lib@adolclib@_la_DEPENDENCIES) $(EXTRA_lib@adolclib@_la_DEPENDENCIES)
    464         $(AM_V_CCLD)$(lib@adolclib@_la_LINK) -rpath $(libdir) $(lib@adolclib@_la_OBJECTS) $(lib@adolclib@_la_LIBADD) $(LIBS)
     469        $(AM_V_CXXLD)$(lib@adolclib@_la_LINK) -rpath $(libdir) $(lib@adolclib@_la_OBJECTS) $(lib@adolclib@_la_LIBADD) $(LIBS)
    465470
    466471mostlyclean-compile:
     
    469474distclean-compile:
    470475        -rm -f *.tab.c
     476
     477@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dummy.Plo@am__quote@
     478
     479.cpp.o:
     480@am__fastdepCXX_TRUE@   $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
     481@am__fastdepCXX_TRUE@   $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
     482@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
     483@AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     484@am__fastdepCXX_FALSE@  $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ $<
     485
     486.cpp.obj:
     487@am__fastdepCXX_TRUE@   $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
     488@am__fastdepCXX_TRUE@   $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
     489@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
     490@AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     491@am__fastdepCXX_FALSE@  $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
     492
     493.cpp.lo:
     494@am__fastdepCXX_TRUE@   $(AM_V_CXX)$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
     495@am__fastdepCXX_TRUE@   $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
     496@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(AM_V_CXX)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
     497@AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     498@am__fastdepCXX_FALSE@  $(AM_V_CXX@am__nodep@)$(LTCXXCOMPILE) -c -o $@ $<
    471499
    472500mostlyclean-libtool:
     
    675703
    676704distclean: distclean-recursive
     705        -rm -rf ./$(DEPDIR)
    677706        -rm -f Makefile
    678707distclean-am: clean-am distclean-compile distclean-generic \
     
    720749
    721750maintainer-clean: maintainer-clean-recursive
     751        -rm -rf ./$(DEPDIR)
    722752        -rm -f Makefile
    723753maintainer-clean-am: distclean-am maintainer-clean-generic
Note: See TracChangeset for help on using the changeset viewer.