diff options
| author | crodrigu <crodrigu@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2002-10-18 21:03:12 +0000 |
|---|---|---|
| committer | crodrigu <crodrigu@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2002-10-18 21:03:12 +0000 |
| commit | 65c7c1773b1bf9fc7f04af3c93de7aaf2c62dc95 (patch) | |
| tree | 2bdc1c838fbdd8f782b28eb259eedc02b2d77ae2 | |
| parent | 23f2debe706e8b222b96706a61ec965fdc704b4a (diff) | |
| download | ATCD-65c7c1773b1bf9fc7f04af3c93de7aaf2c62dc95.tar.gz | |
ChangeLogTag: Fri Oct 18 21:01:25 UTC 2002 Craig Rodrigues <crodrigu@bbn.com>
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | ChangeLogs/ChangeLog-03a | 6 | ||||
| -rw-r--r-- | examples/C++NPv1/Makefile | 2 | ||||
| -rw-r--r-- | examples/C++NPv2/Makefile | 62 |
4 files changed, 47 insertions, 29 deletions
diff --git a/ChangeLog b/ChangeLog index 5d44d89796a..52510b86838 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Fri Oct 18 21:01:25 UTC 2002 Craig Rodrigues <crodrigu@bbn.com> + + * examples/C++NPv1/Makefile: Fix comment. + * examples/C++NPv1/Makefile: Replace with recursive Makefile which + does not use for loops. + Fri Oct 18 15:44:19 2002 Priyanka Gontla <pgontla@ociweb.com> * THANKS: diff --git a/ChangeLogs/ChangeLog-03a b/ChangeLogs/ChangeLog-03a index 5d44d89796a..52510b86838 100644 --- a/ChangeLogs/ChangeLog-03a +++ b/ChangeLogs/ChangeLog-03a @@ -1,3 +1,9 @@ +Fri Oct 18 21:01:25 UTC 2002 Craig Rodrigues <crodrigu@bbn.com> + + * examples/C++NPv1/Makefile: Fix comment. + * examples/C++NPv1/Makefile: Replace with recursive Makefile which + does not use for loops. + Fri Oct 18 15:44:19 2002 Priyanka Gontla <pgontla@ociweb.com> * THANKS: diff --git a/examples/C++NPv1/Makefile b/examples/C++NPv1/Makefile index a20da5f5082..ff16fb9e1f4 100644 --- a/examples/C++NPv1/Makefile +++ b/examples/C++NPv1/Makefile @@ -19,7 +19,7 @@ MKLIST = Makefile.Iterative_Logging_Server \ Makefile.Thread_Per_Connection_Logging_Server ## Makefile.Reactive_Logging_Server_Ex.mkfile is a dummy target which will cause -## $(MAKE) -f Makefile.Svc_Utils to be invoked +## $(MAKE) -f Makefile.Reactive_Logging_Server_Ex to be invoked %.mkfile: % @echo $(MAKE) -f $< $(MKFILE_TARGET) @$(MAKE) -f $< $(MKFILE_TARGET) diff --git a/examples/C++NPv2/Makefile b/examples/C++NPv2/Makefile index 09a5dd6b41a..6342690b045 100644 --- a/examples/C++NPv2/Makefile +++ b/examples/C++NPv2/Makefile @@ -9,36 +9,42 @@ # Local macros #---------------------------------------------------------------------------- +#---------------------------------------------------------------------------- +# Local macros +#---------------------------------------------------------------------------- +MAKEFILE=Makefile + # These examples don't require SSL support... those that do are below. -EXAMPLES = Reactor_Logging_Server \ - Select_Reactor_Logging_Server \ - TP_Reactor_Logging_Server \ - Configurable_Logging_Server \ - SLD \ - SLDex \ - CLD \ - TPLS \ - SR_Configurable_Logging_Server \ - display_logfile +MKLIST = Makefile.Reactor_Logging_Server \ + Makefile.Select_Reactor_Logging_Server \ + Makefile.TP_Reactor_Logging_Server \ + Makefile.Configurable_Logging_Server \ + Makefile.SLD \ + Makefile.SLDex \ + Makefile.CLD \ + Makefile.TPLS \ + Makefile.SR_Configurable_Logging_Server \ + Makefile.display_logfile ifneq ($(ssl),) - EXAMPLES += AC_CLD AIO_CLD TPCLS + MKLIST += Makefile.AC_CLD Makefile.AIO_CLD Makefile.TPCLS endif # ssl -all: - @for ex in $(EXAMPLES); \ - do \ - $(MAKE) -f Makefile.$$ex; \ - done - -clean: - @for ex in $(EXAMPLES); \ - do \ - $(MAKE) -f Makefile.$$ex clean; \ - done - -realclean: - @for ex in $(EXAMPLES); \ - do \ - $(MAKE) -f Makefile.$$ex realclean; \ - done +## Makefile.Reactive_Logging_Server.mkfile is a dummy target which will cause +## $(MAKE) -f Makefile.Reactive_Logging_Server to be invoked +%.mkfile: % + @echo $(MAKE) -f $< $(MKFILE_TARGET) + @$(MAKE) -f $< $(MKFILE_TARGET) + +# This rule invokes make again with the list of .mkfile targets as a +# parameter. For example, if the all target is being made, make is invoked +# as follows: +# +# make -f Makefile MKFILE_TARGET=all Makefile.Reactive_Logging_Server_Ex + +all clean depend realclean: +ifneq ($(MKLIST),) + @echo $(MAKE) -f $(MAKEFILE) MKFILE_TARGET=$@ $(addsuffix .mkfile, $(MKLIST)) + @$(MAKE) -f $(MAKEFILE) MKFILE_TARGET=$@ $(addsuffix .mkfile, $(MKLIST)) +endif + |