|
 |
f11bd6 |
From 1d1198847124798b7467d33b2aee2d8cdffc6a24 Mon Sep 17 00:00:00 2001
|
|
|
f11bd6 |
From: Kamil Dudka <kdudka@redhat.com>
|
|
|
f11bd6 |
Date: Wed, 13 Feb 2013 15:25:00 +0100
|
|
|
f11bd6 |
Subject: [PATCH] prepare upstream sources for parallel make
|
|
|
f11bd6 |
|
|
|
f11bd6 |
---
|
|
|
f11bd6 |
makefile.in | 46 ++++++++++++++++++++++------------------------
|
|
|
f11bd6 |
src/makefile.in | 10 ++++------
|
|
|
f11bd6 |
2 files changed, 26 insertions(+), 30 deletions(-)
|
|
|
f11bd6 |
|
|
|
f11bd6 |
diff --git a/makefile.in b/makefile.in
|
|
|
f11bd6 |
index 671ae0f..feb9a24 100644
|
|
|
f11bd6 |
--- a/makefile.in
|
|
|
f11bd6 |
+++ b/makefile.in
|
|
|
f11bd6 |
@@ -101,8 +101,6 @@ COMPRESS_EXT=@COMPRESS_EXT@
|
|
|
f11bd6 |
# Path of scripts directory
|
|
|
f11bd6 |
scripts_dir=$(srcdir)/scripts
|
|
|
f11bd6 |
|
|
|
f11bd6 |
-MAKE_RECUR = $(MAKE) @cf_cv_makeflags@ DESTDIR="$(DESTDIR)" CC="$(CC)"
|
|
|
f11bd6 |
-
|
|
|
f11bd6 |
@LYNXCFG_MAKE@CFG2HTML = alphatoc.html body.html cattoc.html
|
|
|
f11bd6 |
|
|
|
f11bd6 |
# !!!!!!!!!!! SUN resolv LIBRARY !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
|
|
|
f11bd6 |
@@ -199,19 +197,19 @@ binary_PROG = $(actual_PROG)$x
|
|
|
f11bd6 |
|
|
|
f11bd6 |
all lynx$x: cfg_defs.h LYHelp.h
|
|
|
f11bd6 |
@MSG_DIR_MAKE@ $(SHELL) $(scripts_dir)/fixtext.sh $(srcdir)/LYMessages_en.h >LYMessages.c
|
|
|
f11bd6 |
-@MSG_DIR_MAKE@ cd $(PO_DIR) && $(MAKE_RECUR)
|
|
|
f11bd6 |
- cd $(WWW_DIR) && $(MAKE_RECUR) $(WWW_CFLAGS)
|
|
|
f11bd6 |
- cd $(SRC_DIR) && $(MAKE_RECUR) all $(SRC_CFLAGS)
|
|
|
f11bd6 |
+@MSG_DIR_MAKE@ $(MAKE) -C $(PO_DIR)
|
|
|
f11bd6 |
+ $(MAKE) -C $(WWW_DIR) $(WWW_CFLAGS)
|
|
|
f11bd6 |
+ $(MAKE) -C $(SRC_DIR) all $(SRC_CFLAGS)
|
|
|
f11bd6 |
|
|
|
f11bd6 |
lint:
|
|
|
f11bd6 |
- cd $(WWW_DIR) && $(MAKE_RECUR) LINT="$(LINT)" $(WWW_CFLAGS) $@
|
|
|
f11bd6 |
- cd $(SRC_DIR) && $(MAKE_RECUR) LINT="$(LINT)" $(SRC_CFLAGS) $@
|
|
|
f11bd6 |
- cd $(CHR_DIR) && $(MAKE_RECUR) LINT="$(LINT)" $@
|
|
|
f11bd6 |
+ $(MAKE) -C $(WWW_DIR) LINT="$(LINT)" $(WWW_CFLAGS) $@
|
|
|
f11bd6 |
+ $(MAKE) -C $(SRC_DIR) LINT="$(LINT)" $(SRC_CFLAGS) $@
|
|
|
f11bd6 |
+ $(MAKE) -C $(CHR_DIR) LINT="$(LINT)" $@
|
|
|
f11bd6 |
|
|
|
f11bd6 |
tags:
|
|
|
f11bd6 |
- cd $(WWW_DIR) && $(MAKE_RECUR) $(WWW_CFLAGS) $@
|
|
|
f11bd6 |
- cd $(SRC_DIR) && $(MAKE_RECUR) $(SRC_CFLAGS) $@
|
|
|
f11bd6 |
- cd $(CHR_DIR) && $(MAKE_RECUR) $@
|
|
|
f11bd6 |
+ $(MAKE) -C $(WWW_DIR) $(WWW_CFLAGS) $@
|
|
|
f11bd6 |
+ $(MAKE) -C $(SRC_DIR) $(SRC_CFLAGS) $@
|
|
|
f11bd6 |
+ $(MAKE) -C $(CHR_DIR) $@
|
|
|
f11bd6 |
|
|
|
f11bd6 |
etags:
|
|
|
f11bd6 |
$(ETAGS) *.[ch] */*.[ch] */*/*.[ch] */*/*/*.[ch]
|
|
|
f11bd6 |
@@ -231,27 +229,27 @@ help:
|
|
|
f11bd6 |
clean:
|
|
|
f11bd6 |
rm -f WWW/Library/*/*.[aoib]
|
|
|
f11bd6 |
rm -f WWW/Library/*/.created
|
|
|
f11bd6 |
- cd $(WWW_DIR) && $(MAKE_RECUR) $@
|
|
|
f11bd6 |
- cd $(SRC_DIR) && $(MAKE_RECUR) $@
|
|
|
f11bd6 |
+ $(MAKE) -C $(WWW_DIR) $@
|
|
|
f11bd6 |
+ $(MAKE) -C $(SRC_DIR) $@
|
|
|
f11bd6 |
@MSG_DIR_MAKE@ rm -f LYMessages.c
|
|
|
f11bd6 |
-@MSG_DIR_MAKE@ cd $(PO_DIR) && $(MAKE_RECUR) $@
|
|
|
f11bd6 |
+@MSG_DIR_MAKE@ $(MAKE) -C $(PO_DIR) $@
|
|
|
f11bd6 |
rm -f *.b $(SRC_DIR)/lynx$x *.leaks cfg_defs.h LYHelp.h lint.*
|
|
|
f11bd6 |
@LYNXCFG_MAKE@ -rm -f $(CFG2HTML)
|
|
|
f11bd6 |
rm -f help_files.sed
|
|
|
f11bd6 |
rm -f core *.core
|
|
|
f11bd6 |
|
|
|
f11bd6 |
depend: cfg_defs.h LYHelp.h
|
|
|
f11bd6 |
- cd $(WWW_DIR) && $(MAKE_RECUR) $@
|
|
|
f11bd6 |
- cd $(SRC_DIR) && $(MAKE_RECUR) $@
|
|
|
f11bd6 |
+ $(MAKE) -C $(WWW_DIR) $@
|
|
|
f11bd6 |
+ $(MAKE) -C $(SRC_DIR) $@
|
|
|
f11bd6 |
|
|
|
f11bd6 |
distclean: clean
|
|
|
f11bd6 |
-rm -f WWW/Library/*/*~
|
|
|
f11bd6 |
-rm -f WWW/Library/*/*.bak
|
|
|
f11bd6 |
-rm -rf $(SRC_DIR)/obsolete
|
|
|
f11bd6 |
- -cd $(WWW_DIR) && $(MAKE_RECUR) $@
|
|
|
f11bd6 |
- -cd $(SRC_DIR) && $(MAKE_RECUR) $@
|
|
|
f11bd6 |
- -cd $(CHR_DIR) && $(MAKE_RECUR) $@
|
|
|
f11bd6 |
-@MSG_DIR_MAKE@ cd $(PO_DIR) && $(MAKE_RECUR) $@
|
|
|
f11bd6 |
+ -$(MAKE) -C $(WWW_DIR) $@
|
|
|
f11bd6 |
+ -$(MAKE) -C $(SRC_DIR) $@
|
|
|
f11bd6 |
+ -$(MAKE) -C $(CHR_DIR) $@
|
|
|
f11bd6 |
+@MSG_DIR_MAKE@ $(MAKE) -C $(PO_DIR) $@
|
|
|
f11bd6 |
@MSG_DIR_MAKE@ -rmdir $(PO_DIR)
|
|
|
f11bd6 |
-rm -f *~ *.bak *.sav tags TAGS
|
|
|
f11bd6 |
-rm -f $(WWW_DIR)/makefile $(SRC_DIR)/makefile $(CHR_DIR)/makefile
|
|
|
f11bd6 |
@@ -320,7 +318,7 @@ install-full: install install-help install-doc
|
|
|
f11bd6 |
@echo Full installation complete.
|
|
|
f11bd6 |
|
|
|
f11bd6 |
install-bin: $(BINDIR) lynx$x
|
|
|
f11bd6 |
-@MSG_DIR_MAKE@ cd $(PO_DIR) && $(MAKE_RECUR) install
|
|
|
f11bd6 |
+@MSG_DIR_MAKE@ $(MAKE) -C $(PO_DIR) install
|
|
|
f11bd6 |
@ECHO_CC@$(SHELL) -c \
|
|
|
f11bd6 |
'if test -f $(BINDIR)/$(binary_PROG) ; then \
|
|
|
f11bd6 |
mv -f $(BINDIR)/$(binary_PROG) $(BINDIR)/lynx.old; fi'
|
|
|
f11bd6 |
@@ -354,7 +352,7 @@ LYNXHELP_URL='$(LYNX_URL)/lynx_help/'
|
|
|
f11bd6 |
|
|
|
f11bd6 |
@LYNXCFG_MAKE@$(CFG2HTML) :
|
|
|
f11bd6 |
@LYNXCFG_MAKE@ @echo 'Making htmlized lynx.cfg'
|
|
|
f11bd6 |
-@LYNXCFG_MAKE@ cd $(SRC_DIR) && $(MAKE_RECUR) LYReadCFG.i
|
|
|
f11bd6 |
+@LYNXCFG_MAKE@ $(MAKE) -C $(SRC_DIR) LYReadCFG.i
|
|
|
f11bd6 |
@LYNXCFG_MAKE@ @-rm -f $(CFG2HTML)
|
|
|
f11bd6 |
@LYNXCFG_MAKE@ sed -n -e '/Config_Type *Config_Table/,/{0, *0, *0}/ p' $(SRC_DIR)/LYReadCFG.i | \
|
|
|
f11bd6 |
@LYNXCFG_MAKE@ sed -e 's/ *{ *"\([^"]*\)".*/\1/' | \
|
|
|
f11bd6 |
@@ -452,7 +450,7 @@ install-lss : $(SYSCONFDIR)
|
|
|
f11bd6 |
@$(SHELL) $(scripts_dir)/install-lss.sh "$(INSTALL_DATA)" $(srcdir)/samples/lynx.lss $(SYSCONFDIR)/lynx.lss
|
|
|
f11bd6 |
|
|
|
f11bd6 |
uninstall ::
|
|
|
f11bd6 |
-@MSG_DIR_MAKE@ cd $(PO_DIR) && $(MAKE_RECUR) uninstall
|
|
|
f11bd6 |
+@MSG_DIR_MAKE@ $(MAKE) -C $(PO_DIR) uninstall
|
|
|
f11bd6 |
-rm -f $(BINDIR)/$(binary_PROG)
|
|
|
f11bd6 |
-rm -f $(MANDIR)/$(actual_PROG).1
|
|
|
f11bd6 |
-rm -f $(SYSCONFDIR)/lynx.cfg
|
|
|
f11bd6 |
@@ -485,7 +483,7 @@ uninstall-doc ::
|
|
|
f11bd6 |
|
|
|
f11bd6 |
update-po:
|
|
|
f11bd6 |
rsync -Lrtvz translationproject.org::tp/latest/lynx/ $(PO_SRCDIR)
|
|
|
f11bd6 |
- test -f $(PO_SRCDIR)/makefile && cd $(PO_SRCDIR) && $(MAKE_RECUR) $@
|
|
|
f11bd6 |
+ test -f $(PO_SRCDIR)/makefile && $(MAKE) -C $(PO_SRCDIR) $@
|
|
|
f11bd6 |
|
|
|
f11bd6 |
preinstall :
|
|
|
f11bd6 |
@ echo ''
|
|
|
f11bd6 |
diff --git a/src/makefile.in b/src/makefile.in
|
|
|
f11bd6 |
index a18b653..589df1a 100644
|
|
|
f11bd6 |
--- a/src/makefile.in
|
|
|
f11bd6 |
+++ b/src/makefile.in
|
|
|
f11bd6 |
@@ -35,8 +35,6 @@ BUILD_CFLAGS = @BUILD_CFLAGS@
|
|
|
f11bd6 |
BUILD_CPPFLAGS = @BUILD_CPPFLAGS@ @DEFS@
|
|
|
f11bd6 |
BUILD_EXEEXT = @BUILD_EXEEXT@
|
|
|
f11bd6 |
|
|
|
f11bd6 |
-MAKE_RECUR = $(MAKE) @cf_cv_makeflags@ DESTDIR="$(DESTDIR)" CC="$(CC)"
|
|
|
f11bd6 |
-
|
|
|
f11bd6 |
YACC = @YACC@
|
|
|
f11bd6 |
WINDRES = @WINDRES@
|
|
|
f11bd6 |
|
|
|
f11bd6 |
@@ -116,7 +114,7 @@ message:
|
|
|
f11bd6 |
@echo "Compiling Lynx sources"
|
|
|
f11bd6 |
|
|
|
f11bd6 |
do_chartrans_stuff:
|
|
|
f11bd6 |
- -cd chrtrans && $(MAKE_RECUR) \
|
|
|
f11bd6 |
+ -$(MAKE) -C chrtrans \
|
|
|
f11bd6 |
SITE_DEFS="$(SITE_DEFS)" \
|
|
|
f11bd6 |
BUILD_CFLAGS="$(BUILD_CFLAGS)" \
|
|
|
f11bd6 |
BUILD_CPPFLAGS="$(BUILD_CPPFLAGS)" \
|
|
|
f11bd6 |
@@ -129,7 +127,7 @@ lint:
|
|
|
f11bd6 |
|
|
|
f11bd6 |
clean:
|
|
|
f11bd6 |
rm -f lynx$x core *.core *.leaks *.i *$o *.bak tags TAGS test_*
|
|
|
f11bd6 |
- cd chrtrans && $(MAKE_RECUR) clean
|
|
|
f11bd6 |
+ $(MAKE) -C chrtrans clean
|
|
|
f11bd6 |
|
|
|
f11bd6 |
tags:
|
|
|
f11bd6 |
$(CTAGS) *.[ch]
|
|
|
f11bd6 |
@@ -207,7 +205,7 @@ TABLES= \
|
|
|
f11bd6 |
$(CHRTR)viscii_uni.h
|
|
|
f11bd6 |
|
|
|
f11bd6 |
$(TABLES):
|
|
|
f11bd6 |
- -cd chrtrans && $(MAKE_RECUR) tables
|
|
|
f11bd6 |
+ -$(MAKE) -C chrtrans tables
|
|
|
f11bd6 |
|
|
|
f11bd6 |
UCdomap$o : UCdomap.c \
|
|
|
f11bd6 |
chrtrans/UCkd.h \
|
|
|
f11bd6 |
@@ -216,7 +214,7 @@ UCdomap$o : UCdomap.c \
|
|
|
f11bd6 |
UCdomap.h $(CMN)UCMap.h $(TABLES) $(top_srcdir)/userdefs.h
|
|
|
f11bd6 |
|
|
|
f11bd6 |
chrtrans/makeuctb$(BUILD_EXEEXT):
|
|
|
f11bd6 |
- cd chrtrans && $(MAKE_RECUR) makeuctb$(BUILD_EXEEXT)
|
|
|
f11bd6 |
+ $(MAKE) -C chrtrans makeuctb$(BUILD_EXEEXT)
|
|
|
f11bd6 |
|
|
|
f11bd6 |
UCAux$o : UCAux.c $(CMN)UCAux.h $(CMN)UCDefs.h
|
|
|
f11bd6 |
LYCookie$o : $(top_srcdir)/userdefs.h
|
|
|
f11bd6 |
--
|
|
|
f11bd6 |
1.7.1
|
|
|
f11bd6 |
|