Changeset 2739 for trunk/build_support/Makefile.am

Timestamp:

Jun 8, 2012, 12:22:47 AM (11 years ago)

Author:

Peter

Message:

refs #703 using a non-recursive Makefile. Old Makefile.am are kept but
rather than being source for sub-Makefiles they are included into
topdir Makefile.am. This implies Make rules must be modified to work
from topdir. A temporary code snippet will remove old Makefiles and
Makefile.ins at configure time. This code will be removed in a week or
so and is mainly there for autobuilds and prepare for future
sub-Makefiles (that will have a all: rule in sub-directories.

File:

• trunk/build_support/Makefile.am (modified) (3 diffs)

trunk/build_support/Makefile.am

@@ -20 +20 @@
 # along with yat. If not, see <http://www.gnu.org/licenses/>.
 
-noinst_SCRIPTS = tag_and_release.sh
-bin_SCRIPTS=for_installation/yat-config
+noinst_SCRIPTS = build_support/tag_and_release.sh
+bin_SCRIPTS = build_support/for_installation/yat-config
 
 pkgconfigexecdir = $(libdir)/pkgconfig
-pkgconfigexec_DATA= yat.pc
+pkgconfigexec_DATA= build_support/yat.pc
 
-CLEANFILES = yat.pc yat-config for_installation/yat-config
+CLEANFILES += build_support/yat.pc build_support/yat-config
+CLEANFILES += build_support/for_installation/yat-config
 
-EXTRA_DIST =  yat-config.in yat.pc.in
+EXTRA_DIST +=  build_support/yat-config.in build_support/yat.pc.in
 
 edit = $(SED) \
@@ -62 +63 @@
   -e 's|@boost_version[@]|$(boost_version)|g'
 
-yat-config: Makefile $(srcdir)/yat-config.in
+build_support/yat-config: Makefile $(srcdir)/build_support/yat-config.in
   @rm -f $@ $@.tmp
   @echo "#! $(SHELL)" > $@.tmp
@@ -72 +73 @@
   @echo creating $@
 
-for_installation/yat-config: yat-config
+build_support/for_installation/yat-config: build_support/yat-config
   @rm -f $@ $@-t \
-  && $(MKDIR_P) for_installation \
-  && sed 's|installed=no|installed=yes|g' < yat-config > $@-t \
+  && $(MKDIR_P) build_support/for_installation \
+  && sed 's|installed=no|installed=yes|g' < build_support/yat-config > $@-t \
   && mv $@-t $@ && echo creating $@
 
-yat.pc: $(srcdir)/yat.pc.in gen_yat_pc.sh Makefile
-  @rm -f $@ $@-t \
+build_support/yat.pc: $(srcdir)/build_support/yat.pc.in build_support/gen_yat_pc.sh Makefile
+  rm -f $@ $@-t \
+  && cd build_support \
   && $(SHELL) gen_yat_pc.sh --prefix="$(prefix)" \
   --exec-prefix="$(exec_prefix)" \
   --libdir="$(libdir)" --includedir="$(includedir)" \
-  --input="$(srcdir)/yat.pc.in" > $@-t && mv $@-t $@ && echo creating $@
+  --input="../$(srcdir)/build_support/yat.pc.in" > yat.pc-t \
+  && mv yat.pc-t yat.pc && echo creating $@