darkkirb/old-cross-binutils
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Do not create $(bfdlibdir) and $(bfdincludedir) if !INSTALL_LIBBFD.

Browse source 
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.
This commit is contained in:
Ralf Wildenhues 2009-08-27 05:24:43 +00:00
parent 2efab443eb
commit 573e8a1cd2
11 changed files with 60 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
bfd/ChangeLog
View file

@ -1,3 +1,15 @@
2009-08-27 Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
* 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 <maxim@codesourcery.com>
* elf32-m68k.c: Rewrite initialization of GOT entries for TLS

10
bfd/Makefile.am
View file

@ -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@

10
bfd/Makefile.in
View file

@ -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)"'

2
bfd/acinclude.m4
View file

@ -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)
]
)

2
bfd/configure vendored
View file

@ -12158,6 +12158,8 @@ fi
host64=false
target64=false
bfd_default_target_size=32

4
bfd/doc/ChangeLog
View file

@ -1,3 +1,7 @@
2009-08-27 Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
* Makefile.in: Regenerate.
2009-08-22 Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
* Makefile.am (pdf__strip_dir, install-pdf, install-pdf-am)

2
bfd/doc/Makefile.in
View file

@ -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@

10
opcodes/ChangeLog
View file

@ -1,3 +1,13 @@
2009-08-27 Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
* 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 <phdm@macqel.be>
* m68k-dis.c (print_insn_arg): Add movecr register names for

11
opcodes/Makefile.am
View file

@ -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.

10
opcodes/Makefile.in
View file

@ -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.

2
opcodes/configure vendored
View file

@ -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"