apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jor...@apache.org
Subject cvs commit: apr Makefile.in
Date Wed, 30 Jun 2004 14:06:21 GMT
jorton      2004/06/30 07:06:21

  Modified:    build    apr_rules.mk.in
               .        Makefile.in
  Log:
  * build/apr_rules.mk.in: Define APR_MKEXPORT and APR_MKVAREXPORT to
  point at each of the awk scripts (MKEXPORT wasn't used and pointed
  at the wrong filename).
  
  * Makefile.in (install): Make the installed apr_rules.mk point at the
  installed libtool and AWK scripts.
  (exports.c, export_vars.c): Use new APR_*EXPORT macros.
  
  Revision  Changes    Path
  1.5       +3 -2      apr/build/apr_rules.mk.in
  
  Index: apr_rules.mk.in
  ===================================================================
  RCS file: /home/cvs/apr/build/apr_rules.mk.in,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -d -w -u -r1.4 -r1.5
  --- apr_rules.mk.in	28 Feb 2004 18:31:41 -0000	1.4
  +++ apr_rules.mk.in	30 Jun 2004 14:06:21 -0000	1.5
  @@ -91,7 +91,8 @@
   
   LINK         = @link@
   
  -MKEXPORT     = $(AWK) -f $(apr_builders)/make_export.awk
  +APR_MKEXPORT     = $(AWK) -f $(apr_builders)/make_exports.awk
  +APR_MKVAREXPORT  = $(AWK) -f $(apr_builders)/make_var_export.awk
   MKDEP        = @MKDEP@
   
   #
  
  
  
  1.104     +11 -5     apr/Makefile.in
  
  Index: Makefile.in
  ===================================================================
  RCS file: /home/cvs/apr/Makefile.in,v
  retrieving revision 1.103
  retrieving revision 1.104
  diff -d -w -u -r1.103 -r1.104
  --- Makefile.in	30 Jun 2004 09:10:42 -0000	1.103
  +++ Makefile.in	30 Jun 2004 14:06:21 -0000	1.104
  @@ -39,7 +39,8 @@
   @INCLUDE_RULES@
   @INCLUDE_OUTPUTS@
   
  -CLEAN_TARGETS = apr-config.out apr.exp exports.c export_vars.c .make.dirs
  +CLEAN_TARGETS = apr-config.out apr.exp exports.c export_vars.c .make.dirs \
  +	build/apr_rules.out
   DISTCLEAN_TARGETS = config.cache config.log config.status \
   	include/apr.h include/arch/unix/apr_private.h \
   	libtool apr-config build/apr_rules.mk apr.pc
  @@ -57,7 +58,11 @@
   apr-config.out: apr-config
   	sed 's,^\(location=\).*$$,\1installed,' < apr-config > $@
   
  -install: $(TARGET_LIB) apr-config.out
  +# Create apr_rules.mk suitable for the install tree
  +build/apr_rules.out: build/apr_rules.mk
  +	sed 's,^\(apr_build.*=\).*$$,\1$(installbuilddir),' < build/apr_rules.mk > $@
  +
  +install: $(TARGET_LIB) apr-config.out build/apr_rules.out
   	if [ ! -d $(DESTDIR)$(includedir) ]; then \
   	    $(top_srcdir)/build/mkdir.sh $(DESTDIR)$(includedir); \
   	fi;
  @@ -84,9 +89,10 @@
   	if [ -f shlibtool ]; then \
   		$(LIBTOOL) --mode=install cp shlibtool $(DESTDIR)$(installbuilddir); \
   	fi
  -	for f in mkdir.sh make_exports.awk make_var_export.awk apr_rules.mk; do \
  +	for f in mkdir.sh make_exports.awk make_var_export.awk; do \
   	        test -f build/$${f} && cp build/$${f} $(DESTDIR)$(installbuilddir); \
   	done
  +	cp build/apr_rules.out $(DESTDIR)$(installbuilddir)/apr_rules.mk
   	if [ ! -d $(DESTDIR)$(bindir) ]; then \
   	    $(top_srcdir)/build/mkdir.sh $(DESTDIR)$(bindir); \
   	fi;
  @@ -102,10 +108,10 @@
   	$(LINK) @lib_target@ $(ALL_LIBS)
   
   exports.c: $(HEADERS)
  -	$(AWK) -f $(top_srcdir)/build/make_exports.awk $(HEADERS) > $@
  +	$(APR_MKEXPORT) $(HEADERS) > $@
   
   export_vars.c: $(HEADERS)
  -	$(AWK) -f $(top_srcdir)/build/make_var_export.awk $(HEADERS) > $@
  +	$(APR_MKVAREXPORT) $(HEADERS) > $@
   
   apr.exp: exports.c export_vars.c
   	@echo "#! lib@APR_LIBNAME@.so" > $@
  
  
  

Mime
View raw message