diff options
| author | rmanfredi <rmanfredi@2592e710-e01b-42a5-8df0-11608a6cc53d> | 2011-11-05 13:27:37 +0000 |
|---|---|---|
| committer | rmanfredi <rmanfredi@2592e710-e01b-42a5-8df0-11608a6cc53d> | 2011-11-05 13:27:37 +0000 |
| commit | 647979715ecc888fea05d22ddb65e1be324c7916 (patch) | |
| tree | 3a842f1d8fe52a455a0fba2194bbede77839f651 /jmake | |
| parent | 447c9e63aea7e3dd14c3821336774d4acf2ab573 (diff) | |
Removed obsolete (and wrong) SingleProgramTarget().
Added NormalProgramLibTarget().
git-svn-id: svn://svn.code.sf.net/p/dist/code/trunk/dist@99 2592e710-e01b-42a5-8df0-11608a6cc53d
Diffstat (limited to 'jmake')
| -rw-r--r-- | jmake/files/Jmake.rules | 23 |
1 files changed, 17 insertions, 6 deletions
diff --git a/jmake/files/Jmake.rules b/jmake/files/Jmake.rules index b3b4f8b..4e38e5a 100644 --- a/jmake/files/Jmake.rules +++ b/jmake/files/Jmake.rules @@ -101,6 +101,7 @@ local_realclean:: @@\ if test -f program^^^$(_EXE); then \ @@\ $(MV) program^^^$(_EXE) program^^~^^^$(_EXE); fi + /* * NormalProgramTarget: * Generate rules to compile and link the indicated program; since @@ -119,12 +120,23 @@ program: objects @@\ /* - * SingleProgramTarget: - * Obsolete version of NormalProgramTarget that doesn't have - * deplibs. + * NormalProgramLibTarget: + * Generate rules to compile and link the indicated program; since + * it does not use any default object files, it may be used for + * multiple programs in the same Jmakefile. + * The ``libs'' argument is used to depend on locally built libraries, + * in te same Jmakefile. */ -#define SingleProgramTarget(program,objects,libs) \ -NormalProgramTarget(program,objects,libs) +#define NormalProgramLibTarget(program,sources,objects,libs) @!\ +++OBJECTS objects @!\ +++SOURCES sources @!\ +NormalObjectRule() @!\ +AllTargetProgram(program) @!\ + @!\ +program: objects libs @@\ + RemoveTargetProgram($@) @@\ + $(CC) -o $@$(_EXE) objects $(JLDFLAGS) libs $(LIBS) @!\ + /* * SimpleProgramTarget: @@ -136,7 +148,6 @@ NormalProgramTarget(program,objects,libs) NormalProgramTarget(program,program.c,program.o) - /* * ComplexProgramTarget: * Generate rules for compiling and linking the program specified by |