From: jbj Date: Wed, 29 Sep 1999 23:26:08 +0000 (+0000) Subject: Check in time stamps. X-Git-Tag: tznext/4.11.0.1.tizen20130304~8807 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=32942a7b6bdfb0c12dae5bc0c6e8fec12c8aac9a;p=tools%2Flibrpm-tizen.git Check in time stamps. CVS patchset: 3342 CVS date: 1999/09/29 23:26:08 --- diff --git a/.cvsignore b/.cvsignore index 7373dd5..592e5c9 100644 --- a/.cvsignore +++ b/.cvsignore @@ -2,7 +2,6 @@ .depend .depend-done Makefile -Makefile.in .libs rpm rpm2cpio @@ -11,7 +10,6 @@ rpmrc macros find-requires find-provides -config.h.in config.h config.guess config.cache diff --git a/Makefile.am b/Makefile.am index 55d2d53..8f364de 100644 --- a/Makefile.am +++ b/Makefile.am @@ -11,7 +11,7 @@ EXTRA_DIST = CHANGES CREDITS GROUPS README.amiga INSTALL RPM-PGP-KEY \ EXTRA_PROGRAMS = rpmconvert # XXX TODO: python perl -SUBDIRS = popt build lib po intl misc tools scripts tests doc . +SUBDIRS = intl po popt build lib misc tools scripts tests doc . INCLUDES = \ -I$(top_srcdir)/build \ diff --git a/Makefile.in b/Makefile.in new file mode 100644 index 0000000..874da54 --- /dev/null +++ b/Makefile.in @@ -0,0 +1,803 @@ + +# Makefile.in generated automatically by automake 1.4a from Makefile.am + +# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. +# This Makefile.in is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. + +# Top level Makefile for rpm + + +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 + +DESTDIR = + +pkgdatadir = $(datadir)/@PACKAGE@ +pkgincludedir = $(includedir)/@PACKAGE@ + +top_builddir = . + +ACLOCAL = @ACLOCAL@ +AUTOCONF = @AUTOCONF@ +AUTOMAKE = @AUTOMAKE@ +AUTOHEADER = @AUTOHEADER@ + +INSTALL = @INSTALL@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_DATA = @INSTALL_DATA@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ +INSTALL_STRIP_FLAG = +transform = @program_transform_name@ + +NORMAL_INSTALL = : +PRE_INSTALL = : +POST_INSTALL = : +NORMAL_UNINSTALL = : +PRE_UNINSTALL = : +POST_UNINSTALL = : +build_alias = @build_alias@ +build_triplet = @build@ +host_alias = @host_alias@ +host_triplet = @host@ +target_alias = @target_alias@ +target_triplet = @target@ +AR = @AR@ +AS = @AS@ +AWK = @AWK@ +BUILD_RPMCONVERT = @BUILD_RPMCONVERT@ +BZIP2BIN = @BZIP2BIN@ +CATALOGS = @CATALOGS@ +CATOBJEXT = @CATOBJEXT@ +CC = @CC@ +CPP = @CPP@ +DATADIRNAME = @DATADIRNAME@ +DLLTOOL = @DLLTOOL@ +FINDPROVIDES = @FINDPROVIDES@ +FINDREQUIRES = @FINDREQUIRES@ +FIXPERMS = @FIXPERMS@ +GENCAT = @GENCAT@ +GMOFILES = @GMOFILES@ +GMSGFMT = @GMSGFMT@ +GT_NO = @GT_NO@ +GT_YES = @GT_YES@ +GZIPBIN = @GZIPBIN@ +INCLUDE_LOCALE_H = @INCLUDE_LOCALE_H@ +INCPATH = @INCPATH@ +INSTOBJEXT = @INSTOBJEXT@ +INTLDEPS = @INTLDEPS@ +INTLLIBS = @INTLLIBS@ +INTLOBJS = @INTLOBJS@ +LD = @LD@ +LDFLAGS_STATIC = @LDFLAGS_STATIC@ +LIBMISC = @LIBMISC@ +LIBOBJS = @LIBOBJS@ +LIBRPMALIAS_FILENAME = @LIBRPMALIAS_FILENAME@ +LIBRPMRC_FILENAME = @LIBRPMRC_FILENAME@ +LIBS = @LIBS@ +LIBTOOL = @LIBTOOL@ +LN_S = @LN_S@ +LOCALEDIR = @LOCALEDIR@ +MACROFILES = @MACROFILES@ +MAKEINFO = @MAKEINFO@ +MKDIR = @MKDIR@ +MKDIR_P = @MKDIR_P@ +MKINSTALLDIRS = @MKINSTALLDIRS@ +MSGFMT = @MSGFMT@ +NM = @NM@ +OBJDUMP = @OBJDUMP@ +PACKAGE = @PACKAGE@ +PGPBIN = @PGPBIN@ +POFILES = @POFILES@ +POSUB = @POSUB@ +RANLIB = @RANLIB@ +ROOT_GROUP = @ROOT_GROUP@ +RPM = @RPM@ +RPMCANONARCH = @RPMCANONARCH@ +RPMCANONOS = @RPMCANONOS@ +RPMCANONVENDOR = @RPMCANONVENDOR@ +RPMCONFIGDIR = @RPMCONFIGDIR@ +SYSCONFIGDIR = @SYSCONFIGDIR@ +U = @U@ +USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@ +USE_NLS = @USE_NLS@ +VERSION = @VERSION@ +__CAT = @__CAT@ +__CHGRP = @__CHGRP@ +__CHMOD = @__CHMOD@ +__CHOWN = @__CHOWN@ +__CP = @__CP@ +__CPIO = @__CPIO@ +__ID = @__ID@ +__MAKE = @__MAKE@ +__MKDIR = @__MKDIR@ +__MV = @__MV@ +__PATCH = @__PATCH@ +__RM = @__RM@ +__TAR = @__TAR@ +l = @l@ +testdir = @testdir@ +tmpdir = @tmpdir@ +varprefix = @varprefix@ + +AUTOMAKE_OPTIONS = 1.4 foreign + +EXTRA_DIST = CHANGES CREDITS GROUPS README.amiga INSTALL RPM-PGP-KEY autodeps/none autodeps/*.prov autodeps/*.req autogen.sh gendiff po/*.in po/*.po po/rpm.pot python/*.am python/*.in python/*.c python/*.h python/testit rpm.magic rpmpopt rpm.spec + + +EXTRA_PROGRAMS = rpmconvert + +# XXX TODO: python perl +SUBDIRS = intl po popt build lib misc tools scripts tests doc . + +INCLUDES = -I$(top_srcdir)/build -I$(top_srcdir)/lib -I$(top_srcdir)/popt @INCPATH@ -I/usr/include -I$(top_srcdir)/misc + + +mylibs = $(top_builddir)/build/librpmbuild.la $(top_builddir)/lib/librpm.la $(top_builddir)/popt/libpopt.la @LIBMISC@ + + +LDFLAGS = @LDFLAGS_STATIC@ + +rpmbindir = $(subst usr/bin,bin,$(bindir)) +rpmbin_PROGRAMS = rpm + +bin_PROGRAMS = rpm2cpio +bin_SCRIPTS = gendiff + +noinst_PROGRAMS = @BUILD_RPMCONVERT@ + +pkglibdir = @RPMCONFIGDIR@ +pkglib_DATA = rpmrc rpmpopt macros +pkglib_SCRIPTS = find-provides find-requires mkinstalldirs config.guess config.sub + + +noinst_HEADERS = acconfig.h build.h system.h + + +rpm_SOURCES = build.c rpm.c +rpm_LDADD = $(mylibs) + +CVSTAG = r$(subst .,-,$(VERSION)) + +rpm2cpio_SOURCES = rpm2cpio.c +rpm2cpio_LDADD = $(mylibs) + +rpmconvert_SOURCES = convertdb.c oldrpmdb.c +rpmconvert_LDADD = $(mylibs) -lgdbm +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +CONFIG_HEADER = config.h +CONFIG_CLEAN_FILES = rpmrc macros +PROGRAMS = $(bin_PROGRAMS) $(noinst_PROGRAMS) $(rpmbin_PROGRAMS) + + +DEFS = @DEFS@ -I. -I$(srcdir) -I. +CPPFLAGS = @CPPFLAGS@ +rpmconvert_OBJECTS = convertdb.o oldrpmdb.o +rpmconvert_DEPENDENCIES = $(top_builddir)/build/librpmbuild.la \ +$(top_builddir)/lib/librpm.la $(top_builddir)/popt/libpopt.la +rpmconvert_LDFLAGS = +rpm2cpio_OBJECTS = rpm2cpio.o +rpm2cpio_DEPENDENCIES = $(top_builddir)/build/librpmbuild.la \ +$(top_builddir)/lib/librpm.la $(top_builddir)/popt/libpopt.la +rpm2cpio_LDFLAGS = +rpm_OBJECTS = build.o rpm.o +rpm_DEPENDENCIES = $(top_builddir)/build/librpmbuild.la \ +$(top_builddir)/lib/librpm.la $(top_builddir)/popt/libpopt.la +rpm_LDFLAGS = +SCRIPTS = $(bin_SCRIPTS) $(pkglib_SCRIPTS) + +CFLAGS = @CFLAGS@ +COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +CCLD = $(CC) +LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ +DATA = $(pkglib_DATA) + +HEADERS = $(noinst_HEADERS) + +DIST_COMMON = README ./stamp-h.in ABOUT-NLS COPYING INSTALL Makefile.am \ +Makefile.in TODO acconfig.h aclocal.m4 config.guess config.h.in \ +config.sub configure configure.in install-sh ltconfig ltmain.sh \ +macros.in missing mkinstalldirs rpmrc.in + + +DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) + +TAR = gtar +GZIP_ENV = --best +DEP_FILES = .deps/build.P .deps/convertdb.P .deps/oldrpmdb.P \ +.deps/rpm.P .deps/rpm2cpio.P +SOURCES = $(rpmconvert_SOURCES) $(rpm2cpio_SOURCES) $(rpm_SOURCES) +OBJECTS = $(rpmconvert_OBJECTS) $(rpm2cpio_OBJECTS) $(rpm_OBJECTS) + +all: all-redirect +.SUFFIXES: +.SUFFIXES: .S .c .lo .o .s +$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) + cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile + +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES) + cd $(top_builddir) \ + && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status + +$(ACLOCAL_M4): configure.in + cd $(srcdir) && $(ACLOCAL) + +config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + $(SHELL) ./config.status --recheck +$(srcdir)/configure: $(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES) + cd $(srcdir) && $(AUTOCONF) + +config.h: stamp-h + @if test ! -f $@; then \ + rm -f stamp-h; \ + $(MAKE) stamp-h; \ + else :; fi +stamp-h: $(srcdir)/config.h.in $(top_builddir)/config.status + cd $(top_builddir) \ + && CONFIG_FILES= CONFIG_HEADERS=config.h \ + $(SHELL) ./config.status + @echo timestamp > stamp-h 2> /dev/null +$(srcdir)/config.h.in: $(srcdir)/stamp-h.in + @if test ! -f $@; then \ + rm -f $(srcdir)/stamp-h.in; \ + $(MAKE) $(srcdir)/stamp-h.in; \ + else :; fi +$(srcdir)/stamp-h.in: $(top_srcdir)/configure.in $(ACLOCAL_M4) acconfig.h + cd $(top_srcdir) && $(AUTOHEADER) + @echo timestamp > $(srcdir)/stamp-h.in 2> /dev/null + +mostlyclean-hdr: + +clean-hdr: + +distclean-hdr: + -rm -f config.h + +maintainer-clean-hdr: +rpmrc: $(top_builddir)/config.status rpmrc.in + cd $(top_builddir) && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status +macros: $(top_builddir)/config.status macros.in + cd $(top_builddir) && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status + +mostlyclean-binPROGRAMS: + +clean-binPROGRAMS: + -test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS) + +distclean-binPROGRAMS: + +maintainer-clean-binPROGRAMS: + +install-binPROGRAMS: $(bin_PROGRAMS) + @$(NORMAL_INSTALL) + $(mkinstalldirs) $(DESTDIR)$(bindir) + @list='$(bin_PROGRAMS)'; for p in $$list; do \ + if test -f $$p; then \ + echo " $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \ + $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ + else :; fi; \ + done + +uninstall-binPROGRAMS: + @$(NORMAL_UNINSTALL) + list='$(bin_PROGRAMS)'; for p in $$list; do \ + rm -f $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ + done + +mostlyclean-noinstPROGRAMS: + +clean-noinstPROGRAMS: + -test -z "$(noinst_PROGRAMS)" || rm -f $(noinst_PROGRAMS) + +distclean-noinstPROGRAMS: + +maintainer-clean-noinstPROGRAMS: + +mostlyclean-rpmbinPROGRAMS: + +clean-rpmbinPROGRAMS: + -test -z "$(rpmbin_PROGRAMS)" || rm -f $(rpmbin_PROGRAMS) + +distclean-rpmbinPROGRAMS: + +maintainer-clean-rpmbinPROGRAMS: + +install-rpmbinPROGRAMS: $(rpmbin_PROGRAMS) + @$(NORMAL_INSTALL) + $(mkinstalldirs) $(DESTDIR)$(rpmbindir) + @list='$(rpmbin_PROGRAMS)'; for p in $$list; do \ + if test -f $$p; then \ + echo " $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(rpmbindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \ + $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(rpmbindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ + else :; fi; \ + done + +uninstall-rpmbinPROGRAMS: + @$(NORMAL_UNINSTALL) + list='$(rpmbin_PROGRAMS)'; for p in $$list; do \ + rm -f $(DESTDIR)$(rpmbindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ + done + +.s.o: + $(COMPILE) -c $< + +.S.o: + $(COMPILE) -c $< + +mostlyclean-compile: + -rm -f *.o core *.core + +clean-compile: + +distclean-compile: + -rm -f *.tab.c + +maintainer-clean-compile: + +.s.lo: + $(LIBTOOL) --mode=compile $(COMPILE) -c $< + +.S.lo: + $(LIBTOOL) --mode=compile $(COMPILE) -c $< + +mostlyclean-libtool: + -rm -f *.lo + +clean-libtool: + -rm -rf .libs _libs + +distclean-libtool: + +maintainer-clean-libtool: + +rpmconvert: $(rpmconvert_OBJECTS) $(rpmconvert_DEPENDENCIES) + @rm -f rpmconvert + $(LINK) $(rpmconvert_LDFLAGS) $(rpmconvert_OBJECTS) $(rpmconvert_LDADD) $(LIBS) + +rpm2cpio: $(rpm2cpio_OBJECTS) $(rpm2cpio_DEPENDENCIES) + @rm -f rpm2cpio + $(LINK) $(rpm2cpio_LDFLAGS) $(rpm2cpio_OBJECTS) $(rpm2cpio_LDADD) $(LIBS) + +rpm: $(rpm_OBJECTS) $(rpm_DEPENDENCIES) + @rm -f rpm + $(LINK) $(rpm_LDFLAGS) $(rpm_OBJECTS) $(rpm_LDADD) $(LIBS) + +install-binSCRIPTS: $(bin_SCRIPTS) + @$(NORMAL_INSTALL) + $(mkinstalldirs) $(DESTDIR)$(bindir) + @list='$(bin_SCRIPTS)'; for p in $$list; do \ + if test -f $$p; then \ + echo " $(INSTALL_SCRIPT) $$p $(DESTDIR)$(bindir)/`echo $$p|sed '$(transform)'`"; \ + $(INSTALL_SCRIPT) $$p $(DESTDIR)$(bindir)/`echo $$p|sed '$(transform)'`; \ + else if test -f $(srcdir)/$$p; then \ + echo " $(INSTALL_SCRIPT) $(srcdir)/$$p $(DESTDIR)$(bindir)/`echo $$p|sed '$(transform)'`"; \ + $(INSTALL_SCRIPT) $(srcdir)/$$p $(DESTDIR)$(bindir)/`echo $$p|sed '$(transform)'`; \ + else :; fi; fi; \ + done + +uninstall-binSCRIPTS: + @$(NORMAL_UNINSTALL) + list='$(bin_SCRIPTS)'; for p in $$list; do \ + rm -f $(DESTDIR)$(bindir)/`echo $$p|sed '$(transform)'`; \ + done + +install-pkglibSCRIPTS: $(pkglib_SCRIPTS) + @$(NORMAL_INSTALL) + $(mkinstalldirs) $(DESTDIR)$(pkglibdir) + @list='$(pkglib_SCRIPTS)'; for p in $$list; do \ + if test -f $$p; then \ + echo " $(INSTALL_SCRIPT) $$p $(DESTDIR)$(pkglibdir)/`echo $$p|sed '$(transform)'`"; \ + $(INSTALL_SCRIPT) $$p $(DESTDIR)$(pkglibdir)/`echo $$p|sed '$(transform)'`; \ + else if test -f $(srcdir)/$$p; then \ + echo " $(INSTALL_SCRIPT) $(srcdir)/$$p $(DESTDIR)$(pkglibdir)/`echo $$p|sed '$(transform)'`"; \ + $(INSTALL_SCRIPT) $(srcdir)/$$p $(DESTDIR)$(pkglibdir)/`echo $$p|sed '$(transform)'`; \ + else :; fi; fi; \ + done + +uninstall-pkglibSCRIPTS: + @$(NORMAL_UNINSTALL) + list='$(pkglib_SCRIPTS)'; for p in $$list; do \ + rm -f $(DESTDIR)$(pkglibdir)/`echo $$p|sed '$(transform)'`; \ + done + +install-pkglibDATA: $(pkglib_DATA) + @$(NORMAL_INSTALL) + $(mkinstalldirs) $(DESTDIR)$(pkglibdir) + @list='$(pkglib_DATA)'; for p in $$list; do \ + if test -f $(srcdir)/$$p; then \ + echo " $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(pkglibdir)/$$p"; \ + $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(pkglibdir)/$$p; \ + else if test -f $$p; then \ + echo " $(INSTALL_DATA) $$p $(DESTDIR)$(pkglibdir)/$$p"; \ + $(INSTALL_DATA) $$p $(DESTDIR)$(pkglibdir)/$$p; \ + fi; fi; \ + done + +uninstall-pkglibDATA: + @$(NORMAL_UNINSTALL) + list='$(pkglib_DATA)'; for p in $$list; do \ + rm -f $(DESTDIR)$(pkglibdir)/$$p; \ + done + +# This directory's subdirectories are mostly independent; you can cd +# into them and run `make' without going through this Makefile. +# To change the values of `make' variables: instead of editing Makefiles, +# (1) if the variable is set in `config.status', edit `config.status' +# (which will cause the Makefiles to be regenerated when you run `make'); +# (2) otherwise, pass the desired values on the `make' command line. + +@SET_MAKE@ + +all-recursive install-data-recursive install-exec-recursive \ +installdirs-recursive install-recursive uninstall-recursive \ +check-recursive installcheck-recursive info-recursive dvi-recursive: + @set fnord $(MAKEFLAGS); amf=$$2; \ + dot_seen=no; \ + target=`echo $@ | sed s/-recursive//`; \ + list='$(SUBDIRS)'; for subdir in $$list; do \ + echo "Making $$target in $$subdir"; \ + if test "$$subdir" = "."; then \ + dot_seen=yes; \ + local_target="$$target-am"; \ + else \ + local_target="$$target"; \ + fi; \ + (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ + || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ + done; \ + if test "$$dot_seen" = "no"; then \ + $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ + fi; test -z "$$fail" + +mostlyclean-recursive clean-recursive distclean-recursive \ +maintainer-clean-recursive: + @set fnord $(MAKEFLAGS); amf=$$2; \ + dot_seen=no; \ + rev=''; list='$(SUBDIRS)'; for subdir in $$list; do \ + rev="$$subdir $$rev"; \ + test "$$subdir" = "." && dot_seen=yes; \ + done; \ + test "$$dot_seen" = "no" && rev=". $$rev"; \ + target=`echo $@ | sed s/-recursive//`; \ + for subdir in $$rev; do \ + echo "Making $$target in $$subdir"; \ + if test "$$subdir" = "."; then \ + local_target="$$target-am"; \ + else \ + local_target="$$target"; \ + fi; \ + (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ + || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ + done && test -z "$$fail" +tags-recursive: + list='$(SUBDIRS)'; for subdir in $$list; do \ + test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ + done + +tags: TAGS + +ID: $(HEADERS) $(SOURCES) $(LISP) + list='$(SOURCES) $(HEADERS)'; \ + unique=`for i in $$list; do echo $$i; done | \ + awk ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + here=`pwd` && cd $(srcdir) \ + && mkid -f$$here/ID $$unique $(LISP) + +TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) $(LISP) + tags=; \ + here=`pwd`; \ + list='$(SUBDIRS)'; for subdir in $$list; do \ + if test "$$subdir" = .; then :; else \ + test -f $$subdir/TAGS && tags="$$tags -i $$here/$$subdir/TAGS"; \ + fi; \ + done; \ + list='$(SOURCES) $(HEADERS)'; \ + unique=`for i in $$list; do echo $$i; done | \ + awk ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + test -z "$(ETAGS_ARGS)config.h.in$$unique$(LISP)$$tags" \ + || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags config.h.in $$unique $(LISP) -o $$here/TAGS) + +mostlyclean-tags: + +clean-tags: + +distclean-tags: + -rm -f TAGS ID + +maintainer-clean-tags: + +distdir = $(PACKAGE)-$(VERSION) +top_distdir = $(distdir) + +# This target untars the dist file and tries a VPATH configuration. Then +# it guarantees that the distribution is self-contained by making another +# tarfile. +distcheck: dist + -rm -rf $(distdir) + GZIP=$(GZIP_ENV) $(TAR) zxf $(distdir).tar.gz + mkdir $(distdir)/=build + mkdir $(distdir)/=inst + dc_install_base=`cd $(distdir)/=inst && pwd`; \ + cd $(distdir)/=build \ + && ../configure --with-included-gettext --srcdir=.. --prefix=$$dc_install_base \ + && $(MAKE) $(AM_MAKEFLAGS) \ + && $(MAKE) $(AM_MAKEFLAGS) dvi \ + && $(MAKE) $(AM_MAKEFLAGS) check \ + && $(MAKE) $(AM_MAKEFLAGS) install \ + && $(MAKE) $(AM_MAKEFLAGS) installcheck \ + && $(MAKE) $(AM_MAKEFLAGS) dist + -rm -rf $(distdir) + @banner="$(distdir).tar.gz is ready for distribution"; \ + dashes=`echo "$$banner" | sed s/./=/g`; \ + echo "$$dashes"; \ + echo "$$banner"; \ + echo "$$dashes" +dist: distdir + -chmod -R a+r $(distdir) + GZIP=$(GZIP_ENV) $(TAR) chozf $(distdir).tar.gz $(distdir) + -rm -rf $(distdir) +dist-all: distdir + -chmod -R a+r $(distdir) + GZIP=$(GZIP_ENV) $(TAR) chozf $(distdir).tar.gz $(distdir) + -rm -rf $(distdir) +distdir: $(DISTFILES) + -rm -rf $(distdir) + mkdir $(distdir) + -chmod 777 $(distdir) + here=`cd $(top_builddir) && pwd`; \ + top_distdir=`cd $(distdir) && pwd`; \ + distdir=`cd $(distdir) && pwd`; \ + cd $(top_srcdir) \ + && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --foreign Makefile + $(mkinstalldirs) $(distdir)/autodeps $(distdir)/po $(distdir)/python + @for file in $(DISTFILES); do \ + d=$(srcdir); \ + if test -d $$d/$$file; then \ + cp -pr $$d/$$file $(distdir)/$$file; \ + else \ + test -f $(distdir)/$$file \ + || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ + || cp -p $$d/$$file $(distdir)/$$file || :; \ + fi; \ + done + for subdir in $(SUBDIRS); do \ + if test "$$subdir" = .; then :; else \ + test -d $(distdir)/$$subdir \ + || mkdir $(distdir)/$$subdir \ + || exit 1; \ + chmod 777 $(distdir)/$$subdir; \ + (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir=../$(distdir) distdir=../$(distdir)/$$subdir distdir) \ + || exit 1; \ + fi; \ + done + +DEPS_MAGIC := $(shell mkdir .deps > /dev/null 2>&1 || :) + +-include $(DEP_FILES) + +mostlyclean-depend: + +clean-depend: + +distclean-depend: + -rm -rf .deps + +maintainer-clean-depend: + +%.o: %.c + @echo '$(COMPILE) -c $<'; \ + $(COMPILE) -Wp,-MD,.deps/$(*F).pp -c $< + @-cp .deps/$(*F).pp .deps/$(*F).P; \ + tr ' ' '\012' < .deps/$(*F).pp \ + | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \ + >> .deps/$(*F).P; \ + rm .deps/$(*F).pp + +%.lo: %.c + @echo '$(LTCOMPILE) -c $<'; \ + $(LTCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $< + @-sed -e 's/^\([^:]*\)\.o[ ]*:/\1.lo \1.o :/' \ + < .deps/$(*F).pp > .deps/$(*F).P; \ + tr ' ' '\012' < .deps/$(*F).pp \ + | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \ + >> .deps/$(*F).P; \ + rm -f .deps/$(*F).pp +info-am: +info: info-recursive +dvi-am: +dvi: dvi-recursive +check-am: all-am +check: check-recursive +installcheck-am: +installcheck: installcheck-recursive +all-recursive-am: config.h + $(MAKE) $(AM_MAKEFLAGS) all-recursive + +install-exec-am: install-binPROGRAMS install-binSCRIPTS \ + install-pkglibSCRIPTS install-pkglibDATA +install-exec: install-exec-recursive + +install-data-am: install-rpmbinPROGRAMS install-data-local +install-data: install-data-recursive + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am +install: install-recursive +uninstall-am: uninstall-binPROGRAMS uninstall-rpmbinPROGRAMS \ + uninstall-binSCRIPTS uninstall-pkglibSCRIPTS \ + uninstall-pkglibDATA +uninstall: uninstall-recursive +all-am: Makefile $(PROGRAMS) $(SCRIPTS) $(DATA) $(HEADERS) config.h +all-redirect: all-recursive-am +install-strip: + $(MAKE) $(AM_MAKEFLAGS) INSTALL_STRIP_FLAG=-s install +installdirs: installdirs-recursive +installdirs-am: + $(mkinstalldirs) $(DESTDIR)$(bindir) $(DESTDIR)$(rpmbindir) \ + $(DESTDIR)$(bindir) $(DESTDIR)$(pkglibdir) \ + $(DESTDIR)$(pkglibdir) + + +mostlyclean-generic: + +clean-generic: + +distclean-generic: + -rm -f Makefile $(CONFIG_CLEAN_FILES) + -rm -f config.cache config.log stamp-h stamp-h[0-9]* + +maintainer-clean-generic: +mostlyclean-am: mostlyclean-hdr mostlyclean-binPROGRAMS \ + mostlyclean-noinstPROGRAMS mostlyclean-rpmbinPROGRAMS \ + mostlyclean-compile mostlyclean-libtool \ + mostlyclean-tags mostlyclean-depend mostlyclean-generic + +mostlyclean: mostlyclean-recursive + +clean-am: clean-hdr clean-binPROGRAMS clean-noinstPROGRAMS \ + clean-rpmbinPROGRAMS clean-compile clean-libtool \ + clean-tags clean-depend clean-generic mostlyclean-am + +clean: clean-recursive + +distclean-am: distclean-hdr distclean-binPROGRAMS \ + distclean-noinstPROGRAMS distclean-rpmbinPROGRAMS \ + distclean-compile distclean-libtool distclean-tags \ + distclean-depend distclean-generic clean-am + -rm -f libtool + +distclean: distclean-recursive + -rm -f config.status + +maintainer-clean-am: maintainer-clean-hdr maintainer-clean-binPROGRAMS \ + maintainer-clean-noinstPROGRAMS \ + maintainer-clean-rpmbinPROGRAMS \ + maintainer-clean-compile maintainer-clean-libtool \ + maintainer-clean-tags maintainer-clean-depend \ + maintainer-clean-generic distclean-am + @echo "This command is intended for maintainers to use;" + @echo "it deletes files that may require special tools to rebuild." + +maintainer-clean: maintainer-clean-recursive + -rm -f config.status + +.PHONY: mostlyclean-hdr distclean-hdr clean-hdr maintainer-clean-hdr \ +mostlyclean-binPROGRAMS distclean-binPROGRAMS clean-binPROGRAMS \ +maintainer-clean-binPROGRAMS uninstall-binPROGRAMS install-binPROGRAMS \ +mostlyclean-noinstPROGRAMS distclean-noinstPROGRAMS \ +clean-noinstPROGRAMS maintainer-clean-noinstPROGRAMS \ +mostlyclean-rpmbinPROGRAMS distclean-rpmbinPROGRAMS \ +clean-rpmbinPROGRAMS maintainer-clean-rpmbinPROGRAMS \ +uninstall-rpmbinPROGRAMS install-rpmbinPROGRAMS mostlyclean-compile \ +distclean-compile clean-compile maintainer-clean-compile \ +mostlyclean-libtool distclean-libtool clean-libtool \ +maintainer-clean-libtool uninstall-binSCRIPTS install-binSCRIPTS \ +uninstall-pkglibSCRIPTS install-pkglibSCRIPTS uninstall-pkglibDATA \ +install-pkglibDATA install-data-recursive uninstall-data-recursive \ +install-exec-recursive uninstall-exec-recursive installdirs-recursive \ +uninstalldirs-recursive all-recursive check-recursive \ +installcheck-recursive info-recursive dvi-recursive \ +mostlyclean-recursive distclean-recursive clean-recursive \ +maintainer-clean-recursive tags tags-recursive mostlyclean-tags \ +distclean-tags clean-tags maintainer-clean-tags distdir \ +mostlyclean-depend distclean-depend clean-depend \ +maintainer-clean-depend info-am info dvi-am dvi check check-am \ +installcheck-am installcheck all-recursive-am install-exec-am \ +install-exec install-data-local install-data-am install-data install-am \ +install uninstall-am uninstall all-redirect all-am all installdirs-am \ +installdirs mostlyclean-generic distclean-generic clean-generic \ +maintainer-clean-generic clean mostlyclean distclean maintainer-clean + + +$(PROGRAMS): $(mylibs) + +.PHONY: lclint +lclint: + lclint ${DEFS} ${INCLUDES} ${rpm_SOURCES} + +install-data-local: + @$(mkinstalldirs) $(DESTDIR)$(varprefix)/lib/rpm + @rm -f $(DESTDIR)/$(libdir)/rpmrc + @ln -s rpm/rpmrc $(DESTDIR)/$(libdir)/rpmrc + @rm -f $(DESTDIR)/$(libdir)/rpmpopt + @ln -s rpm/rpmpopt $(DESTDIR)/$(libdir)/rpmpopt + @$(mkinstalldirs) $(DESTDIR)/$(prefix)/src/redhat/BUILD + @case "@build_cpu@" in \ + *86) $(mkinstalldirs) $(DESTDIR)/$(prefix)/src/redhat/RPMS/i386 ;;\ + alpha*) $(mkinstalldirs) $(DESTDIR)/$(prefix)/src/redhat/RPMS/alpha ;;\ + sparc*) $(mkinstalldirs) $(DESTDIR)/$(prefix)/src/redhat/RPMS/sparc;\ + $(mkinstalldirs) $(DESTDIR)/$(prefix)/src/redhat/RPMS/sparc64 ;;\ + powerpc*) $(mkinstalldirs) $(DESTDIR)/$(prefix)/src/redhat/RPMS/ppc ;;\ + esac + @case "@build_os@" in \ + mint) $(mkinstalldirs) $(DESTDIR)/$(prefix)/src/redhat/RPMS/m68kmint ;;\ + *) $(mkinstalldirs) $(DESTDIR)/$(prefix)/src/redhat/RPMS/@build_cpu@ ;;\ + esac + @$(mkinstalldirs) $(DESTDIR)/$(prefix)/src/redhat/RPMS/noarch + @$(mkinstalldirs) $(DESTDIR)/$(prefix)/src/redhat/SOURCES + @$(mkinstalldirs) $(DESTDIR)/$(prefix)/src/redhat/SPECS + @$(mkinstalldirs) $(DESTDIR)/$(prefix)/src/redhat/SRPMS + @$(mkinstalldirs) $(DESTDIR)/var/tmp + +.PHONY: tar +tar: + rm -rf /tmp/rpm-$(VERSION) + $(MAKE) DESTDIR=/tmp/rpm-$(VERSION) install + cd /tmp/rpm-$(VERSION) ; tar cvf /tmp/rpm-$(VERSION).tar . + +.PHONY: noconfig +noconfig: + find . -name "Makefile" -exec rm {} \; + rm -f *gz *rpm config.* + +.PHONY: archive +archive: + @cvs -d `cat CVS/Root` diff 2>&1 > /dev/null || { \ + echo " " ; \ + echo "==> Please resolve differences between the repository and" ; \ + echo "==> your rpm check out before tagging." ; \ + echo " " ; \ + cvs -n up ; \ + echo " " ; \ + exit 1 ; \ + } + @cvs -d `cat CVS/Root` -Q tag -F $(CVSTAG) . + @make dist + @echo " " + @echo "The final archive is ./rpm-$(VERSION).tar.gz." + +.PHONY: nextsrpm +nextsrpm: all archive + @sudo ./rpm -ta rpm-$(VERSION).tar.gz + +# 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. +.NOEXPORT: diff --git a/autogen.sh b/autogen.sh index 259c6cf..8460997 100755 --- a/autogen.sh +++ b/autogen.sh @@ -29,7 +29,7 @@ if [ "$1" = "--noconfigure" ]; then fi if [ X"$@" = X -a "X`uname -s`" = "XLinux" ]; then - ./configure --prefix=/usr --enable-shared + ./configure --prefix=/usr --enable-shared "$@" else ./configure "$@" fi diff --git a/config.h.in b/config.h.in new file mode 100644 index 0000000..c868718 --- /dev/null +++ b/config.h.in @@ -0,0 +1,439 @@ + +/* config.h.in. Generated automatically from configure.in by autoheader. */ + +/* Define if on AIX 3. + System headers sometimes define this. + We just want to avoid a redefinition error message. */ +#ifndef _ALL_SOURCE +#undef _ALL_SOURCE +#endif + +/* Define if using alloca.c. */ +#undef C_ALLOCA + +/* Define to empty if the keyword does not work. */ +#undef const + +/* Define to one of _getb67, GETB67, getb67 for Cray-2 and Cray-YMP systems. + This function is required for alloca.c support on those systems. */ +#undef CRAY_STACKSEG_END + +/* Define if you have alloca, as a function or macro. */ +#undef HAVE_ALLOCA + +/* Define if you have and it should be used (not on Ultrix). */ +#undef HAVE_ALLOCA_H + +/* Define if you don't have vprintf but do have _doprnt. */ +#undef HAVE_DOPRNT + +/* Define if your system has a working fnmatch function. */ +#undef HAVE_FNMATCH + +/* Define if you have the getmntent function. */ +#undef HAVE_GETMNTENT + +/* Define if you have a working `mmap' system call. */ +#undef HAVE_MMAP + +/* Define if you have the vprintf function. */ +#undef HAVE_VPRINTF + +/* Define as __inline if that's what the C compiler calls it. */ +#undef inline + +/* Define if major, minor, and makedev are declared in . */ +#undef MAJOR_IN_MKDEV + +/* Define if major, minor, and makedev are declared in . */ +#undef MAJOR_IN_SYSMACROS + +/* Define if on MINIX. */ +#undef _MINIX + +/* Define to `int' if doesn't define. */ +#undef mode_t + +/* Define to `long' if doesn't define. */ +#undef off_t + +/* Define to `int' if doesn't define. */ +#undef pid_t + +/* Define if the system does not provide POSIX.1 features except + with this defined. */ +#undef _POSIX_1_SOURCE + +/* Define if you need to in order for stat and other things to work. */ +#undef _POSIX_SOURCE + +/* Define to `unsigned' if doesn't define. */ +#undef size_t + +/* If using the C implementation of alloca, define if you know the + direction of stack growth for your system; otherwise it will be + automatically deduced at run-time. + STACK_DIRECTION > 0 => grows toward higher addresses + STACK_DIRECTION < 0 => grows toward lower addresses + STACK_DIRECTION = 0 => direction of growth unknown + */ +#undef STACK_DIRECTION + +/* Define if you have the ANSI C header files. */ +#undef STDC_HEADERS + +/* Define if you can safely include both and . */ +#undef TIME_WITH_SYS_TIME + +/* Define to 1 if NLS is requested. */ +#undef ENABLE_NLS + +/* Define as 1 if you have catgets and don't want to use GNU gettext. */ +#undef HAVE_CATGETS + +/* Define as 1 if you have gettext and don't want to use GNU gettext. */ +#undef HAVE_GETTEXT + +/* Define if your locale.h file contains LC_MESSAGES. */ +#undef HAVE_LC_MESSAGES + +/* Define to 1 if you have the stpcpy function. */ +#undef HAVE_STPCPY + +/* Define as 1 if you have mntctl() (only aix?) */ +#undef HAVE_MNTCTL + +/* Define as 1 if defines h_errno */ +#undef HAVE_HERRNO + +/* Define as 1 if defines S_ISLNK */ +#undef HAVE_S_ISLNK + +/* Define as 1 if defines S_IFSOCK */ +#undef HAVE_S_IFSOCK + +/* Define as 1 if defines S_ISSOCK */ +#undef HAVE_S_ISSOCK + +/* Define as 1 if we need myrealloc */ +#undef NEED_MYREALLOC + +/* Define as one if we need to include (along with ) */ +#undef NEED_STRINGS_H + +/* Define as 1 if you have getmntinfo_r() (only osf?) */ +#undef HAVE_GETMNTINFO_R + +/* Define as 1 if you have "struct mnttab" (only sco?) */ +#undef HAVE_STRUCT_MNTTAB + +/* Define as 1 if you have lchown() */ +#undef HAVE_LCHOWN + +/* Define as 1 if chown() follows symlinks and you don't have lchown() */ +#undef CHOWN_FOLLOWS_SYMLINK + +/* Define if the patch call you'll be using is 2.1 or older */ +#undef HAVE_OLDPATCH_21 + +/* A full path to a program, possibly with arguments, that will create a + directory and all necessary parent directories, ala `mkdir -p' */ +#undef MKDIR_P + +/* Full path to rpm locale directory (usually /usr/share/locale) */ +#undef LOCALEDIR + +/* Full path to rpm global configuration directory (usually /usr/lib/rpm) */ +#undef RPMCONFIGDIR + +/* Full path to rpm system configuration directory (usually /etc/rpm) */ +#undef SYSCONFIGDIR + +/* Full path to find-provides script (usually /usr/lib/rpm/find-provides) */ +#undef FINDPROVIDES + +/* Full path to find-requires script (usually /usr/lib/rpm/find-requires) */ +#undef FINDREQUIRES + +/* Full path to rpmpopt configuration file (usually /usr/lib/rpm/rpmpopt) */ +#undef LIBRPMALIAS_FILENAME + +/* Full path to rpmrc configuration file (usually /usr/lib/rpm/rpmrc) */ +#undef LIBRPMRC_FILENAME + +/* Full path to macros configuration file (usually /usr/lib/rpm/macros) */ +#undef MACROFILES + +/* statfs in (for solaris 2.6+ systems) */ +#undef STATFS_IN_SYS_STATVFS + +/* statfs in (for linux systems) */ +#undef STATFS_IN_SYS_VFS + +/* statfs in (for Digital Unix 4.0D systems) */ +#undef STATFS_IN_SYS_MOUNT + +/* statfs in (for Irix 6.4 systems) */ +#undef STATFS_IN_SYS_STATFS + +/* define if struct statfs has the f_bavail member */ +#undef STATFS_HAS_F_BAVAIL + +/* define if the statfs() call takes 4 arguments */ +#undef STAT_STATFS4 + +/* define if support rpm-1.0 packages is desired */ +#undef ENABLE_V1_PACKAGES + +/* define if experimental support rpm-4.0 packages is desired */ +#undef ENABLE_V4_PACKAGES + +/* define if experimental support for packages with bzip2 payloads is desired */ +#undef ENABLE_BZIP2_PAYLOAD + +/* Use the included regex.c? */ +#undef USE_GNU_REGEX + +/* Use the included glob.c? */ +#undef USE_GNU_GLOB + +/* Define if you have the __argz_count function. */ +#undef HAVE___ARGZ_COUNT + +/* Define if you have the __argz_next function. */ +#undef HAVE___ARGZ_NEXT + +/* Define if you have the __argz_stringify function. */ +#undef HAVE___ARGZ_STRINGIFY + +/* Define if you have the basename function. */ +#undef HAVE_BASENAME + +/* Define if you have the dcgettext function. */ +#undef HAVE_DCGETTEXT + +/* Define if you have the getcwd function. */ +#undef HAVE_GETCWD + +/* Define if you have the getpagesize function. */ +#undef HAVE_GETPAGESIZE + +/* Define if you have the getpassphrase function. */ +#undef HAVE_GETPASSPHRASE + +/* Define if you have the getwd function. */ +#undef HAVE_GETWD + +/* Define if you have the glob function. */ +#undef HAVE_GLOB + +/* Define if you have the inet_aton function. */ +#undef HAVE_INET_ATON + +/* Define if you have the mtrace function. */ +#undef HAVE_MTRACE + +/* Define if you have the munmap function. */ +#undef HAVE_MUNMAP + +/* Define if you have the putenv function. */ +#undef HAVE_PUTENV + +/* Define if you have the realpath function. */ +#undef HAVE_REALPATH + +/* Define if you have the regcomp function. */ +#undef HAVE_REGCOMP + +/* Define if you have the setenv function. */ +#undef HAVE_SETENV + +/* Define if you have the setlocale function. */ +#undef HAVE_SETLOCALE + +/* Define if you have the stpcpy function. */ +#undef HAVE_STPCPY + +/* Define if you have the stpncpy function. */ +#undef HAVE_STPNCPY + +/* Define if you have the strcasecmp function. */ +#undef HAVE_STRCASECMP + +/* Define if you have the strchr function. */ +#undef HAVE_STRCHR + +/* Define if you have the strcspn function. */ +#undef HAVE_STRCSPN + +/* Define if you have the strdup function. */ +#undef HAVE_STRDUP + +/* Define if you have the strerror function. */ +#undef HAVE_STRERROR + +/* Define if you have the strncasecmp function. */ +#undef HAVE_STRNCASECMP + +/* Define if you have the strspn function. */ +#undef HAVE_STRSPN + +/* Define if you have the strstr function. */ +#undef HAVE_STRSTR + +/* Define if you have the strtol function. */ +#undef HAVE_STRTOL + +/* Define if you have the strtoul function. */ +#undef HAVE_STRTOUL + +/* Define if you have the header file. */ +#undef HAVE_ARGZ_H + +/* Define if you have the header file. */ +#undef HAVE_BZLIB_H + +/* Define if you have the header file. */ +#undef HAVE_DB1_DB_H + +/* Define if you have the header file. */ +#undef HAVE_DB_185_H + +/* Define if you have the header file. */ +#undef HAVE_DIRENT_H + +/* Define if you have the header file. */ +#undef HAVE_ERR_H + +/* Define if you have the header file. */ +#undef HAVE_FCNTL_H + +/* Define if you have the header file. */ +#undef HAVE_GDBM_H + +/* Define if you have the header file. */ +#undef HAVE_GETOPT_H + +/* Define if you have the header file. */ +#undef HAVE_GLOB_H + +/* Define if you have the header file. */ +#undef HAVE_GRP_H + +/* Define if you have the header file. */ +#undef HAVE_LIBIO_H + +/* Define if you have the header file. */ +#undef HAVE_LIMITS_H + +/* Define if you have the header file. */ +#undef HAVE_LOCALE_H + +/* Define if you have the header file. */ +#undef HAVE_MACHINE_TYPES_H + +/* Define if you have the header file. */ +#undef HAVE_MALLOC_H + +/* Define if you have the header file. */ +#undef HAVE_MCHECK_H + +/* Define if you have the header file. */ +#undef HAVE_MEMORY_H + +/* Define if you have the header file. */ +#undef HAVE_MNTENT_H + +/* Define if you have the header file. */ +#undef HAVE_NDIR_H + +/* Define if you have the header file. */ +#undef HAVE_NETDB_H + +/* Define if you have the header file. */ +#undef HAVE_NETINET_IN_SYSTM_H + +/* Define if you have the header file. */ +#undef HAVE_NL_TYPES_H + +/* Define if you have the header file. */ +#undef HAVE_PWD_H + +/* Define if you have the header file. */ +#undef HAVE_STRING_H + +/* Define if you have the header file. */ +#undef HAVE_SYS_DIR_H + +/* Define if you have the header file. */ +#undef HAVE_SYS_MMAN_H + +/* Define if you have the header file. */ +#undef HAVE_SYS_MNTCTL_H + +/* Define if you have the header file. */ +#undef HAVE_SYS_MNTTAB_H + +/* Define if you have the header file. */ +#undef HAVE_SYS_MOUNT_H + +/* Define if you have the header file. */ +#undef HAVE_SYS_NDIR_H + +/* Define if you have the header file. */ +#undef HAVE_SYS_PARAM_H + +/* Define if you have the header file. */ +#undef HAVE_SYS_RESOURCE_H + +/* Define if you have the header file. */ +#undef HAVE_SYS_SELECT_H + +/* Define if you have the header file. */ +#undef HAVE_SYS_SOCKET_H + +/* Define if you have the header file. */ +#undef HAVE_SYS_STDTYPES_H + +/* Define if you have the header file. */ +#undef HAVE_SYS_SYSTEMCFG_H + +/* Define if you have the header file. */ +#undef HAVE_SYS_TYPES_H + +/* Define if you have the header file. */ +#undef HAVE_SYS_UTSNAME_H + +/* Define if you have the header file. */ +#undef HAVE_SYS_VMOUNT_H + +/* Define if you have the header file. */ +#undef HAVE_SYS_WAIT_H + +/* Define if you have the header file. */ +#undef HAVE_UNISTD_H + +/* Define if you have the header file. */ +#undef HAVE_UTIME_H + +/* Define if you have the header file. */ +#undef HAVE_ZLIB_H + +/* Define if you have the db1 library (-ldb1). */ +#undef HAVE_LIBDB1 + +/* Define if you have the i library (-li). */ +#undef HAVE_LIBI + +/* Define if you have the port library (-lport). */ +#undef HAVE_LIBPORT + +/* Name of package */ +#undef PACKAGE + +/* Version number of package */ +#undef VERSION + +/* Define if compiler has function prototypes */ +#undef PROTOTYPES + diff --git a/configure.in b/configure.in index 66d7019..1ab3515 100644 --- a/configure.in +++ b/configure.in @@ -1,3 +1,4 @@ + dnl configure.in for RPM dnl dnl Don't add checks for things we can't work around, unless those checks @@ -261,7 +262,7 @@ test "$with_v4_packages" = yes && AC_DEFINE(ENABLE_V4_PACKAGES) ### use option --enable-bzip2-payload to turn on support for packages with bzip2 payloads AC_MSG_CHECKING(if you want support for packages with bzip2 payloads) AC_ARG_ENABLE(bzip2-payload, - [ --enable-bzip2-payload[=no] [experimental] support for packages with bzip2 paylaods], + [ --enable-bzip2-payload[=no] [experimental] support for packages with bzip2 paylaods], [with_bzip2_payload=$enableval], [with_bzip2_payload=no]) AC_MSG_RESULT($with_bzip2_payload) @@ -597,7 +598,7 @@ AC_REPLACE_FUNCS(basename) dnl dnl XXX Regex replacement isn't known to be needed yet. dnl -AC_ARG_WITH(regex, [ --with-regex Use the GNU regex library ], +AC_ARG_WITH(regex, [ --with-regex use the GNU regex library ], [rpm_cv_regex=yes], [AC_CHECK_FUNCS(regcomp, rpm_cv_regex=no, rpm_cv_regex=yes)]) @@ -625,7 +626,7 @@ dnl XXX Glob may be broken on solaris and aix when %files gets something like dnl /usr/share/locale/*/LC_MESSAGES/*.mo dnl (Note: two asterisks in glob pattern.) dnl -AC_ARG_WITH(glob, [ --with-glob Use the internal glob ], +AC_ARG_WITH(glob, [ --with-glob use the internal GNU glob ], [rpm_cv_glob=yes], [AC_CHECK_FUNCS(glob, rpm_cv_glob=no, rpm_cv_glob=yes)]) @@ -894,7 +895,9 @@ AC_OUTPUT([Makefile rpmrc macros lib/Makefile tests/Makefile tests/rpmrc tests/macros tests/hello-test/Makefile misc/Makefile po/Makefile.in intl/Makefile doc/Makefile doc/manual/Makefile doc/pl/Makefile doc/ru/Makefile - python/Makefile], - [touch Makefile.in - sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile]) + python/Makefile]) +dnl [echo timestamp > popt/stamp-h.in +dnl echo timestamp > stamp-h.in +dnl touch Makefile.in +dnl sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile]) diff --git a/intl/Makefile.in b/intl/Makefile.in index 4bdb186..46620c5 100644 --- a/intl/Makefile.in +++ b/intl/Makefile.in @@ -1,3 +1,4 @@ + # Makefile for directory with message catalog handling in GNU NLS Utilities. # Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc. # diff --git a/intl/po2tbl.sed.in b/intl/po2tbl.sed.in index b3bcca4..e623cdf 100644 --- a/intl/po2tbl.sed.in +++ b/intl/po2tbl.sed.in @@ -1,3 +1,4 @@ + # po2tbl.sed - Convert Uniforum style .po file to lookup table for catgets # Copyright (C) 1995 Free Software Foundation, Inc. # Ulrich Drepper , 1995. diff --git a/macros.in b/macros.in index 407d81f..e0b8a06 100644 --- a/macros.in +++ b/macros.in @@ -1,4 +1,5 @@ -# $Id: macros.in,v 1.35 1999/08/22 04:17:12 jbj Exp $ + +# $Id: macros.in,v 1.36 1999/09/29 23:26:08 jbj Exp $ #============================================================================== # Macro naming conventions (preliminary): # diff --git a/po/.cvsignore b/po/.cvsignore index 8f58e9b..3c3710e 100644 --- a/po/.cvsignore +++ b/po/.cvsignore @@ -1,4 +1,6 @@ Makefile Makefile.in POTFILES -*.mo +stamp-cat-id +cat-id-tbl.c +*.gmo diff --git a/po/Makefile.in.in b/po/Makefile.in.in index 7492eef..b504cb8 100644 --- a/po/Makefile.in.in +++ b/po/Makefile.in.in @@ -1,65 +1,229 @@ + +# Makefile for program source directory in GNU NLS utilities package. +# Copyright (C) 1995, 1996, 1997 by Ulrich Drepper +# +# This file file be copied and used freely without restrictions. It can +# be used in projects which are not available under the GNU Public License +# but which still want to provide support for the GNU gettext functionality. +# Please note that the actual code is *not* freely available. + +PACKAGE = @PACKAGE@ +VERSION = @VERSION@ + +SHELL = /bin/sh +@SET_MAKE@ + srcdir = @srcdir@ top_srcdir = @top_srcdir@ -VPATH = $(srcdir) +VPATH = @srcdir@ + +prefix = @prefix@ +exec_prefix = @exec_prefix@ +datadir = $(prefix)/@DATADIRNAME@ +localedir = $(datadir)/locale +gnulocaledir = $(prefix)/share/locale +gettextsrcdir = $(prefix)/share/gettext/po +subdir = po -LOCALEDIR=@prefix@/share/locale +INSTALL = @INSTALL@ +INSTALL_DATA = @INSTALL_DATA@ +MKINSTALLDIRS = @MKINSTALLDIRS@ -INSTALL= @INSTALL@ +CC = @CC@ +GENCAT = @GENCAT@ +GMSGFMT = PATH=../src:$$PATH @GMSGFMT@ +MSGFMT = @MSGFMT@ +XGETTEXT = PATH=../src:$$PATH @XGETTEXT@ +MSGMERGE = PATH=../src:$$PATH msgmerge -installprefix = $(DESTDIR) +DEFS = @DEFS@ +CFLAGS = @CFLAGS@ +CPPFLAGS = @CPPFLAGS@ -MSGMERGE = msgmerge +INCLUDES = -I.. -I$(top_srcdir)/intl -NLSPACKAGE = @PACKAGE@ +COMPILE = $(CC) -c $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) $(XCFLAGS) -LINGUAS = cs de fi fr pl pt_BR ru sk sr sv tr -CATALOGS = $(addsuffix .mo, $(LINGUAS)) +SOURCES = cat-id-tbl.c +POFILES = @POFILES@ +GMOFILES = @GMOFILES@ +DISTFILES = Makefile.in.in POTFILES.in $(PACKAGE).pot \ +stamp-cat-id $(POFILES) $(GMOFILES) $(SOURCES) POTFILES = \ -all: $(NLSPACKAGE).pot $(CATALOGS) +CATALOGS = @CATALOGS@ +CATOBJEXT = @CATOBJEXT@ +INSTOBJEXT = @INSTOBJEXT@ + +.SUFFIXES: +.SUFFIXES: .c .o .po .pox .gmo .mo .msg .cat + +.c.o: + $(COMPILE) $< + +.po.pox: + $(MAKE) $(PACKAGE).pot + $(MSGMERGE) $< $(srcdir)/$(PACKAGE).pot -o $*.pox + +.po.mo: + $(MSGFMT) -o $@ $< + +.po.gmo: + file=$(srcdir)/`echo $* | sed 's,.*/,,'`.gmo \ + && rm -f $$file && $(GMSGFMT) -o $$file $< + +.po.cat: + sed -f ../intl/po2msg.sed < $< > $*.msg \ + && rm -f $@ && $(GENCAT) $@ $*.msg -$(NLSPACKAGE).pot: $(POTFILES) - xgettext --default-domain=$(NLSPACKAGE) \ - --add-comments --keyword=_ --keyword=N_ $(POTFILES) - if cmp -s $(NLSPACKAGE).po $(NLSPACKAGE).pot; then \ - rm -f $(NLSPACKAGE).po; \ + +all: all-@USE_NLS@ + +all-yes: cat-id-tbl.c $(CATALOGS) +all-no: + +$(srcdir)/$(PACKAGE).pot: $(POTFILES) + $(XGETTEXT) --default-domain=$(PACKAGE) --directory=$(top_srcdir) \ + --add-comments --keyword=_ --keyword=N_ \ + --files-from=$(srcdir)/POTFILES.in \ + && test ! -f $(PACKAGE).po \ + || ( rm -f $(srcdir)/$(PACKAGE).pot \ + && mv $(PACKAGE).po $(srcdir)/$(PACKAGE).pot ) + +$(srcdir)/cat-id-tbl.c: stamp-cat-id; @: +$(srcdir)/stamp-cat-id: $(PACKAGE).pot + rm -f cat-id-tbl.tmp + sed -f ../intl/po2tbl.sed $(srcdir)/$(PACKAGE).pot \ + | sed -e "s/@PACKAGE NAME@/$(PACKAGE)/" > cat-id-tbl.tmp + if cmp -s cat-id-tbl.tmp $(srcdir)/cat-id-tbl.c; then \ + rm cat-id-tbl.tmp; \ else \ - mv $(NLSPACKAGE).po $(NLSPACKAGE).pot; \ + echo cat-id-tbl.c changed; \ + rm -f $(srcdir)/cat-id-tbl.c; \ + mv cat-id-tbl.tmp $(srcdir)/cat-id-tbl.c; \ fi + cd $(srcdir) && rm -f stamp-cat-id && echo timestamp > stamp-cat-id -update-po: Makefile - @$(MAKE) $(NLSPACKAGE).pot + +install: install-exec install-data +install-exec: +install-data: install-data-@USE_NLS@ +install-data-no: all +install-data-yes: all + if test -x "$(MKINSTALLDIRS)"; then \ + $(MKINSTALLDIRS) $(DESTDIR)$(datadir); \ + else \ + $(SHELL) $(top_srcdir)/mkinstalldirs $(DESTDIR)$(datadir); \ + fi @catalogs='$(CATALOGS)'; \ for cat in $$catalogs; do \ - lang=`echo $$cat | sed 's/.mo//'`; \ - if $(MSGMERGE) $$lang.po $(NLSPACKAGE).pot > $$lang.pox ; then \ - echo "$(MSGMERGE) of $$lang succeeded" ; \ - mv $$lang.pox $$lang.po ; \ - else \ - echo "$(MSGMERGE) of $$lang failed" ; \ - rm -f $$lang.pox ; \ - fi \ + cat=`basename $$cat`; \ + case "$$cat" in \ + *.gmo) destdir=$(DESTDIR)$(gnulocaledir);; \ + *) destdir=$(DESTDIR)$(localedir);; \ + esac; \ + lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \ + dir=$$destdir/$$lang/LC_MESSAGES; \ + if test -r "$(MKINSTALLDIRS)"; then \ + $(MKINSTALLDIRS) $$dir; \ + else \ + $(SHELL) $(top_srcdir)/mkinstalldirs $$dir; \ + fi; \ + if test -r $$cat; then \ + $(INSTALL_DATA) $$cat $$dir/$(PACKAGE)$(INSTOBJEXT); \ + echo "installing $$cat as $$dir/$(PACKAGE)$(INSTOBJEXT)"; \ + else \ + $(INSTALL_DATA) $(srcdir)/$$cat $$dir/$(PACKAGE)$(INSTOBJEXT); \ + echo "installing $(srcdir)/$$cat as" \ + "$$dir/$(PACKAGE)$(INSTOBJEXT)"; \ + fi; \ + if test -r $$cat.m; then \ + $(INSTALL_DATA) $$cat.m $$dir/$(PACKAGE)$(INSTOBJEXT).m; \ + echo "installing $$cat.m as $$dir/$(PACKAGE)$(INSTOBJEXT).m"; \ + else \ + if test -r $(srcdir)/$$cat.m ; then \ + $(INSTALL_DATA) $(srcdir)/$$cat.m \ + $$dir/$(PACKAGE)$(INSTOBJEXT).m; \ + echo "installing $(srcdir)/$$cat as" \ + "$$dir/$(PACKAGE)$(INSTOBJEXT).m"; \ + else \ + true; \ + fi; \ + fi; \ done + if test "$(PACKAGE)" = "gettext"; then \ + if test -x "$(MKINSTALLDIRS)"; then \ + $(MKINSTALLDIRS) $(DESTDIR)$(gettextsrcdir); \ + else \ + $(SHELL) $(top_srcdir)/mkinstalldirs $(DESTDIR)$(gettextsrcdir); \ + fi; \ + $(INSTALL_DATA) $(srcdir)/Makefile.in.in \ + $(DESTDIR)$(gettextsrcdir)/Makefile.in.in; \ + else \ + : ; \ + fi -clean: - rm -f *mo -# rm -f $(NLSPACKAGE).pot +# Define this as empty until I found a useful application. +installcheck: -distclean: clean - rm -f .depend Makefile +uninstall: + catalogs='$(CATALOGS)'; \ + for cat in $$catalogs; do \ + cat=`basename $$cat`; \ + lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \ + rm -f $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(PACKAGE)$(INSTOBJEXT); \ + rm -f $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(PACKAGE)$(INSTOBJEXT).m; \ + rm -f $(DESTDIR)$(gnulocaledir)/$$lang/LC_MESSAGES/$(PACKAGE)$(INSTOBJEXT); \ + rm -f $(DESTDIR)$(gnulocaledir)/$$lang/LC_MESSAGES/$(PACKAGE)$(INSTOBJEXT).m; \ + done + +check: all -depend: +cat-id-tbl.o: ../intl/libgettext.h -install: - for n in $(CATALOGS); do \ - l=`basename $$n .mo`; \ - $(top_srcdir)/mkinstalldirs \ - $(installprefix)/$(LOCALEDIR)/$$l/LC_MESSAGES; \ - $(INSTALL) -m 644 $$n $(installprefix)/$(LOCALEDIR)/$$l/LC_MESSAGES/rpm.mo; \ +dvi info tags TAGS ID: + +mostlyclean: + rm -f core core.* *.pox $(PACKAGE).po *.old.po cat-id-tbl.tmp + rm -fr *.o + +clean: mostlyclean + +distclean: clean + rm -f Makefile Makefile.in POTFILES *.mo *.msg *.cat *.cat.m + +maintainer-clean: distclean + @echo "This command is intended for maintainers to use;" + @echo "it deletes files that may require special tools to rebuild." + rm -f $(GMOFILES) + +distdir = ../$(PACKAGE)-$(VERSION)/$(subdir) +dist distdir: update-po $(DISTFILES) + dists="$(DISTFILES)"; \ + for file in $$dists; do \ + ln $(srcdir)/$$file $(distdir) 2> /dev/null \ + || cp -p $(srcdir)/$$file $(distdir); \ done -check: +update-po: Makefile + $(MAKE) $(PACKAGE).pot + PATH=`pwd`/../src:$$PATH; \ + cd $(srcdir); \ + catalogs='$(CATALOGS)'; \ + for cat in $$catalogs; do \ + cat=`basename $$cat`; \ + lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \ + mv $$lang.po $$lang.old.po; \ + echo "$$lang:"; \ + if $(MSGMERGE) $$lang.old.po $(PACKAGE).pot -o $$lang.po; then \ + rm -f $$lang.old.po; \ + else \ + echo "msgmerge for $$cat failed!"; \ + rm -f $$lang.po; \ + mv $$lang.old.po $$lang.po; \ + fi; \ + done POTFILES: POTFILES.in ( if test 'x$(srcdir)' != 'x.'; then \ @@ -67,16 +231,18 @@ POTFILES: POTFILES.in else \ posrcprefix="../"; \ fi; \ - sed -e '/^#/d' -e '/^[ ]*$$/d' \ - -e "s@.*@ $$posrcprefix& \\\\@" \ - -e '$$s/\(.*\) \\/\1/' < $(srcdir)/POTFILES.in > POTFILES ) + rm -f $@-t $@ \ + && (sed -e '/^#/d' -e '/^[ ]*$$/d' \ + -e "s@.*@ $$posrcprefix& \\\\@" < $(srcdir)/$@.in \ + | sed -e '$$s/\\$$//') > $@-t \ + && chmod a-w $@-t \ + && mv $@-t $@ ) Makefile: Makefile.in.in ../config.status POTFILES cd .. \ - && CONFIG_FILES=po/$@.in CONFIG_HEADERS= \ + && CONFIG_FILES=$(subdir)/$@.in CONFIG_HEADERS= \ $(SHELL) ./config.status -distdir: - -%.mo: %.po - msgfmt -o $@ $< +# Tell versions [3.59,3.63) of GNU make not to export all variables. +# Otherwise a system limit (for SysV at least) may be exceeded. +.NOEXPORT: diff --git a/po/POTFILES.in b/po/POTFILES.in index b29bb56..23bd1a2 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -1,3 +1,4 @@ + # List of files which contain translatable strings. # Package source files diff --git a/po/rpm.pot b/po/rpm.pot index 033b4b2..51a2b05 100644 --- a/po/rpm.pot +++ b/po/rpm.pot @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 1999-09-28 16:24-0400\n" +"POT-Creation-Date: 1999-09-29 13:13-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -922,297 +922,297 @@ msgstr "" msgid "rebuild database from existing database" msgstr "" -#: ../rpm.c:644 ../rpm.c:650 ../rpm.c:657 ../rpm.c:663 ../rpm.c:672 -#: ../rpm.c:679 ../rpm.c:726 ../rpm.c:732 ../rpm.c:766 ../rpm.c:772 -#: ../rpm.c:778 ../rpm.c:786 ../rpm.c:821 ../rpm.c:876 ../rpm.c:883 +#: ../rpm.c:639 ../rpm.c:645 ../rpm.c:652 ../rpm.c:658 ../rpm.c:667 +#: ../rpm.c:674 ../rpm.c:721 ../rpm.c:727 ../rpm.c:761 ../rpm.c:767 +#: ../rpm.c:773 ../rpm.c:781 ../rpm.c:816 ../rpm.c:871 ../rpm.c:878 msgid "only one major mode may be specified" msgstr "" -#: ../rpm.c:665 +#: ../rpm.c:660 msgid "-u and --uninstall are deprecated and no longer work.\n" msgstr "" -#: ../rpm.c:667 +#: ../rpm.c:662 msgid "Use -e or --erase instead.\n" msgstr "" -#: ../rpm.c:683 +#: ../rpm.c:678 msgid "--build (-b) requires one of a,b,i,c,p,l as its sole argument" msgstr "" -#: ../rpm.c:687 +#: ../rpm.c:682 msgid "--tarbuild (-t) requires one of a,b,i,c,p,l as its sole argument" msgstr "" -#: ../rpm.c:739 ../rpm.c:745 ../rpm.c:752 ../rpm.c:759 ../rpm.c:890 +#: ../rpm.c:734 ../rpm.c:740 ../rpm.c:747 ../rpm.c:754 ../rpm.c:885 msgid "one type of query/verify may be performed at a time" msgstr "" -#: ../rpm.c:794 +#: ../rpm.c:789 msgid "arguments to --dbpath must begin with a /" msgstr "" -#: ../rpm.c:827 +#: ../rpm.c:822 msgid "relocations must begin with a /" msgstr "" -#: ../rpm.c:829 +#: ../rpm.c:824 msgid "relocations must contain a =" msgstr "" -#: ../rpm.c:832 +#: ../rpm.c:827 msgid "relocations must have a / following the =" msgstr "" -#: ../rpm.c:841 +#: ../rpm.c:836 msgid "exclude paths must begin with a /" msgstr "" -#: ../rpm.c:850 +#: ../rpm.c:845 #, c-format msgid "Internal error in argument processing (%d) :-(\n" msgstr "" -#: ../rpm.c:903 +#: ../rpm.c:898 msgid "--dbpath given for operation that does not use a database" msgstr "" -#: ../rpm.c:908 +#: ../rpm.c:903 msgid "--timecheck may only be used during package builds" msgstr "" -#: ../rpm.c:911 +#: ../rpm.c:906 msgid "unexpected query flags" msgstr "" -#: ../rpm.c:914 +#: ../rpm.c:909 msgid "unexpected query format" msgstr "" -#: ../rpm.c:918 +#: ../rpm.c:913 msgid "unexpected query source" msgstr "" -#: ../rpm.c:924 +#: ../rpm.c:919 msgid "only installation, upgrading, rmsource and rmspec may be forced" msgstr "" -#: ../rpm.c:927 +#: ../rpm.c:922 msgid "files may only be relocated during package installation" msgstr "" -#: ../rpm.c:930 +#: ../rpm.c:925 msgid "only one of --prefix or --relocate may be used" msgstr "" -#: ../rpm.c:933 +#: ../rpm.c:928 msgid "" "--relocate and --excludepath may only be used when installing new packages" msgstr "" -#: ../rpm.c:936 +#: ../rpm.c:931 msgid "--prefix may only be used when installing new packages" msgstr "" -#: ../rpm.c:939 +#: ../rpm.c:934 msgid "arguments to --prefix must begin with a /" msgstr "" -#: ../rpm.c:942 +#: ../rpm.c:937 msgid "--hash (-h) may only be specified during package installation" msgstr "" -#: ../rpm.c:946 +#: ../rpm.c:941 msgid "--percent may only be specified during package installation" msgstr "" -#: ../rpm.c:950 +#: ../rpm.c:945 msgid "--replacefiles may only be specified during package installation" msgstr "" -#: ../rpm.c:954 +#: ../rpm.c:949 msgid "--replacepkgs may only be specified during package installation" msgstr "" -#: ../rpm.c:958 +#: ../rpm.c:953 msgid "--excludedocs may only be specified during package installation" msgstr "" -#: ../rpm.c:962 +#: ../rpm.c:957 msgid "--includedocs may only be specified during package installation" msgstr "" -#: ../rpm.c:966 +#: ../rpm.c:961 msgid "only one of --excludedocs and --includedocs may be specified" msgstr "" -#: ../rpm.c:970 +#: ../rpm.c:965 msgid "--ignorearch may only be specified during package installation" msgstr "" -#: ../rpm.c:974 +#: ../rpm.c:969 msgid "--ignoreos may only be specified during package installation" msgstr "" -#: ../rpm.c:978 +#: ../rpm.c:973 msgid "--ignoresize may only be specified during package installation" msgstr "" -#: ../rpm.c:982 +#: ../rpm.c:977 msgid "--allmatches may only be specified during package erasure" msgstr "" -#: ../rpm.c:986 +#: ../rpm.c:981 msgid "--allfiles may only be specified during package installation" msgstr "" -#: ../rpm.c:990 +#: ../rpm.c:985 msgid "--justdb may only be specified during package installation and erasure" msgstr "" -#: ../rpm.c:995 +#: ../rpm.c:990 msgid "" "--noscripts may only be specified during package installation, erasure, and " "verification" msgstr "" -#: ../rpm.c:999 +#: ../rpm.c:994 msgid "" "--notriggers may only be specified during package installation, erasure, and " "verification" msgstr "" -#: ../rpm.c:1005 +#: ../rpm.c:1000 msgid "" "--nodeps may only be specified during package building, installation, " "erasure, and verification" msgstr "" -#: ../rpm.c:1010 +#: ../rpm.c:1005 msgid "" "--test may only be specified during package installation, erasure, and " "building" msgstr "" -#: ../rpm.c:1015 +#: ../rpm.c:1010 msgid "" "--root (-r) may only be specified during installation, erasure, querying, " "and database rebuilds" msgstr "" -#: ../rpm.c:1020 +#: ../rpm.c:1015 msgid "arguments to --root (-r) must begin with a /" msgstr "" -#: ../rpm.c:1023 +#: ../rpm.c:1018 msgid "--oldpackage may only be used during upgrades" msgstr "" -#: ../rpm.c:1028 +#: ../rpm.c:1023 msgid "" "ftp options can only be used during package queries, installs, and upgrades" msgstr "" -#: ../rpm.c:1034 +#: ../rpm.c:1029 msgid "" "http options can only be used during package queries, installs, and upgrades" msgstr "" -#: ../rpm.c:1038 +#: ../rpm.c:1033 msgid "--nopgp may only be used during signature checking" msgstr "" -#: ../rpm.c:1041 +#: ../rpm.c:1036 msgid "--nogpg may only be used during signature checking" msgstr "" -#: ../rpm.c:1044 +#: ../rpm.c:1039 msgid "" "--nomd5 may only be used during signature checking and package verification" msgstr "" -#: ../rpm.c:1068 +#: ../rpm.c:1063 msgid "no files to sign\n" msgstr "" -#: ../rpm.c:1073 +#: ../rpm.c:1068 #, c-format msgid "cannot access file %s\n" msgstr "" -#: ../rpm.c:1088 +#: ../rpm.c:1083 msgid "pgp not found: " msgstr "" -#: ../rpm.c:1092 +#: ../rpm.c:1087 msgid "Enter pass phrase: " msgstr "" -#: ../rpm.c:1094 +#: ../rpm.c:1089 msgid "Pass phrase check failed\n" msgstr "" -#: ../rpm.c:1097 +#: ../rpm.c:1092 msgid "Pass phrase is good.\n" msgstr "" -#: ../rpm.c:1102 +#: ../rpm.c:1097 msgid "Invalid %%_signature spec in macro file.\n" msgstr "" -#: ../rpm.c:1108 +#: ../rpm.c:1103 msgid "--sign may only be used during package building" msgstr "" -#: ../rpm.c:1123 +#: ../rpm.c:1118 msgid "exec failed\n" msgstr "" -#: ../rpm.c:1142 +#: ../rpm.c:1137 msgid "unexpected arguments to --querytags " msgstr "" -#: ../rpm.c:1153 +#: ../rpm.c:1148 msgid "no packages given for signature check" msgstr "" -#: ../rpm.c:1165 +#: ../rpm.c:1160 msgid "no packages given for signing" msgstr "" -#: ../rpm.c:1178 +#: ../rpm.c:1173 msgid "no packages files given for rebuild" msgstr "" -#: ../rpm.c:1235 +#: ../rpm.c:1230 msgid "no spec files given for build" msgstr "" -#: ../rpm.c:1237 +#: ../rpm.c:1232 msgid "no tar files given for build" msgstr "" -#: ../rpm.c:1249 +#: ../rpm.c:1244 msgid "no packages given for uninstall" msgstr "" -#: ../rpm.c:1299 +#: ../rpm.c:1294 msgid "no packages given for install" msgstr "" -#: ../rpm.c:1322 +#: ../rpm.c:1317 msgid "extra arguments given for query of all packages" msgstr "" -#: ../rpm.c:1327 +#: ../rpm.c:1322 msgid "no arguments given for query" msgstr "" -#: ../rpm.c:1344 +#: ../rpm.c:1339 msgid "extra arguments given for verify of all packages" msgstr "" -#: ../rpm.c:1348 +#: ../rpm.c:1343 msgid "no arguments given for verify" msgstr "" diff --git a/popt/.cvsignore b/popt/.cvsignore index 6fe1398..27bbd77 100644 --- a/popt/.cvsignore +++ b/popt/.cvsignore @@ -2,7 +2,6 @@ .depend aclocal.m4 Makefile -Makefile.in mappcinames pci-ids-temp.h configure @@ -14,7 +13,6 @@ config.log config.status config.sub stamp-h -stamp-h.in test1 libtool ltconfig diff --git a/popt/Makefile.in b/popt/Makefile.in new file mode 100644 index 0000000..8b243f5 --- /dev/null +++ b/popt/Makefile.in @@ -0,0 +1,650 @@ + +# Makefile.in generated automatically by automake 1.4a from Makefile.am + +# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. +# This Makefile.in is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. + +# Makefile for popt library. + + +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 + +DESTDIR = + +pkgdatadir = $(datadir)/@PACKAGE@ +pkglibdir = $(libdir)/@PACKAGE@ +pkgincludedir = $(includedir)/@PACKAGE@ + +top_builddir = . + +ACLOCAL = @ACLOCAL@ +AUTOCONF = @AUTOCONF@ +AUTOMAKE = @AUTOMAKE@ +AUTOHEADER = @AUTOHEADER@ + +INSTALL = @INSTALL@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_DATA = @INSTALL_DATA@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ +INSTALL_STRIP_FLAG = +transform = @program_transform_name@ + +NORMAL_INSTALL = : +PRE_INSTALL = : +POST_INSTALL = : +NORMAL_UNINSTALL = : +PRE_UNINSTALL = : +POST_UNINSTALL = : +build_alias = @build_alias@ +build_triplet = @build@ +host_alias = @host_alias@ +host_triplet = @host@ +target_alias = @target_alias@ +target_triplet = @target@ +AS = @AS@ +CATALOGS = @CATALOGS@ +CATOBJEXT = @CATOBJEXT@ +CC = @CC@ +CPP = @CPP@ +DATADIRNAME = @DATADIRNAME@ +DLLTOOL = @DLLTOOL@ +GENCAT = @GENCAT@ +GMOFILES = @GMOFILES@ +GMSGFMT = @GMSGFMT@ +GT_NO = @GT_NO@ +GT_YES = @GT_YES@ +INCLUDE_LOCALE_H = @INCLUDE_LOCALE_H@ +INSTOBJEXT = @INSTOBJEXT@ +INTLDEPS = @INTLDEPS@ +INTLLIBS = @INTLLIBS@ +INTLOBJS = @INTLOBJS@ +LD = @LD@ +LIBTOOL = @LIBTOOL@ +LN_S = @LN_S@ +MAKEINFO = @MAKEINFO@ +MKINSTALLDIRS = @MKINSTALLDIRS@ +MSGFMT = @MSGFMT@ +NM = @NM@ +OBJDUMP = @OBJDUMP@ +PACKAGE = @PACKAGE@ +POFILES = @POFILES@ +POSUB = @POSUB@ +RANLIB = @RANLIB@ +TARGET = @TARGET@ +U = @U@ +USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@ +USE_NLS = @USE_NLS@ +VERSION = @VERSION@ +l = @l@ + +AUTOMAKE_OPTIONS = 1.4 foreign + +EXTRA_DIST = CHANGES autogen.sh findme.h $(man_MANS) popt.spec poptint.h testit.sh po/Makefile.in.in po/POTFILES.in po/*.po po/popt.pot popt.ps + + +SUBDIRS = intl po + +INCLUDES = -I$(top_srcdir) + +noinst_INCLUDES = findme.h poptint.h + +noinst_PROGRAMS = test1 +test1_SOURCES = test1.c +test1_LDADD = $(lib_LTLIBRARIES) + +include_HEADERS = popt.h +lib_LTLIBRARIES = libpopt.la +libpopt_la_SOURCES = popt.c findme.c poptparse.c poptconfig.c popthelp.c +man_MANS = popt.3 + +CVSTAG = $(PACKAGE)-$(subst .,_,$(VERSION)) +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +CONFIG_HEADER = config.h +CONFIG_CLEAN_FILES = +LTLIBRARIES = $(lib_LTLIBRARIES) + + +DEFS = @DEFS@ -I. -I$(srcdir) -I. +CPPFLAGS = @CPPFLAGS@ +LDFLAGS = @LDFLAGS@ +LIBS = @LIBS@ +libpopt_la_LDFLAGS = +libpopt_la_LIBADD = +libpopt_la_OBJECTS = popt.lo findme.lo poptparse.lo poptconfig.lo \ +popthelp.lo +PROGRAMS = $(noinst_PROGRAMS) + +test1_OBJECTS = test1.o +test1_DEPENDENCIES = libpopt.la +test1_LDFLAGS = +CFLAGS = @CFLAGS@ +COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +CCLD = $(CC) +LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ +man3dir = $(mandir)/man3 +MANS = $(man_MANS) + +NROFF = nroff +HEADERS = $(include_HEADERS) + +DIST_COMMON = README ./stamp-h.in COPYING Makefile.am Makefile.in \ +acconfig.h aclocal.m4 config.guess config.h.in config.sub configure \ +configure.in install-sh ltconfig ltmain.sh missing mkinstalldirs + + +DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) + +TAR = gtar +GZIP_ENV = --best +DEP_FILES = .deps/findme.P .deps/popt.P .deps/poptconfig.P \ +.deps/popthelp.P .deps/poptparse.P .deps/test1.P +SOURCES = $(libpopt_la_SOURCES) $(test1_SOURCES) +OBJECTS = $(libpopt_la_OBJECTS) $(test1_OBJECTS) + +all: all-redirect +.SUFFIXES: +.SUFFIXES: .S .c .lo .o .s +$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) + cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile + +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES) + cd $(top_builddir) \ + && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status + +$(ACLOCAL_M4): configure.in + cd $(srcdir) && $(ACLOCAL) + +config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + $(SHELL) ./config.status --recheck +$(srcdir)/configure: $(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES) + cd $(srcdir) && $(AUTOCONF) + +config.h: stamp-h + @if test ! -f $@; then \ + rm -f stamp-h; \ + $(MAKE) stamp-h; \ + else :; fi +stamp-h: $(srcdir)/config.h.in $(top_builddir)/config.status + cd $(top_builddir) \ + && CONFIG_FILES= CONFIG_HEADERS=config.h \ + $(SHELL) ./config.status + @echo timestamp > stamp-h 2> /dev/null +$(srcdir)/config.h.in: $(srcdir)/stamp-h.in + @if test ! -f $@; then \ + rm -f $(srcdir)/stamp-h.in; \ + $(MAKE) $(srcdir)/stamp-h.in; \ + else :; fi +$(srcdir)/stamp-h.in: $(top_srcdir)/configure.in $(ACLOCAL_M4) acconfig.h + cd $(top_srcdir) && $(AUTOHEADER) + @echo timestamp > $(srcdir)/stamp-h.in 2> /dev/null + +mostlyclean-hdr: + +clean-hdr: + +distclean-hdr: + -rm -f config.h + +maintainer-clean-hdr: + +mostlyclean-libLTLIBRARIES: + +clean-libLTLIBRARIES: + -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES) + +distclean-libLTLIBRARIES: + +maintainer-clean-libLTLIBRARIES: + +install-libLTLIBRARIES: $(lib_LTLIBRARIES) + @$(NORMAL_INSTALL) + $(mkinstalldirs) $(DESTDIR)$(libdir) + @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ + if test -f $$p; then \ + echo "$(LIBTOOL) --mode=install $(INSTALL) $$p $(DESTDIR)$(libdir)/$$p"; \ + $(LIBTOOL) --mode=install $(INSTALL) $$p $(DESTDIR)$(libdir)/$$p; \ + else :; fi; \ + done + +uninstall-libLTLIBRARIES: + @$(NORMAL_UNINSTALL) + list='$(lib_LTLIBRARIES)'; for p in $$list; do \ + $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p; \ + done + +.s.o: + $(COMPILE) -c $< + +.S.o: + $(COMPILE) -c $< + +mostlyclean-compile: + -rm -f *.o core *.core + +clean-compile: + +distclean-compile: + -rm -f *.tab.c + +maintainer-clean-compile: + +.s.lo: + $(LIBTOOL) --mode=compile $(COMPILE) -c $< + +.S.lo: + $(LIBTOOL) --mode=compile $(COMPILE) -c $< + +mostlyclean-libtool: + -rm -f *.lo + +clean-libtool: + -rm -rf .libs _libs + +distclean-libtool: + +maintainer-clean-libtool: + +libpopt.la: $(libpopt_la_OBJECTS) $(libpopt_la_DEPENDENCIES) + $(LINK) -rpath $(libdir) $(libpopt_la_LDFLAGS) $(libpopt_la_OBJECTS) $(libpopt_la_LIBADD) $(LIBS) + +mostlyclean-noinstPROGRAMS: + +clean-noinstPROGRAMS: + -test -z "$(noinst_PROGRAMS)" || rm -f $(noinst_PROGRAMS) + +distclean-noinstPROGRAMS: + +maintainer-clean-noinstPROGRAMS: + +test1: $(test1_OBJECTS) $(test1_DEPENDENCIES) + @rm -f test1 + $(LINK) $(test1_LDFLAGS) $(test1_OBJECTS) $(test1_LDADD) $(LIBS) + +install-man3: + $(mkinstalldirs) $(DESTDIR)$(man3dir) + @list='$(man3_MANS)'; \ + l2='$(man_MANS)'; for i in $$l2; do \ + case "$$i" in \ + *.3*) list="$$list $$i" ;; \ + esac; \ + done; \ + for i in $$list; do \ + if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \ + else file=$$i; fi; \ + ext=`echo $$i | sed -e 's/^.*\\.//'`; \ + inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \ + inst=`echo $$inst | sed '$(transform)'`.$$ext; \ + echo " $(INSTALL_DATA) $$file $(DESTDIR)$(man3dir)/$$inst"; \ + $(INSTALL_DATA) $$file $(DESTDIR)$(man3dir)/$$inst; \ + done + +uninstall-man3: + @list='$(man3_MANS)'; \ + l2='$(man_MANS)'; for i in $$l2; do \ + case "$$i" in \ + *.3*) list="$$list $$i" ;; \ + esac; \ + done; \ + for i in $$list; do \ + ext=`echo $$i | sed -e 's/^.*\\.//'`; \ + inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \ + inst=`echo $$inst | sed '$(transform)'`.$$ext; \ + echo " rm -f $(DESTDIR)$(man3dir)/$$inst"; \ + rm -f $(DESTDIR)$(man3dir)/$$inst; \ + done +install-man: $(MANS) + @$(NORMAL_INSTALL) + $(MAKE) $(AM_MAKEFLAGS) install-man3 +uninstall-man: + @$(NORMAL_UNINSTALL) + $(MAKE) $(AM_MAKEFLAGS) uninstall-man3 + +install-includeHEADERS: $(include_HEADERS) + @$(NORMAL_INSTALL) + $(mkinstalldirs) $(DESTDIR)$(includedir) + @list='$(include_HEADERS)'; for p in $$list; do \ + if test -f "$$p"; then d= ; else d="$(srcdir)/"; fi; \ + echo " $(INSTALL_DATA) $$d$$p $(DESTDIR)$(includedir)/$$p"; \ + $(INSTALL_DATA) $$d$$p $(DESTDIR)$(includedir)/$$p; \ + done + +uninstall-includeHEADERS: + @$(NORMAL_UNINSTALL) + list='$(include_HEADERS)'; for p in $$list; do \ + rm -f $(DESTDIR)$(includedir)/$$p; \ + done + +# This directory's subdirectories are mostly independent; you can cd +# into them and run `make' without going through this Makefile. +# To change the values of `make' variables: instead of editing Makefiles, +# (1) if the variable is set in `config.status', edit `config.status' +# (which will cause the Makefiles to be regenerated when you run `make'); +# (2) otherwise, pass the desired values on the `make' command line. + +@SET_MAKE@ + +all-recursive install-data-recursive install-exec-recursive \ +installdirs-recursive install-recursive uninstall-recursive \ +check-recursive installcheck-recursive info-recursive dvi-recursive: + @set fnord $(MAKEFLAGS); amf=$$2; \ + dot_seen=no; \ + target=`echo $@ | sed s/-recursive//`; \ + list='$(SUBDIRS)'; for subdir in $$list; do \ + echo "Making $$target in $$subdir"; \ + if test "$$subdir" = "."; then \ + dot_seen=yes; \ + local_target="$$target-am"; \ + else \ + local_target="$$target"; \ + fi; \ + (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ + || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ + done; \ + if test "$$dot_seen" = "no"; then \ + $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ + fi; test -z "$$fail" + +mostlyclean-recursive clean-recursive distclean-recursive \ +maintainer-clean-recursive: + @set fnord $(MAKEFLAGS); amf=$$2; \ + dot_seen=no; \ + rev=''; list='$(SUBDIRS)'; for subdir in $$list; do \ + rev="$$subdir $$rev"; \ + test "$$subdir" = "." && dot_seen=yes; \ + done; \ + test "$$dot_seen" = "no" && rev=". $$rev"; \ + target=`echo $@ | sed s/-recursive//`; \ + for subdir in $$rev; do \ + echo "Making $$target in $$subdir"; \ + if test "$$subdir" = "."; then \ + local_target="$$target-am"; \ + else \ + local_target="$$target"; \ + fi; \ + (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ + || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ + done && test -z "$$fail" +tags-recursive: + list='$(SUBDIRS)'; for subdir in $$list; do \ + test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ + done + +tags: TAGS + +ID: $(HEADERS) $(SOURCES) $(LISP) + list='$(SOURCES) $(HEADERS)'; \ + unique=`for i in $$list; do echo $$i; done | \ + awk ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + here=`pwd` && cd $(srcdir) \ + && mkid -f$$here/ID $$unique $(LISP) + +TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) $(LISP) + tags=; \ + here=`pwd`; \ + list='$(SUBDIRS)'; for subdir in $$list; do \ + if test "$$subdir" = .; then :; else \ + test -f $$subdir/TAGS && tags="$$tags -i $$here/$$subdir/TAGS"; \ + fi; \ + done; \ + list='$(SOURCES) $(HEADERS)'; \ + unique=`for i in $$list; do echo $$i; done | \ + awk ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + test -z "$(ETAGS_ARGS)config.h.in$$unique$(LISP)$$tags" \ + || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags config.h.in $$unique $(LISP) -o $$here/TAGS) + +mostlyclean-tags: + +clean-tags: + +distclean-tags: + -rm -f TAGS ID + +maintainer-clean-tags: + +distdir = $(PACKAGE)-$(VERSION) +top_distdir = $(distdir) + +# This target untars the dist file and tries a VPATH configuration. Then +# it guarantees that the distribution is self-contained by making another +# tarfile. +distcheck: dist + -rm -rf $(distdir) + GZIP=$(GZIP_ENV) $(TAR) zxf $(distdir).tar.gz + mkdir $(distdir)/=build + mkdir $(distdir)/=inst + dc_install_base=`cd $(distdir)/=inst && pwd`; \ + cd $(distdir)/=build \ + && ../configure --with-included-gettext --srcdir=.. --prefix=$$dc_install_base \ + && $(MAKE) $(AM_MAKEFLAGS) \ + && $(MAKE) $(AM_MAKEFLAGS) dvi \ + && $(MAKE) $(AM_MAKEFLAGS) check \ + && $(MAKE) $(AM_MAKEFLAGS) install \ + && $(MAKE) $(AM_MAKEFLAGS) installcheck \ + && $(MAKE) $(AM_MAKEFLAGS) dist + -rm -rf $(distdir) + @banner="$(distdir).tar.gz is ready for distribution"; \ + dashes=`echo "$$banner" | sed s/./=/g`; \ + echo "$$dashes"; \ + echo "$$banner"; \ + echo "$$dashes" +dist: distdir + -chmod -R a+r $(distdir) + GZIP=$(GZIP_ENV) $(TAR) chozf $(distdir).tar.gz $(distdir) + -rm -rf $(distdir) +dist-all: distdir + -chmod -R a+r $(distdir) + GZIP=$(GZIP_ENV) $(TAR) chozf $(distdir).tar.gz $(distdir) + -rm -rf $(distdir) +distdir: $(DISTFILES) + -rm -rf $(distdir) + mkdir $(distdir) + -chmod 777 $(distdir) + here=`cd $(top_builddir) && pwd`; \ + top_distdir=`cd $(distdir) && pwd`; \ + distdir=`cd $(distdir) && pwd`; \ + cd $(top_srcdir) \ + && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --foreign Makefile + $(mkinstalldirs) $(distdir)/po + @for file in $(DISTFILES); do \ + d=$(srcdir); \ + if test -d $$d/$$file; then \ + cp -pr $$d/$$file $(distdir)/$$file; \ + else \ + test -f $(distdir)/$$file \ + || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ + || cp -p $$d/$$file $(distdir)/$$file || :; \ + fi; \ + done + for subdir in $(SUBDIRS); do \ + if test "$$subdir" = .; then :; else \ + test -d $(distdir)/$$subdir \ + || mkdir $(distdir)/$$subdir \ + || exit 1; \ + chmod 777 $(distdir)/$$subdir; \ + (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir=../$(distdir) distdir=../$(distdir)/$$subdir distdir) \ + || exit 1; \ + fi; \ + done + +DEPS_MAGIC := $(shell mkdir .deps > /dev/null 2>&1 || :) + +-include $(DEP_FILES) + +mostlyclean-depend: + +clean-depend: + +distclean-depend: + -rm -rf .deps + +maintainer-clean-depend: + +%.o: %.c + @echo '$(COMPILE) -c $<'; \ + $(COMPILE) -Wp,-MD,.deps/$(*F).pp -c $< + @-cp .deps/$(*F).pp .deps/$(*F).P; \ + tr ' ' '\012' < .deps/$(*F).pp \ + | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \ + >> .deps/$(*F).P; \ + rm .deps/$(*F).pp + +%.lo: %.c + @echo '$(LTCOMPILE) -c $<'; \ + $(LTCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $< + @-sed -e 's/^\([^:]*\)\.o[ ]*:/\1.lo \1.o :/' \ + < .deps/$(*F).pp > .deps/$(*F).P; \ + tr ' ' '\012' < .deps/$(*F).pp \ + | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \ + >> .deps/$(*F).P; \ + rm -f .deps/$(*F).pp +info-am: +info: info-recursive +dvi-am: +dvi: dvi-recursive +check-am: all-am +check: check-recursive +installcheck-am: +installcheck: installcheck-recursive +all-recursive-am: config.h + $(MAKE) $(AM_MAKEFLAGS) all-recursive + +install-exec-am: install-libLTLIBRARIES +install-exec: install-exec-recursive + +install-data-am: install-man install-includeHEADERS +install-data: install-data-recursive + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am +install: install-recursive +uninstall-am: uninstall-libLTLIBRARIES uninstall-man \ + uninstall-includeHEADERS +uninstall: uninstall-recursive +all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(MANS) $(HEADERS) config.h +all-redirect: all-recursive-am +install-strip: + $(MAKE) $(AM_MAKEFLAGS) INSTALL_STRIP_FLAG=-s install +installdirs: installdirs-recursive +installdirs-am: + $(mkinstalldirs) $(DESTDIR)$(libdir) $(DESTDIR)$(mandir)/man3 \ + $(DESTDIR)$(includedir) + + +mostlyclean-generic: + +clean-generic: + +distclean-generic: + -rm -f Makefile $(CONFIG_CLEAN_FILES) + -rm -f config.cache config.log stamp-h stamp-h[0-9]* + +maintainer-clean-generic: +mostlyclean-am: mostlyclean-hdr mostlyclean-libLTLIBRARIES \ + mostlyclean-compile mostlyclean-libtool \ + mostlyclean-noinstPROGRAMS mostlyclean-tags \ + mostlyclean-depend mostlyclean-generic + +mostlyclean: mostlyclean-recursive + +clean-am: clean-hdr clean-libLTLIBRARIES clean-compile clean-libtool \ + clean-noinstPROGRAMS clean-tags clean-depend \ + clean-generic mostlyclean-am + +clean: clean-recursive + +distclean-am: distclean-hdr distclean-libLTLIBRARIES distclean-compile \ + distclean-libtool distclean-noinstPROGRAMS \ + distclean-tags distclean-depend distclean-generic \ + clean-am + -rm -f libtool + +distclean: distclean-recursive + -rm -f config.status + +maintainer-clean-am: maintainer-clean-hdr \ + maintainer-clean-libLTLIBRARIES \ + maintainer-clean-compile maintainer-clean-libtool \ + maintainer-clean-noinstPROGRAMS maintainer-clean-tags \ + maintainer-clean-depend maintainer-clean-generic \ + distclean-am + @echo "This command is intended for maintainers to use;" + @echo "it deletes files that may require special tools to rebuild." + +maintainer-clean: maintainer-clean-recursive + -rm -f config.status + +.PHONY: mostlyclean-hdr distclean-hdr clean-hdr maintainer-clean-hdr \ +mostlyclean-libLTLIBRARIES distclean-libLTLIBRARIES \ +clean-libLTLIBRARIES maintainer-clean-libLTLIBRARIES \ +uninstall-libLTLIBRARIES install-libLTLIBRARIES mostlyclean-compile \ +distclean-compile clean-compile maintainer-clean-compile \ +mostlyclean-libtool distclean-libtool clean-libtool \ +maintainer-clean-libtool mostlyclean-noinstPROGRAMS \ +distclean-noinstPROGRAMS clean-noinstPROGRAMS \ +maintainer-clean-noinstPROGRAMS install-man3 uninstall-man3 install-man \ +uninstall-man uninstall-includeHEADERS install-includeHEADERS \ +install-data-recursive uninstall-data-recursive install-exec-recursive \ +uninstall-exec-recursive installdirs-recursive uninstalldirs-recursive \ +all-recursive check-recursive installcheck-recursive info-recursive \ +dvi-recursive mostlyclean-recursive distclean-recursive clean-recursive \ +maintainer-clean-recursive tags tags-recursive mostlyclean-tags \ +distclean-tags clean-tags maintainer-clean-tags distdir \ +mostlyclean-depend distclean-depend clean-depend \ +maintainer-clean-depend info-am info dvi-am dvi check check-am \ +installcheck-am installcheck all-recursive-am install-exec-am \ +install-exec install-data-am install-data install-am install \ +uninstall-am uninstall all-redirect all-am all installdirs-am \ +installdirs mostlyclean-generic distclean-generic clean-generic \ +maintainer-clean-generic clean mostlyclean distclean maintainer-clean + + +.PHONY: archive +archive: + @echo "This is $(PACKAGE)-$(VERSION)." + @sleep 5 + @cvs -Q tag -F $(CVSTAG) . + @rm -rf /tmp/$(PACKAGE)-$(VERSION) /tmp/$(PACKAGE) + @cd /tmp; cvs -Q -d $(CVSROOT) export -r$(CVSTAG) $(PACKAGE) || : + @mv /tmp/$(PACKAGE) /tmp/$(PACKAGE)-$(VERSION) + @cd /tmp/$(PACKAGE)-$(VERSION); ./autogen.sh ; make depend; make distclean + @cd /tmp/$(PACKAGE)-$(VERSION); ./autogen.sh --noconfigure + @cd /tmp; tar czSpf $(PACKAGE)-$(VERSION).tar.gz $(PACKAGE)-$(VERSION) + @rm -rf /tmp/$(PACKAGE)-$(VERSION) + @cp /tmp/$(PACKAGE)-$(VERSION).tar.gz . + @rm -f /tmp/$(PACKAGE)-$(VERSION).tar.gz + @echo " " + @echo "The final archive is ./$(PACKAGE)-$(VERSION).tar.gz." + +# 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. +.NOEXPORT: diff --git a/popt/configure.in b/popt/configure.in index a04b086..e7ab57d 100755 --- a/popt/configure.in +++ b/popt/configure.in @@ -1,3 +1,4 @@ + AC_INIT(popt.h) AM_CONFIG_HEADER(config.h) AC_PREREQ(2.12) diff --git a/python/Makefile.in b/python/Makefile.in index 534c9a5..efd974a 100644 --- a/python/Makefile.in +++ b/python/Makefile.in @@ -1,3 +1,4 @@ + # Makefile.in generated automatically by automake 1.4a from Makefile.am # Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. diff --git a/rpm.c b/rpm.c index efedcb9..b5572e6 100755 --- a/rpm.c +++ b/rpm.c @@ -581,13 +581,13 @@ int main(int argc, char ** argv) specedit = NULL; /* set up the correct locale */ - (void)setlocale(LC_ALL, "" ); + setlocale(LC_ALL, "" ); #ifdef __LCLINT__ #define LOCALEDIR "/usr/share/locale" #endif - (void)bindtextdomain(PACKAGE, LOCALEDIR); - (void)textdomain(PACKAGE); + bindtextdomain(PACKAGE, LOCALEDIR); + textdomain(PACKAGE); rpmSetVerbosity(RPMMESS_NORMAL); /* XXX silly use by showrc */ diff --git a/rpmrc.in b/rpmrc.in index d3a260b..8e3c545 100644 --- a/rpmrc.in +++ b/rpmrc.in @@ -1,4 +1,5 @@ -# $Id: rpmrc.in,v 2.14 1999/09/07 12:32:10 jbj Exp $ + +# $Id: rpmrc.in,v 2.15 1999/09/29 23:26:08 jbj Exp $ ############################################################# diff --git a/scripts/Makefile.in b/scripts/Makefile.in index 9fca2b0..2f85613 100644 --- a/scripts/Makefile.in +++ b/scripts/Makefile.in @@ -1,3 +1,4 @@ + # Makefile.in generated automatically by automake 1.4a from Makefile.am # Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. diff --git a/stamp-h.in b/stamp-h.in index 9788f70..f69e5f2 100644 --- a/stamp-h.in +++ b/stamp-h.in @@ -1 +1,3 @@ + timestamp + diff --git a/tests/macros.in b/tests/macros.in index b91978a..7c32b1b 100644 --- a/tests/macros.in +++ b/tests/macros.in @@ -1,4 +1,5 @@ -# $Id: macros.in,v 1.13 1999/04/01 22:27:03 jbj Exp $ + +# $Id: macros.in,v 1.14 1999/09/29 23:26:09 jbj Exp $ #============================================================================== # Macro naming conventions (preliminary): # diff --git a/tests/rpmrc.in b/tests/rpmrc.in index c8649d1..61f89af 100644 --- a/tests/rpmrc.in +++ b/tests/rpmrc.in @@ -1,4 +1,5 @@ -# $Id: rpmrc.in,v 1.4 1999/03/20 21:10:11 jbj Exp $ + +# $Id: rpmrc.in,v 1.5 1999/09/29 23:26:09 jbj Exp $ ############################################################# macrofiles: @testdir@@MACROFILES@ include: @testdir@/../rpmrc