From df88f7add5379ecd0482a7ea5b21d0b776d59fac Mon Sep 17 00:00:00 2001 From: jbj Date: Tue, 22 Oct 2002 23:54:26 +0000 Subject: [PATCH] Re-fiddle elfutils-0.51 autocrap for rpm. CVS patchset: 5801 CVS date: 2002/10/22 23:54:26 --- elfutils/.cvsignore | 2 +- elfutils/Makefile.am | 6 +- elfutils/configure.ac | 31 ++++-- elfutils/configure.in | 149 ----------------------------- elfutils/libasm-po/.cvsignore | 1 + elfutils/libcpu/Makefile.in | 206 ++++++++++++++-------------------------- elfutils/libdwarf-po/.cvsignore | 1 + elfutils/libdwarf/Makefile.am | 8 +- elfutils/libebl-po/.cvsignore | 1 + elfutils/libebl/Makefile.am | 11 ++- elfutils/libelf-po/.cvsignore | 1 + elfutils/libelf/Makefile.am | 6 +- elfutils/libltdl/.cvsignore | 1 + 13 files changed, 120 insertions(+), 304 deletions(-) delete mode 100644 elfutils/configure.in diff --git a/elfutils/.cvsignore b/elfutils/.cvsignore index 044e3ad..aa7bb0c 100644 --- a/elfutils/.cvsignore +++ b/elfutils/.cvsignore @@ -5,7 +5,7 @@ Makefile Makefile.in aclocal.m4 -autom4te-* +autom4te* config.cache config.guess config.h diff --git a/elfutils/Makefile.am b/elfutils/Makefile.am index f96a9a0..bf408ee 100644 --- a/elfutils/Makefile.am +++ b/elfutils/Makefile.am @@ -2,8 +2,10 @@ ACLOCAL_AMFLAGS = -I m4 -SUBDIRS = m4 doc lib libltdl libelf libebl libdwarf libcpu libasm src \ - libelf-po libebl-po libdwarf-po libasm-po po tests +#SUBDIRS = m4 doc lib libltdl libelf libebl libdwarf libcpu libasm src \ +# libelf-po libebl-po libdwarf-po libasm-po po tests + +SUBDIRS = m4 doc lib libltdl libelf libebl libdwarf libelf-po libebl-po libdwarf-po po EXTRA_DIST = splint.rc elfutils.spec.in GPG-KEY NOTES diff --git a/elfutils/configure.ac b/elfutils/configure.ac index 6a99c57..30f7cd1 100644 --- a/elfutils/configure.ac +++ b/elfutils/configure.ac @@ -17,10 +17,10 @@ dnl along with this program; if not, write to the Free Software Foundation, dnl Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. dnl AC_INIT([elfutils],[0.51],[drepper@redhat.com],[elfutils]) -AM_INIT_AUTOMAKE([gnits 1.7 dist-bzip2]) +AM_INIT_AUTOMAKE([gnits 1.6.3 dist-bzip2]) AC_COPYRIGHT([Copyright (C) 1996-2001, 2002 Red Hat, Inc.]) -AC_CONFIG_SRCDIR([src/readelf.c]) -AC_CONFIG_HEADERS([config.h]) +AC_CONFIG_SRCDIR([libelf/elf_begin.c]) +AM_CONFIG_HEADER([config.h]) AC_PREREQ(2.54) dnl Minimum Autoconf version required. AC_CANONICAL_HOST @@ -138,6 +138,24 @@ dnl tests, because the choice of the file model can (in principle) affect dnl whether functions and headers are available, whether they work, etc. AC_SYS_LARGEFILE +dnl AC_CONFIG_FILES([Makefile +dnl elfutils.spec +dnl m4/Makefile +dnl doc/Makefile +dnl lib/Makefile +dnl libelf/Makefile +dnl libebl/Makefile +dnl libdwarf/Makefile +dnl libcpu/Makefile +dnl libasm/Makefile +dnl src/Makefile +dnl libelf-po/Makefile.in +dnl libebl-po/Makefile.in +dnl libdwarf-po/Makefile.in +dnl libasm-po/Makefile.in +dnl po/Makefile.in +dnl tests/Makefile]) + AC_CONFIG_FILES([Makefile elfutils.spec m4/Makefile @@ -146,13 +164,8 @@ AC_CONFIG_FILES([Makefile libelf/Makefile libebl/Makefile libdwarf/Makefile - libcpu/Makefile - libasm/Makefile - src/Makefile libelf-po/Makefile.in libebl-po/Makefile.in libdwarf-po/Makefile.in - libasm-po/Makefile.in - po/Makefile.in - tests/Makefile]) + po/Makefile.in]) AC_OUTPUT diff --git a/elfutils/configure.in b/elfutils/configure.in deleted file mode 100644 index da54217..0000000 --- a/elfutils/configure.in +++ /dev/null @@ -1,149 +0,0 @@ -dnl Process this file with autoconf to produce a configure script. -*-m4-*- -AC_INIT(libelf/elf_begin.c) -AM_CONFIG_HEADER(config.h) -AC_PREREQ(2.53) dnl Minimum Autoconf version required. -AC_CANONICAL_HOST - -AM_INIT_AUTOMAKE([elfutils], [0.46]) - -ALL_LINGUAS= - -AC_PROG_CC -AC_PROG_CPP -AC_PROG_GCC_TRADITIONAL -AM_GNU_GETTEXT -AC_LIBLTDL_CONVENIENCE -AC_SUBST(INCLTDL) -AC_SUBST(LIBLTDL) -AC_LIBTOOL_DLOPEN -AM_PROG_LIBTOOL -AC_CONFIG_SUBDIRS(libltdl) -AC_PROG_YACC -AM_PROG_LEX - -LOCALEDIR=$datadir -AC_SUBST(LOCALEDIR) -AC_DEFINE_UNQUOTED(LOCALEDIR, "$LOCALEDIR") -AH_TEMPLATE([LOCALEDIR], [Directory to place translation files in.]) - -AH_BOTTOM([ -/* Eventually we will allow multi-threaded applications to use the - libraries. Therefore we will add the necessary locking although - the macros used expand to nothing for now. */ -#define lock_lock(lock) -#define rwlock_define(class,name) class int name -#define rwlock_init(lock) -#define rwlock_fini(lock) -#define rwlock_rdlock(lock) -#define rwlock_wrlock(lock) -#define rwlock_unlock(lock) -#define tls_key_t void * -#define key_create(keyp, freefct) ((void) (keyp), (void) (freefct), 1) -#define getspecific(key) key -#define setspecific(key,val) key = val -#define once_define(class,name) class int name -#define once_execute(name,fct) \ - do { \ - if (name == 0) \ - fct (); \ - name = 1; \ - } while (0) - -/* gettext helper macro. */ -#define N_(Str) Str - -/* Compiler-specific definitions. */ -#define strong_alias(name, aliasname) \ - extern __typeof (name) aliasname __attribute__ ((alias (#name))); - -#ifdef __i386__ -# define internal_function \ - __attribute__ ((regparm (3), stdcall, visibility ("internal"))) -# define internal_strong_alias(name, aliasname) \ - extern __typeof (name) aliasname __attribute__ ((alias (#name), stdcall, visibility ("internal"))); -#else -# define internal_function \ - __attribute__ ((visibility ("internal"))) -# define internal_strong_alias(name, aliasname) \ - extern __typeof (name) aliasname __attribute__ ((alias (#name), visibility ("hiden"))); -#endif - -#define attribute_hidden \ - __attribute__ ((visibility ("hidden"))) - -/* Define ALLOW_UNALIGNED if the architecture allows operations on - unaligned memory locations. */ -#ifdef __i386__ -# define ALLOW_UNALIGNED 1 -#else -# undef ALLOW_UNALIGNED -#endif - -#ifdef __GNUC__ -# define unlikely(expr) __builtin_expect (expr, 0) -# define likely(expr) __builtin_expect (expr, 1) -#else -# define unlikely(expr) (expr) -# define likely(expr) (expr) -#endif - -#if __STDC_VERSION__ >= 199901L -# define flexarr_size /* empty */ -#else -# define flexarr_size 0 -#endif - -/* Calling conventions. */ -#ifdef __i386__ -# define CALLING_CONVENTION regparm (3), stdcall -# define AND_CALLING_CONVENTION , regparm (3), stdcall -#else -# define CALLING_CONVENTION -# define AND_CALLING_CONVENTION -#endif - -/* Avoid PLT entries. */ -#if defined __PIC__ && defined __GNUC__ -# define INTUSE(name) _INTUSE(name) -# define _INTUSE(name) __##name##_internal -# define INTDEF(name) _INTDEF(name) -# define _INTDEF(name) \ - extern __typeof__ (name) __##name##_internal __attribute__ ((alias (#name))); -#else -# define INTUSE(name) name -# define INTDEF(name) /* empty */ -#endif -]) - -dnl This test must come as early as possible after the compiler configuration -dnl tests, because the choice of the file model can (in principle) affect -dnl whether functions and headers are available, whether they work, etc. -AC_SYS_LARGEFILE - -dnl AC_OUTPUT([Makefile -dnl m4/Makefile -dnl doc/Makefile -dnl lib/Makefile -dnl intl/Makefile -dnl libelf/Makefile -dnl libebl/Makefile -dnl libdwarf/Makefile -dnl libasm/Makefile -dnl src/Makefile -dnl libelf-po/Makefile.in -dnl libebl-po/Makefile.in -dnl libdwarf-po/Makefile.in -dnl libasm-po/Makefile.in -dnl po/Makefile.in -dnl tests/Makefile]) - -AC_OUTPUT([Makefile - m4/Makefile - doc/Makefile - lib/Makefile - intl/Makefile - libelf/Makefile - libelf-po/Makefile.in - libdwarf/Makefile - libdwarf-po/Makefile.in - po/Makefile.in]) diff --git a/elfutils/libasm-po/.cvsignore b/elfutils/libasm-po/.cvsignore index c52251b..bbf0ed9 100644 --- a/elfutils/libasm-po/.cvsignore +++ b/elfutils/libasm-po/.cvsignore @@ -1,3 +1,4 @@ Makefile Makefile.in POTFILES +*.pot diff --git a/elfutils/libcpu/Makefile.in b/elfutils/libcpu/Makefile.in index bd1d868..fd50e44 100644 --- a/elfutils/libcpu/Makefile.in +++ b/elfutils/libcpu/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.7 from Makefile.am. +# Makefile.in generated by automake 1.6.3 from Makefile.am. # @configure_input@ # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 @@ -13,128 +13,107 @@ # PARTICULAR PURPOSE. @SET_MAKE@ +SHELL = @SHELL@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ +prefix = @prefix@ +exec_prefix = @exec_prefix@ + +bindir = @bindir@ +sbindir = @sbindir@ +libexecdir = @libexecdir@ +datadir = @datadir@ +sysconfdir = @sysconfdir@ +sharedstatedir = @sharedstatedir@ +localstatedir = @localstatedir@ +libdir = @libdir@ +infodir = @infodir@ +mandir = @mandir@ +includedir = @includedir@ +oldincludedir = /usr/include pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ top_builddir = .. +ACLOCAL = @ACLOCAL@ +AUTOCONF = @AUTOCONF@ +AUTOMAKE = @AUTOMAKE@ +AUTOHEADER = @AUTOHEADER@ + am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd INSTALL = @INSTALL@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_DATA = @INSTALL_DATA@ install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c +INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_HEADER = $(INSTALL_DATA) -transform = $(program_transform_name) +transform = @program_transform_name@ NORMAL_INSTALL = : PRE_INSTALL = : POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : +host_alias = @host_alias@ host_triplet = @host@ -ACLOCAL = @ACLOCAL@ -AMDEP_FALSE = @AMDEP_FALSE@ -AMDEP_TRUE = @AMDEP_TRUE@ + +EXEEXT = @EXEEXT@ +OBJEXT = @OBJEXT@ +PATH_SEPARATOR = @PATH_SEPARATOR@ AMTAR = @AMTAR@ -AUTOCONF = @AUTOCONF@ -AUTOHEADER = @AUTOHEADER@ -AUTOMAKE = @AUTOMAKE@ +AS = @AS@ AWK = @AWK@ +BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@ +CATOBJEXT = @CATOBJEXT@ CC = @CC@ -CCDEPMODE = @CCDEPMODE@ -CFLAGS = @CFLAGS@ CPP = @CPP@ -CPPFLAGS = @CPPFLAGS@ -CYGPATH_W = @CYGPATH_W@ -DEFS = -D_GNU_SOURCE -DHAVE_CONFIG_H -Wall -Wshadow +DATADIRNAME = @DATADIRNAME@ DEPDIR = @DEPDIR@ +DLLTOOL = @DLLTOOL@ ECHO = @ECHO@ -ECHO_C = @ECHO_C@ -ECHO_N = @ECHO_N@ -ECHO_T = @ECHO_T@ -EGREP = @EGREP@ -EXEEXT = @EXEEXT@ +GENCAT = @GENCAT@ +GLIBC21 = @GLIBC21@ GMSGFMT = @GMSGFMT@ +HAVE_LIB = @HAVE_LIB@ INCLTDL = @INCLTDL@ -INSTALL_DATA = @INSTALL_DATA@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +INSTOBJEXT = @INSTOBJEXT@ +INTLBISON = @INTLBISON@ INTLLIBS = @INTLLIBS@ -LDFLAGS = @LDFLAGS@ +INTLOBJS = @INTLOBJS@ +INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@ LEX = @LEX@ LEXLIB = @LEXLIB@ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ +LIB = @LIB@ LIBICONV = @LIBICONV@ LIBINTL = @LIBINTL@ LIBLTDL = @LIBLTDL@ -LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ LN_S = @LN_S@ LOCALEDIR = @LOCALEDIR@ +LTLIB = @LTLIB@ LTLIBICONV = @LTLIBICONV@ LTLIBINTL = @LTLIBINTL@ -LTLIBOBJS = @LTLIBOBJS@ -MAKEINFO = @MAKEINFO@ MKINSTALLDIRS = @MKINSTALLDIRS@ -MSGFMT = @MSGFMT@ -MSGMERGE = @MSGMERGE@ -OBJEXT = @OBJEXT@ +OBJDUMP = @OBJDUMP@ PACKAGE = @PACKAGE@ -PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -PACKAGE_NAME = @PACKAGE_NAME@ -PACKAGE_STRING = @PACKAGE_STRING@ -PACKAGE_TARNAME = @PACKAGE_TARNAME@ -PACKAGE_VERSION = @PACKAGE_VERSION@ -PATH_SEPARATOR = @PATH_SEPARATOR@ POSUB = @POSUB@ RANLIB = @RANLIB@ -SET_MAKE = @SET_MAKE@ -SHELL = @SHELL@ STRIP = @STRIP@ +USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ -XGETTEXT = @XGETTEXT@ YACC = @YACC@ -ac_ct_CC = @ac_ct_CC@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ am__include = @am__include@ am__quote = @am__quote@ -bindir = @bindir@ -build = @build@ -build_alias = @build_alias@ -build_cpu = @build_cpu@ -build_os = @build_os@ -build_vendor = @build_vendor@ -datadir = @datadir@ -exec_prefix = @exec_prefix@ -host = @host@ -host_alias = @host_alias@ -host_cpu = @host_cpu@ -host_os = @host_os@ -host_vendor = @host_vendor@ -includedir = @includedir@ -infodir = @infodir@ install_sh = @install_sh@ -libdir = @libdir@ -libexecdir = @libexecdir@ -localstatedir = @localstatedir@ -mandir = @mandir@ -oldincludedir = @oldincludedir@ -prefix = @prefix@ -program_transform_name = @program_transform_name@ -sbindir = @sbindir@ -sharedstatedir = @sharedstatedir@ -subdirs = @subdirs@ -sysconfdir = @sysconfdir@ -target_alias = @target_alias@ +DEFS = -D_GNU_SOURCE -DHAVE_CONFIG_H -Wall -Wshadow INCLUDES = -I$(srcdir) noinst_LTLIBRARIES = libcpu_i386.la @@ -150,8 +129,10 @@ libcpu_i386_la_LDFLAGS = libcpu_i386_la_LIBADD = am_libcpu_i386_la_OBJECTS = i386_dis.lo libcpu_i386_la_OBJECTS = $(am_libcpu_i386_la_OBJECTS) - DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) +CPPFLAGS = @CPPFLAGS@ +LDFLAGS = @LDFLAGS@ +LIBS = @LIBS@ depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/i386_dis.Plo @@ -162,6 +143,7 @@ LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ CCLD = $(CC) LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ +CFLAGS = @CFLAGS@ DIST_SOURCES = $(libcpu_i386_la_SOURCES) DIST_COMMON = Makefile.am Makefile.in SOURCES = $(libcpu_i386_la_SOURCES) @@ -180,7 +162,7 @@ clean-noinstLTLIBRARIES: -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES) @list='$(noinst_LTLIBRARIES)'; for p in $$list; do \ dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ - test "$$dir" = "$$p" && dir=.; \ + test -z "$dir" && dir=.; \ echo "rm -f \"$${dir}/so_locations\""; \ rm -f "$${dir}/so_locations"; \ done @@ -199,37 +181,23 @@ distclean-depend: -rm -rf ./$(DEPDIR) .c.o: -@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \ -@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ -@am__fastdepCC_TRUE@ then mv "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ -@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ -@am__fastdepCC_TRUE@ fi -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$< +@AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ +@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$< .c.obj: -@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \ -@am__fastdepCC_TRUE@ -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'`; \ -@am__fastdepCC_TRUE@ then mv "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ -@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ -@am__fastdepCC_TRUE@ fi -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'` +@AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ +@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + $(COMPILE) -c `cygpath -w $<` .c.lo: -@am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \ -@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ -@am__fastdepCC_TRUE@ then mv "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \ -@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ -@am__fastdepCC_TRUE@ fi -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< +@AMDEP_TRUE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ +@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< +CCDEPMODE = @CCDEPMODE@ mostlyclean-libtool: -rm -f *.lo @@ -244,9 +212,6 @@ uninstall-info-am: ETAGS = etags ETAGSFLAGS = -CTAGS = ctags -CTAGSFLAGS = - tags: TAGS ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) @@ -272,39 +237,20 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ $$tags $$unique -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ - here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - test -z "$(CTAGS_ARGS)$$tags$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$tags $$unique - GTAGS: here=`$(am__cd) $(top_builddir) && pwd` \ && cd $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) $$here distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) top_distdir = .. distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) - @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ - list='$(DISTFILES)'; for file in $$list; do \ - case $$file in \ - $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ - esac; \ + @list='$(DISTFILES)'; for file in $$list; do \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ if test "$$dir" != "$$file" && test "$$dir" != "."; then \ @@ -391,18 +337,10 @@ mostlyclean: mostlyclean-am mostlyclean-am: mostlyclean-compile mostlyclean-generic \ mostlyclean-libtool -pdf: pdf-am - -pdf-am: - -ps: ps-am - -ps-am: - uninstall-am: uninstall-info-am -.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ - clean-libtool clean-noinstLTLIBRARIES ctags distclean \ +.PHONY: GTAGS all all-am check check-am clean clean-generic \ + clean-libtool clean-noinstLTLIBRARIES distclean \ distclean-compile distclean-depend distclean-generic \ distclean-libtool distclean-tags distdir dvi dvi-am info \ info-am install install-am install-data install-data-am \ @@ -410,8 +348,8 @@ uninstall-am: uninstall-info-am install-man install-strip installcheck installcheck-am \ installdirs maintainer-clean maintainer-clean-generic \ mostlyclean mostlyclean-compile mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \ - uninstall-am uninstall-info-am + mostlyclean-libtool tags uninstall uninstall-am \ + uninstall-info-am # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff --git a/elfutils/libdwarf-po/.cvsignore b/elfutils/libdwarf-po/.cvsignore index c52251b..bbf0ed9 100644 --- a/elfutils/libdwarf-po/.cvsignore +++ b/elfutils/libdwarf-po/.cvsignore @@ -1,3 +1,4 @@ Makefile Makefile.in POTFILES +*.pot diff --git a/elfutils/libdwarf/Makefile.am b/elfutils/libdwarf/Makefile.am index 07d8175..024f2d1 100644 --- a/elfutils/libdwarf/Makefile.am +++ b/elfutils/libdwarf/Makefile.am @@ -20,10 +20,11 @@ DEFS = -D_GNU_SOURCE -DHAVE_CONFIG_H -DDWARF_DEBUG AM_CFLAGS = -Wall -Werror INCLUDES = -I. -I$(srcdir) -I$(srcdir)/../libelf -I.. -I$(srcdir)/../lib -lib_LTLIBRARIES = libdwarf.la +#lib_LTLIBRARIES = libdwarf.la +noinst_LTLIBRARIES = libdwarf.la euincludedir = ${includedir}/elfutils -euinclude_HEADERS = dwarf.h libdwarf.h +#euinclude_HEADERS = dwarf.h libdwarf.h libdwarf_la_SOURCES = dwarf_init.c dwarf_elf_init.c dwarf_get_elf.c \ dwarf_finish.c \ @@ -65,7 +66,8 @@ libdwarf_la_SOURCES = dwarf_init.c dwarf_elf_init.c dwarf_get_elf.c \ dwarf_seterrhand.c dwarf_seterrarg.c \ dwarf_dealloc.c -noinst_HEADERS = libdwarfP.h memory-access.h dwarf_abbrev_hash.h +noinst_HEADERS = libdwarfP.h memory-access.h dwarf_abbrev_hash.h \ + dwarf.h libdwarf.h EXTRA_DIST = AVAILABLE libdwarf.map diff --git a/elfutils/libebl-po/.cvsignore b/elfutils/libebl-po/.cvsignore index c52251b..bbf0ed9 100644 --- a/elfutils/libebl-po/.cvsignore +++ b/elfutils/libebl-po/.cvsignore @@ -1,3 +1,4 @@ Makefile Makefile.in POTFILES +*.pot diff --git a/elfutils/libebl/Makefile.am b/elfutils/libebl/Makefile.am index d3dbaae..0ee3611 100644 --- a/elfutils/libebl/Makefile.am +++ b/elfutils/libebl/Makefile.am @@ -21,13 +21,16 @@ AM_CFLAGS = -Wall -Werror -DOBJDIR=\"$(shell pwd)\" INCLUDES = -I$(srcdir) -I$(top_srcdir)/libelf -I$(top_srcdir)/lib -I.. \ $(INCLTDL) -lib_LTLIBRARIES = libebl.la -pkglib_LTLIBRARIES = libebl_i386.la libebl_sh.la libebl_mips.la +#lib_LTLIBRARIES = libebl.la +#pkglib_LTLIBRARIES = libebl_i386.la libebl_sh.la libebl_mips.la +noinst_LTLIBRARIES = libebl.la \ + libebl_i386.la libebl_sh.la libebl_mips.la euincludedir = ${includedir}/elfutils -euinclude_HEADERS = libebl.h elf-knowledge.h +#euinclude_HEADERS = libebl.h elf-knowledge.h -noinst_HEADERS = libeblP.h libebl_i386.h libebl_sh.h libebl_mips.h +noinst_HEADERS = libeblP.h libebl_i386.h libebl_sh.h libebl_mips.h \ + libebl.h elf-knowledge.h EXTRA_DIST = libebl.map libebl_i386.map libebl_sh.map libebl_mips.map diff --git a/elfutils/libelf-po/.cvsignore b/elfutils/libelf-po/.cvsignore index c52251b..bbf0ed9 100644 --- a/elfutils/libelf-po/.cvsignore +++ b/elfutils/libelf-po/.cvsignore @@ -1,3 +1,4 @@ Makefile Makefile.in POTFILES +*.pot diff --git a/elfutils/libelf/Makefile.am b/elfutils/libelf/Makefile.am index 877b211..c5d7de9 100644 --- a/elfutils/libelf/Makefile.am +++ b/elfutils/libelf/Makefile.am @@ -23,10 +23,11 @@ GCC_INCLUDE = -I$(shell $(CC) -print-file-name=include) LINT = splint -lib_LTLIBRARIES = libelf.la +#lib_LTLIBRARIES = libelf.la +noinst_LTLIBRARIES = libelf.la euincludedir = ${includedir}/elfutils -euinclude_HEADERS = libelf.h gelf.h nlist.h +#euinclude_HEADERS = libelf.h gelf.h nlist.h libelf_la_SOURCES = elf_version.c elf_hash.c elf_error.c elf_fill.c \ elf_begin.c elf_next.c elf_rand.c elf_end.c elf_kind.c \ @@ -76,6 +77,7 @@ libelf_la_DEPENDENCIES = $(libelf_la_LIBADD) libelf.map noinst_HEADERS = elf.h abstract.h common.h exttypes.h gelf_xlate.h libelfP.h \ version_xlate.h dl-hash.h \ + libelf.h gelf.h nlist.h \ elf-knowledge.h EXTRA_DIST = libelf.map diff --git a/elfutils/libltdl/.cvsignore b/elfutils/libltdl/.cvsignore index d1468be..a6a3066 100644 --- a/elfutils/libltdl/.cvsignore +++ b/elfutils/libltdl/.cvsignore @@ -1,5 +1,6 @@ .libs Makefile +autom4te-* config.h config.log config.status -- 2.7.4