PR 10925

[pf3gnuchains/pf3gnuchains3x.git] / gold / Makefile.am

diff --git a/gold/Makefile.am b/gold/Makefile.am
index 360cb7f..8d8b617 100644 (file)
--- a/gold/Makefile.am
+++ b/gold/Makefile.am
@@ -1,6 +1,6 @@
 # Process this file with automake to generate Makefile.in
 
-AUTOMAKE_OPTIONS =
+AUTOMAKE_OPTIONS = foreign
 
 SUBDIRS = po testsuite
 
@@ -11,7 +11,7 @@ ACLOCAL_AMFLAGS = -I ../bfd -I ../config
 AM_CFLAGS = $(WARN_CFLAGS) $(LFS_CFLAGS) $(RANDOM_SEED_CFLAGS)
 AM_CXXFLAGS = $(WARN_CXXFLAGS) $(LFS_CFLAGS) $(RANDOM_SEED_CFLAGS)
 
-INCLUDES = \
+AM_CPPFLAGS = \
        -I$(srcdir) -I$(srcdir)/../include -I$(srcdir)/../elfcpp \
        -DLOCALEDIR="\"$(datadir)/locale\"" \
        -DBINDIR="\"$(bindir)\"" -DTOOLBINDIR="\"$(tooldir)/bin\"" \
@@ -29,6 +29,11 @@ endif
 
 AM_YFLAGS = -d
 
+# Automake 1.10+ disables lex and yacc output file regeneration if
+# maintainer mode is disabled.  Avoid this.
+am__skiplex =
+am__skipyacc =
+
 noinst_PROGRAMS = ld-new
 noinst_LIBRARIES = libgold.a
 
@@ -51,6 +56,7 @@ CCFILES = \
         gc.cc \
        gold.cc \
        gold-threads.cc \
+       icf.cc \
        incremental.cc \
        layout.cc \
        mapfile.cc \
@@ -68,6 +74,7 @@ CCFILES = \
        script.cc \
        stringpool.cc \
        symtab.cc \
+       target.cc \
        target-select.cc \
        version.cc \
        workqueue.cc \
@@ -92,6 +99,7 @@ HFILES = \
         gc.h \
        gold.h \
        gold-threads.h \
+       icf.h \
        layout.h \
        mapfile.h \
        merge.h \
@@ -123,12 +131,14 @@ YFILES = \
 EXTRA_DIST = yyscript.c yyscript.h
 
 TARGETSOURCES = \
-       i386.cc x86_64.cc sparc.cc powerpc.cc
+       i386.cc x86_64.cc sparc.cc powerpc.cc arm.cc
 
 ALL_TARGETOBJS = \
-       i386.$(OBJEXT) x86_64.$(OBJEXT) sparc.$(OBJEXT) powerpc.$(OBJEXT)
+       i386.$(OBJEXT) x86_64.$(OBJEXT) sparc.$(OBJEXT) powerpc.$(OBJEXT) \
+       arm.$(OBJEXT)
 
 libgold_a_SOURCES = $(CCFILES) $(HFILES) $(YFILES)
+libgold_a_LIBADD = $(LIBOBJS)
 
 sources_var = main.cc
 deps_var = $(TARGETOBJS) libgold.a $(LIBIBERTY) $(LIBINTL_DEP)
@@ -136,8 +146,8 @@ ldadd_var = $(TARGETOBJS) libgold.a $(LIBIBERTY) $(LIBINTL) \
         $(THREADSLIB) $(LIBDL)
 
 ld_new_SOURCES = $(sources_var)
-ld_new_DEPENDENCIES = $(deps_var) $(LIBOBJS)
-ld_new_LDADD = $(ldadd_var) $(LIBOBJS)
+ld_new_DEPENDENCIES = $(deps_var)
+ld_new_LDADD = $(ldadd_var)
 
 EXTRA_ld_new_SOURCES = $(TARGETSOURCES)