libiberty: documentation markup and order fixes.

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

diff --git a/gold/Makefile.am b/gold/Makefile.am
index 9c9ed1a7370d95cbe4b71fd77837d474e4dcf06e..df5e66c6b545ee7484e41b5770eaade17a944d62 100644 (file)
--- a/gold/Makefile.am
+++ b/gold/Makefile.am
@@ -84,6 +84,7 @@ CCFILES = \
        workqueue-threads.cc
 
 HFILES = \
+       arm-reloc-property.h \
        archive.h \
        attributes.h \
        binary.h \
@@ -134,16 +135,18 @@ HFILES = \
 YFILES = \
        yyscript.y
 
+DEFFILES = arm-reloc.def
+
 EXTRA_DIST = yyscript.c yyscript.h
 
 TARGETSOURCES = \
-       i386.cc x86_64.cc sparc.cc powerpc.cc arm.cc
+       i386.cc x86_64.cc sparc.cc powerpc.cc arm.cc arm-reloc-property.cc
 
 ALL_TARGETOBJS = \
        i386.$(OBJEXT) x86_64.$(OBJEXT) sparc.$(OBJEXT) powerpc.$(OBJEXT) \
-       arm.$(OBJEXT)
+       arm.$(OBJEXT) arm-reloc-property.$(OBJEXT)
 
-libgold_a_SOURCES = $(CCFILES) $(HFILES) $(YFILES)
+libgold_a_SOURCES = $(CCFILES) $(HFILES) $(YFILES) $(DEFFILES)
 libgold_a_LIBADD = $(LIBOBJS)
 
 sources_var = main.cc
@@ -159,8 +162,8 @@ EXTRA_ld_new_SOURCES = $(TARGETSOURCES)
 
 incremental_dump_SOURCES = incremental-dump.cc
 incremental_dump_DEPENDENCIES = $(TARGETOBJS) libgold.a $(LIBIBERTY) \
-        $(THREADSLIB) $(LIBDL)
-incremental_dump_LDADD = $(TARGETOBJS) libgold.a $(LIBIBERTY) \
+       $(LIBINTL_DEP)
+incremental_dump_LDADD = $(TARGETOBJS) libgold.a $(LIBIBERTY) $(LIBINTL) \
         $(THREADSLIB) $(LIBDL)
 
 # Use an explicit dependency for the bison generated header file.
@@ -175,12 +178,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