From 573e8a1cd233066d864f0c0597df9e9cb689fae4 Mon Sep 17 00:00:00 2001 From: Ralf Wildenhues Date: Thu, 27 Aug 2009 05:24:43 +0000 Subject: [PATCH] Do not create $(bfdlibdir) and $(bfdincludedir) if !INSTALL_LIBBFD. opcodes/: * Makefile.am (bfdlibdir, bfdincludedir): Move definition ... [INSTALL_LIBBFD]: ... here, ... [INSTALL_LIBBFD]: ... and empty overrides here. [!INSTALL_LIBBFD]: (rpath_bfdlibdir): New variable. [!INSTALL_LIBBFD] (libbfd_la_LDFLAGS): Use it. * Makefile.in: Regenerate. * configure: Regenerate. bfd/: * acinclude.m4 (AM_INSTALL_LIBBFD): Call AM_SUBST_NOTMAKE for bfdlibdir and bfdincludedir. * Makefile.am (bfdlibdir, bfdincludedir): Move definition ... [INSTALL_LIBBFD]: ... here, ... [INSTALL_LIBBFD]: ... and empty overrides here. [!INSTALL_LIBBFD]: (rpath_bfdlibdir): New variable. [!INSTALL_LIBBFD] (libbfd_la_LDFLAGS): Use it. * Makefile.in: Regenerate. * configure: Regenerate. bfd/doc/: * Makefile.in: Regenerate. --- bfd/ChangeLog | 12 ++++++++++++ bfd/Makefile.am | 10 +++++++--- bfd/Makefile.in | 10 +++++++--- bfd/acinclude.m4 | 2 ++ bfd/configure | 2 ++ bfd/doc/ChangeLog | 4 ++++ bfd/doc/Makefile.in | 2 -- opcodes/ChangeLog | 10 ++++++++++ opcodes/Makefile.am | 11 +++++++---- opcodes/Makefile.in | 10 +++++++--- opcodes/configure | 2 ++ 11 files changed, 60 insertions(+), 15 deletions(-) diff --git a/bfd/ChangeLog b/bfd/ChangeLog index 3e8634f344..9d165ae8e3 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,3 +1,15 @@ +2009-08-27 Ralf Wildenhues + + * acinclude.m4 (AM_INSTALL_LIBBFD): Call AM_SUBST_NOTMAKE for + bfdlibdir and bfdincludedir. + * Makefile.am (bfdlibdir, bfdincludedir): Move definition ... + [INSTALL_LIBBFD]: ... here, ... + [INSTALL_LIBBFD]: ... and empty overrides here. + [!INSTALL_LIBBFD]: (rpath_bfdlibdir): New variable. + [!INSTALL_LIBBFD] (libbfd_la_LDFLAGS): Use it. + * Makefile.in: Regenerate. + * configure: Regenerate. + 2009-08-26 Maxim Kuvyrkov * elf32-m68k.c: Rewrite initialization of GOT entries for TLS diff --git a/bfd/Makefile.am b/bfd/Makefile.am index 8381492dc4..f6142dc517 100644 --- a/bfd/Makefile.am +++ b/bfd/Makefile.am @@ -12,16 +12,20 @@ CSEARCH = -I. -I$(srcdir) -I$(INCDIR) SUBDIRS = doc po bfddocdir = doc -bfdlibdir = @bfdlibdir@ -bfdincludedir = @bfdincludedir@ libbfd_la_LDFLAGS = if INSTALL_LIBBFD +bfdlibdir = @bfdlibdir@ +bfdincludedir = @bfdincludedir@ bfdlib_LTLIBRARIES = libbfd.la bfdinclude_HEADERS = $(BFD_H) $(INCDIR)/ansidecl.h $(INCDIR)/symcat.h $(INCDIR)/bfdlink.h else !INSTALL_LIBBFD +# Empty these so that the respective installation directories will not be created. +bfdlibdir = +bfdincludedir = +rpath_bfdlibdir = @bfdlibdir@ noinst_LTLIBRARIES = libbfd.la -libbfd_la_LDFLAGS += -rpath $(bfdlibdir) +libbfd_la_LDFLAGS += -rpath $(rpath_bfdlibdir) endif WARN_CFLAGS = @WARN_CFLAGS@ diff --git a/bfd/Makefile.in b/bfd/Makefile.in index f350990720..04e2316840 100644 --- a/bfd/Makefile.in +++ b/bfd/Makefile.in @@ -37,7 +37,7 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ target_triplet = @target@ -@INSTALL_LIBBFD_FALSE@am__append_1 = -rpath $(bfdlibdir) +@INSTALL_LIBBFD_FALSE@am__append_1 = -rpath $(rpath_bfdlibdir) subdir = . DIST_COMMON = README ChangeLog $(srcdir)/Makefile.in \ $(srcdir)/Makefile.am $(top_srcdir)/configure \ @@ -258,8 +258,11 @@ bfd_default_target_size = @bfd_default_target_size@ bfd_file_ptr = @bfd_file_ptr@ bfd_machines = @bfd_machines@ bfd_ufile_ptr = @bfd_ufile_ptr@ -bfdincludedir = @bfdincludedir@ -bfdlibdir = @bfdlibdir@ +@INSTALL_LIBBFD_FALSE@bfdincludedir = +@INSTALL_LIBBFD_TRUE@bfdincludedir = @bfdincludedir@ +# Empty these so that the respective installation directories will not be created. +@INSTALL_LIBBFD_FALSE@bfdlibdir = +@INSTALL_LIBBFD_TRUE@bfdlibdir = @bfdlibdir@ bindir = @bindir@ build = @build@ build_alias = @build_alias@ @@ -323,6 +326,7 @@ libbfd_la_LDFLAGS = $(am__append_1) -release `cat libtool-soversion` \ @SHARED_LDFLAGS@ $(am__empty) @INSTALL_LIBBFD_TRUE@bfdlib_LTLIBRARIES = libbfd.la @INSTALL_LIBBFD_TRUE@bfdinclude_HEADERS = $(BFD_H) $(INCDIR)/ansidecl.h $(INCDIR)/symcat.h $(INCDIR)/bfdlink.h +@INSTALL_LIBBFD_FALSE@rpath_bfdlibdir = @bfdlibdir@ @INSTALL_LIBBFD_FALSE@noinst_LTLIBRARIES = libbfd.la AM_CFLAGS = $(WARN_CFLAGS) AM_CPPFLAGS = -DBINDIR='"$(bindir)"' diff --git a/bfd/acinclude.m4 b/bfd/acinclude.m4 index cd4fd55be6..aaa147ece8 100644 --- a/bfd/acinclude.m4 +++ b/bfd/acinclude.m4 @@ -64,6 +64,8 @@ AC_DEFUN([AM_INSTALL_LIBBFD], bfdincludedir='$(exec_prefix)/$(host_noncanonical)/$(target_noncanonical)/include' fi AC_SUBST(bfdlibdir) + AM_SUBST_NOTMAKE(bfdlibdir) AC_SUBST(bfdincludedir) + AM_SUBST_NOTMAKE(bfdincludedir) ] ) diff --git a/bfd/configure b/bfd/configure index 8c4ce178e3..034bad2a65 100755 --- a/bfd/configure +++ b/bfd/configure @@ -12158,6 +12158,8 @@ fi + + host64=false target64=false bfd_default_target_size=32 diff --git a/bfd/doc/ChangeLog b/bfd/doc/ChangeLog index 5df2abac0e..87c9798ad1 100644 --- a/bfd/doc/ChangeLog +++ b/bfd/doc/ChangeLog @@ -1,3 +1,7 @@ +2009-08-27 Ralf Wildenhues + + * Makefile.in: Regenerate. + 2009-08-22 Ralf Wildenhues * Makefile.am (pdf__strip_dir, install-pdf, install-pdf-am) diff --git a/bfd/doc/Makefile.in b/bfd/doc/Makefile.in index 526423a0cb..370fcadb35 100644 --- a/bfd/doc/Makefile.in +++ b/bfd/doc/Makefile.in @@ -218,8 +218,6 @@ bfd_default_target_size = @bfd_default_target_size@ bfd_file_ptr = @bfd_file_ptr@ bfd_machines = @bfd_machines@ bfd_ufile_ptr = @bfd_ufile_ptr@ -bfdincludedir = @bfdincludedir@ -bfdlibdir = @bfdlibdir@ bindir = @bindir@ build = @build@ build_alias = @build_alias@ diff --git a/opcodes/ChangeLog b/opcodes/ChangeLog index a6ceacd568..9f418b7af6 100644 --- a/opcodes/ChangeLog +++ b/opcodes/ChangeLog @@ -1,3 +1,13 @@ +2009-08-27 Ralf Wildenhues + + * Makefile.am (bfdlibdir, bfdincludedir): Move definition ... + [INSTALL_LIBBFD]: ... here, ... + [INSTALL_LIBBFD]: ... and empty overrides here. + [!INSTALL_LIBBFD]: (rpath_bfdlibdir): New variable. + [!INSTALL_LIBBFD] (libbfd_la_LDFLAGS): Use it. + * Makefile.in: Regenerate. + * configure: Regenerate. + 2009-08-26 Philippe De Muyter * m68k-dis.c (print_insn_arg): Add movecr register names for diff --git a/opcodes/Makefile.am b/opcodes/Makefile.am index 465ea05b79..4f9a3909fe 100644 --- a/opcodes/Makefile.am +++ b/opcodes/Makefile.am @@ -17,16 +17,19 @@ COMPILE_FOR_BUILD = $(CC_FOR_BUILD) $(INCLUDES) $(AM_CPPFLAGS) \ $(BUILD_CPPFLAGS) $(BUILD_CFLAGS) LINK_FOR_BUILD = $(CC_FOR_BUILD) $(BUILD_CFLAGS) $(BUILD_LDFLAGS) -o $@ -bfdlibdir = @bfdlibdir@ -bfdincludedir = @bfdincludedir@ - libopcodes_la_LDFLAGS = if INSTALL_LIBBFD +bfdlibdir = @bfdlibdir@ +bfdincludedir = @bfdincludedir@ bfdlib_LTLIBRARIES = libopcodes.la bfdinclude_DATA = $(INCDIR)/dis-asm.h else +# Empty these so that the respective installation directories will not be created. +bfdlibdir = +bfdincludedir = +rpath_bfdlibdir = @bfdlibdir@ noinst_LTLIBRARIES = libopcodes.la -libopcodes_la_LDFLAGS += -rpath $(bfdlibdir) +libopcodes_la_LDFLAGS += -rpath $(rpath_bfdlibdir) endif # This is where bfd.h lives. diff --git a/opcodes/Makefile.in b/opcodes/Makefile.in index b7892028bd..80189acb74 100644 --- a/opcodes/Makefile.in +++ b/opcodes/Makefile.in @@ -37,7 +37,7 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ target_triplet = @target@ -@INSTALL_LIBBFD_FALSE@am__append_1 = -rpath $(bfdlibdir) +@INSTALL_LIBBFD_FALSE@am__append_1 = -rpath $(rpath_bfdlibdir) subdir = . DIST_COMMON = ChangeLog $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ $(top_srcdir)/configure $(am__configure_deps) \ @@ -229,8 +229,11 @@ am__quote = @am__quote@ am__tar = @am__tar@ am__untar = @am__untar@ archdefs = @archdefs@ -bfdincludedir = @bfdincludedir@ -bfdlibdir = @bfdlibdir@ +@INSTALL_LIBBFD_FALSE@bfdincludedir = +@INSTALL_LIBBFD_TRUE@bfdincludedir = @bfdincludedir@ +# Empty these so that the respective installation directories will not be created. +@INSTALL_LIBBFD_FALSE@bfdlibdir = +@INSTALL_LIBBFD_TRUE@bfdlibdir = @bfdlibdir@ bindir = @bindir@ build = @build@ build_alias = @build_alias@ @@ -295,6 +298,7 @@ libopcodes_la_LDFLAGS = $(am__append_1) -release `cat \ ../bfd/libtool-soversion` @SHARED_LDFLAGS@ @INSTALL_LIBBFD_TRUE@bfdlib_LTLIBRARIES = libopcodes.la @INSTALL_LIBBFD_TRUE@bfdinclude_DATA = $(INCDIR)/dis-asm.h +@INSTALL_LIBBFD_FALSE@rpath_bfdlibdir = @bfdlibdir@ @INSTALL_LIBBFD_FALSE@noinst_LTLIBRARIES = libopcodes.la # This is where bfd.h lives. diff --git a/opcodes/configure b/opcodes/configure index 860df278bd..ec7d164d77 100755 --- a/opcodes/configure +++ b/opcodes/configure @@ -11521,6 +11521,8 @@ fi + + # host-specific stuff: ALL_LINGUAS="fr sv tr es da de id pt_BR ro nl fi vi ga zh_CN" -- 2.34.1