Fix buglet in last patch.

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

diff --git a/gold/Makefile.am b/gold/Makefile.am
index b8a3be8c460c2d045170429491ae0859dc2844e0..ce17e96ed71c98c40713bc690d14189f6a7643a3 100644 (file)
--- a/gold/Makefile.am
+++ b/gold/Makefile.am
@@ -10,12 +10,19 @@ ACLOCAL_AMFLAGS = -I ../bfd -I ../config
 
 AM_CXXFLAGS = $(WARN_CXXFLAGS) $(LFS_CXXFLAGS)
 
-INCLUDES = -D_GNU_SOURCE \
+INCLUDES = \
        -I$(srcdir) -I$(srcdir)/../include -I$(srcdir)/../elfcpp \
        -DLOCALEDIR="\"$(datadir)/locale\"" \
+       -DBINDIR="\"$(bindir)\"" -DTOOLBINDIR="\"$(tooldir)/bin\"" \
        @INCINTL@
 
-YFLAGS = -d
+LIBIBERTY = ../libiberty/libiberty.a
+
+if THREADS
+THREADSLIB = -lpthread
+endif
+
+AM_YFLAGS = -d
 
 noinst_PROGRAMS = ld-new
 noinst_LIBRARIES = libgold.a
@@ -23,9 +30,13 @@ noinst_LIBRARIES = libgold.a
 CCFILES = \
        archive.cc \
        common.cc \
+       compressed_output.cc \
        defstd.cc \
        dirsearch.cc \
        dynobj.cc \
+       dwarf_reader.cc \
+       ehframe.cc \
+       errors.cc \
        fileread.cc \
        gold.cc \
        gold-threads.cc \
@@ -39,17 +50,23 @@ CCFILES = \
        reloc.cc \
        resolve.cc \
        script.cc \
-       symtab.cc \
        stringpool.cc \
+       symtab.cc \
        target-select.cc \
-       workqueue.cc
+       version.cc \
+       workqueue.cc \
+       workqueue-threads.cc
 
 HFILES = \
        archive.h \
        common.h \
+       compressed_output.h \
        defstd.h \
        dirsearch.h \
        dynobj.h \
+       dwarf_reader.h \
+       ehframe.h \
+       errors.h \
        fileread.h \
        gold.h \
        gold-threads.h \
@@ -69,25 +86,33 @@ HFILES = \
        target.h \
        target-reloc.h \
        target-select.h \
-       workqueue.h
-
-TARGETFILES = \
-       i386.cc
+       tls.h \
+       token.h \
+       workqueue.h \
+       workqueue-internal.h
 
 YFILES = \
        yyscript.y
 
 EXTRA_DIST = yyscript.c yyscript.h
 
+TARGETSOURCES = \
+       i386.cc x86_64.cc
+
+ALL_TARGETOBJS = \
+       i386.$(OBJEXT) x86_64.$(OBJEXT)
+
 libgold_a_SOURCES = $(CCFILES) $(HFILES) $(YFILES)
 
-sources_var = main.cc $(TARGETFILES)
-deps_var = libgold.a $(LIBINTL_DEP)
-ldadd_var = libgold.a $(LIBINTL)
+sources_var = main.cc
+deps_var = $(TARGETOBJS) libgold.a $(LIBIBERTY) $(LIBINTL_DEP)
+ldadd_var = $(TARGETOBJS) libgold.a $(LIBIBERTY) $(LIBINTL) $(THREADSLIB)
 
 ld_new_SOURCES = $(sources_var)
-ld_new_DEPENDENCIES = $(deps_var)
-ld_new_LDADD = $(ldadd_var)
+ld_new_DEPENDENCIES = $(deps_var) $(LIBOBJS)
+ld_new_LDADD = $(ldadd_var) $(LIBOBJS)
+
+EXTRA_ld_new_SOURCES = $(TARGETSOURCES)
 
 # Use an explicit dependency for the bison generated header file.
 script.$(OBJEXT): yyscript.h
@@ -111,7 +136,7 @@ install-exec-local: ld-new$(EXEEXT)
 # the cygnus option.
 install-data-local: install-info
 
-POTFILES= $(CCFILES) $(HFILES) $(TARGETFILES)
+POTFILES= $(CCFILES) $(HFILES) $(TARGETSOURCES)
 
 po/POTFILES.in: @MAINT@ Makefile
        for f in $(POTFILES); do echo $$f; done | LC_COLLATE= sort > tmp \