diff options
Diffstat (limited to 'Makefile.in')
| -rw-r--r-- | Makefile.in | 47 |
1 files changed, 23 insertions, 24 deletions
diff --git a/Makefile.in b/Makefile.in index 7803997..b9f42aa 100644 --- a/Makefile.in +++ b/Makefile.in @@ -100,13 +100,13 @@ subdir = . DIST_COMMON = INSTALL NEWS README AUTHORS ChangeLog \ $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ $(top_srcdir)/configure $(am__configure_deps) \ - $(srcdir)/config.h.in $(top_srcdir)/build-aux/mkinstalldirs \ - COPYING COPYING.LESSER THANKS TODO build-aux/compile \ - build-aux/config.guess build-aux/config.sub build-aux/depcomp \ - build-aux/install-sh build-aux/mdate-sh missing \ - build-aux/missing build-aux/mkinstalldirs \ - build-aux/texinfo.tex build-aux/ltmain.sh \ - $(top_srcdir)/build-aux/compile \ + $(top_srcdir)/conf/config.h.in \ + $(top_srcdir)/build-aux/mkinstalldirs COPYING COPYING.LESSER \ + THANKS TODO build-aux/compile build-aux/config.guess \ + build-aux/config.sub build-aux/depcomp build-aux/install-sh \ + build-aux/mdate-sh missing build-aux/missing \ + build-aux/mkinstalldirs build-aux/texinfo.tex \ + build-aux/ltmain.sh $(top_srcdir)/build-aux/compile \ $(top_srcdir)/build-aux/config.guess \ $(top_srcdir)/build-aux/config.sub \ $(top_srcdir)/build-aux/install-sh \ @@ -129,7 +129,7 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ configure.lineno config.status.lineno mkinstalldirs = $(SHELL) $(top_srcdir)/build-aux/mkinstalldirs -CONFIG_HEADER = config.h +CONFIG_HEADER = $(top_builddir)/conf/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = AM_V_P = $(am__v_P_@AM_V@) @@ -167,8 +167,7 @@ am__recursive_targets = \ $(am__extra_recursive_targets) AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ cscope distdir dist dist-all distcheck -am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) \ - $(LISP)config.h.in +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) # Read a list of newline-separated strings from the standard input, # and print each of them once, without duplicates. Input order is # *not* preserved. @@ -439,7 +438,8 @@ RELEASE_SIGNING_KEY = D8692123C4065DEA5E0F3AB5249B39D24F25E3B6 ACLOCAL_AMFLAGS = -I m4 DISTCHECK_CONFIGURE_FLAGS = EXTRA_DIST = autogen.sh autogen.rc gpgme.spec.in \ - ChangeLog-2011 m4/ChangeLog-2011 contrib/ChangeLog-2011 + ChangeLog-2011 m4/ChangeLog-2011 contrib/ChangeLog-2011 \ + conf/whatisthis @RUN_GPG_TESTS_FALSE@tests = @RUN_GPG_TESTS_TRUE@tests = tests @@ -448,8 +448,7 @@ gen_start_date = 2011-12-01T00:00:00 # Macro to help the release target. RELEASE_NAME = $(PACKAGE_TARNAME)-$(PACKAGE_VERSION) -all: config.h - $(MAKE) $(AM_MAKEFLAGS) all-recursive +all: all-recursive .SUFFIXES: am--refresh: Makefile @@ -487,20 +486,20 @@ $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) $(am__cd) $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS) $(am__aclocal_m4_deps): -config.h: stamp-h1 - @test -f $@ || rm -f stamp-h1 - @test -f $@ || $(MAKE) $(AM_MAKEFLAGS) stamp-h1 +conf/config.h: conf/stamp-h1 + @test -f $@ || rm -f conf/stamp-h1 + @test -f $@ || $(MAKE) $(AM_MAKEFLAGS) conf/stamp-h1 -stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status - @rm -f stamp-h1 - cd $(top_builddir) && $(SHELL) ./config.status config.h -$(srcdir)/config.h.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) +conf/stamp-h1: $(top_srcdir)/conf/config.h.in $(top_builddir)/config.status + @rm -f conf/stamp-h1 + cd $(top_builddir) && $(SHELL) ./config.status conf/config.h +$(top_srcdir)/conf/config.h.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) ($(am__cd) $(top_srcdir) && $(AUTOHEADER)) - rm -f stamp-h1 + rm -f conf/stamp-h1 touch $@ distclean-hdr: - -rm -f config.h stamp-h1 + -rm -f conf/config.h conf/stamp-h1 mostlyclean-libtool: -rm -f *.lo @@ -810,7 +809,7 @@ distcleancheck: distclean exit 1; } >&2 check-am: all-am check: check-recursive -all-am: Makefile config.h +all-am: Makefile installdirs: installdirs-recursive installdirs-am: install: install-recursive @@ -913,7 +912,7 @@ ps-am: uninstall-am: -.MAKE: $(am__recursive_targets) all install-am install-strip +.MAKE: $(am__recursive_targets) install-am install-strip .PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am \ am--refresh check check-am clean clean-cscope clean-generic \ |