2012-07-16 Sriraman Tallam <tmsriram@google.com>

[deliverable/binutils-gdb.git] / gold / Makefile.am

diff --git a/gold/Makefile.am b/gold/Makefile.am
index e0665e04f81d7bedb9be4f371fd55e2dd820068b..72ffdf51dab3cabcfceff3b7b3a245b5c8f3ec7b 100644 (file)
--- a/gold/Makefile.am
+++ b/gold/Makefile.am
@@ -15,7 +15,7 @@ AM_CPPFLAGS = \
        -I$(srcdir) -I$(srcdir)/../include -I$(srcdir)/../elfcpp \
        -DLOCALEDIR="\"$(datadir)/locale\"" \
        -DBINDIR="\"$(bindir)\"" -DTOOLBINDIR="\"$(tooldir)/bin\"" \
-       @INCINTL@
+       -DTOOLLIBDIR="\"$(tooldir)/lib\"" @INCINTL@
 
 LIBIBERTY = ../libiberty/libiberty.a
 
@@ -55,6 +55,7 @@ CCFILES = \
        expression.cc \
        fileread.cc \
         gc.cc \
+        gdb-index.cc \
        gold.cc \
        gold-threads.cc \
        icf.cc \
@@ -63,6 +64,7 @@ CCFILES = \
        layout.cc \
        mapfile.cc \
        merge.cc \
+       nacl.cc \
        object.cc \
        options.cc \
        output.cc \
@@ -102,6 +104,7 @@ HFILES = \
        fileread.h \
        freebsd.h \
         gc.h \
+        gdb-index.h \
        gold.h \
        gold-threads.h \
        icf.h \
@@ -109,6 +112,7 @@ HFILES = \
        layout.h \
        mapfile.h \
        merge.h \
+       nacl.h \
        object.h \
        options.h \
        output.h \
@@ -151,12 +155,14 @@ libgold_a_LIBADD = $(LIBOBJS)
 
 sources_var = main.cc
 deps_var = $(TARGETOBJS) libgold.a $(LIBIBERTY) $(LIBINTL_DEP)
-ldadd_var = $(TARGETOBJS) libgold.a $(LIBIBERTY) $(LIBINTL) \
+ldadd_var = $(TARGETOBJS) libgold.a $(LIBIBERTY) $(GOLD_LDADD) $(LIBINTL) \
         $(THREADSLIB) $(LIBDL)
+ldflags_var = $(GOLD_LDFLAGS)
 
 ld_new_SOURCES = $(sources_var)
 ld_new_DEPENDENCIES = $(deps_var)
 ld_new_LDADD = $(ldadd_var)
+ld_new_LDFLAGS = $(ldflags_var)
 
 EXTRA_ld_new_SOURCES = $(TARGETSOURCES)
 
@@ -178,12 +184,23 @@ check: libgold.a
 
 install-exec-local: ld-new$(EXEEXT)
        $(mkinstalldirs) $(DESTDIR)$(bindir) $(DESTDIR)$(tooldir)/bin
-       n=`echo ld | sed '$(transform)'`; \
+       n=`echo $(installed_linker) | sed '$(transform)'`; \
        $(INSTALL_PROGRAM) ld-new$(EXEEXT) $(DESTDIR)$(bindir)/$${n}$(EXEEXT); \
        if test "$(bindir)" != "$(tooldir)/bin"; then \
-         rm -f $(DESTDIR)$(tooldir)/bin/ld$(EXEEXT); \
-         ln $(DESTDIR)$(bindir)/$${n}$(EXEEXT) $(DESTDIR)$(tooldir)/bin/ld$(EXEEXT) >/dev/null 2>/dev/null \
+         rm -f $(DESTDIR)$(tooldir)/bin/$(installed_linker)$(EXEEXT); \
+         ln $(DESTDIR)$(bindir)/$${n}$(EXEEXT) $(DESTDIR)$(tooldir)/bin/$(installed_linker)$(EXEEXT) >/dev/null 2>/dev/null \
+         || $(INSTALL_PROGRAM) ld-new$(EXEEXT) $(DESTDIR)$(tooldir)/bin/$(installed_linker)$(EXEEXT); \
+       fi; \
+       if test "x$(install_as_default)" = "xyes"; then \
+         ld=`echo ld | sed '$(transform)'`; \
+         rm -f $(DESTDIR)$(bindir)/$${ld}$(EXEEXT); \
+         ln $(DESTDIR)$(bindir)/$${n}$(EXEEXT) $(DESTDIR)$(bindir)/$${ld}$(EXEEXT) >/dev/null 2>/dev/null \
+         || $(INSTALL_PROGRAM) ld-new$(EXEEXT) $(DESTDIR)$(bindir)/$${ld}$(EXEEXT); \
+         if test "$(bindir)" != "$(tooldir)/bin"; then \
+           rm -f $(DESTDIR)$(tooldir)/bin/ld$(EXEEXT); \
+           ln $(DESTDIR)$(bindir)/$${n}$(EXEEXT) $(DESTDIR)$(tooldir)/bin/ld$(EXEEXT) >/dev/null 2>/dev/null \
            || $(INSTALL_PROGRAM) ld-new$(EXEEXT) $(DESTDIR)$(tooldir)/bin/ld$(EXEEXT); \
+         fi; \
        fi
 
 # We want install to imply install-info as per GNU standards, despite