Fossil SCM
Rename EXTRATARGETS to APPTARGETS in the MSVC makefile.
Commit
b575811affe45a4874eb690a9f2818a9b5df5b89
Parent
aea5e3d9cae9825…
3 files changed
+1
-1
+6
-5
+6
-5
+1
-1
| --- Makefile.classic | ||
| +++ Makefile.classic | ||
| @@ -25,11 +25,11 @@ | ||
| 25 | 25 | #### The suffix to add to final executable file. When cross-compiling |
| 26 | 26 | # to windows, make this ".exe". Otherwise leave it blank. |
| 27 | 27 | # |
| 28 | 28 | E = |
| 29 | 29 | |
| 30 | -#### C Compile and options for use in building executables that | |
| 30 | +#### C Compile and options for use in building executables that | |
| 31 | 31 | # will run on the target platform. This is usually the same |
| 32 | 32 | # as BCC, unless you are cross-compiling. This C compiler builds |
| 33 | 33 | # the finished binary for fossil. The BCC compiler above is used |
| 34 | 34 | # for building intermediate code-generator tools. |
| 35 | 35 | # |
| 36 | 36 |
| --- Makefile.classic | |
| +++ Makefile.classic | |
| @@ -25,11 +25,11 @@ | |
| 25 | #### The suffix to add to final executable file. When cross-compiling |
| 26 | # to windows, make this ".exe". Otherwise leave it blank. |
| 27 | # |
| 28 | E = |
| 29 | |
| 30 | #### C Compile and options for use in building executables that |
| 31 | # will run on the target platform. This is usually the same |
| 32 | # as BCC, unless you are cross-compiling. This C compiler builds |
| 33 | # the finished binary for fossil. The BCC compiler above is used |
| 34 | # for building intermediate code-generator tools. |
| 35 | # |
| 36 |
| --- Makefile.classic | |
| +++ Makefile.classic | |
| @@ -25,11 +25,11 @@ | |
| 25 | #### The suffix to add to final executable file. When cross-compiling |
| 26 | # to windows, make this ".exe". Otherwise leave it blank. |
| 27 | # |
| 28 | E = |
| 29 | |
| 30 | #### C Compile and options for use in building executables that |
| 31 | # will run on the target platform. This is usually the same |
| 32 | # as BCC, unless you are cross-compiling. This C compiler builds |
| 33 | # the finished binary for fossil. The BCC compiler above is used |
| 34 | # for building intermediate code-generator tools. |
| 35 | # |
| 36 |
+6
-5
| --- src/makemake.tcl | ||
| +++ src/makemake.tcl | ||
| @@ -1166,12 +1166,13 @@ | ||
| 1166 | 1166 | writeln -nonewline "\$(OX)\\$s\$O"; incr i |
| 1167 | 1167 | } |
| 1168 | 1168 | writeln " \\" |
| 1169 | 1169 | writeln -nonewline " \$(OX)\\fossil.res\n\n" |
| 1170 | 1170 | writeln { |
| 1171 | -APPNAME = $(OX)\fossil$(E) | |
| 1172 | -PDBNAME = $(OX)\fossil$(P) | |
| 1171 | +APPNAME = $(OX)\fossil$(E) | |
| 1172 | +PDBNAME = $(OX)\fossil$(P) | |
| 1173 | +APPTARGETS = | |
| 1173 | 1174 | |
| 1174 | 1175 | all: $(OX) $(APPNAME) |
| 1175 | 1176 | |
| 1176 | 1177 | zlib: |
| 1177 | 1178 | @echo Building zlib from "$(ZLIBDIR)"... |
| @@ -1186,17 +1187,17 @@ | ||
| 1186 | 1187 | @pushd "$(SSLDIR)" && $(PERL) Configure VC-WIN32 no-asm && popd |
| 1187 | 1188 | @pushd "$(SSLDIR)" && call ms\do_ms.bat && popd |
| 1188 | 1189 | @pushd "$(SSLDIR)" && $(MAKE) /f ms\nt.mak all && popd |
| 1189 | 1190 | !endif |
| 1190 | 1191 | |
| 1191 | -EXTRATARGETS = $(EXTRATARGETS) zlib | |
| 1192 | +APPTARGETS = $(APPTARGETS) zlib | |
| 1192 | 1193 | |
| 1193 | 1194 | !ifdef FOSSIL_ENABLE_SSL |
| 1194 | -EXTRATARGETS = $(EXTRATARGETS) openssl | |
| 1195 | +APPTARGETS = $(APPTARGETS) openssl | |
| 1195 | 1196 | !endif |
| 1196 | 1197 | |
| 1197 | -$(APPNAME) : translate$E mkindex$E headers $(OBJ) $(OX)\linkopts $(EXTRATARGETS) | |
| 1198 | +$(APPNAME) : translate$E mkindex$E headers $(OBJ) $(OX)\linkopts $(APPTARGETS) | |
| 1198 | 1199 | cd $(OX) |
| 1199 | 1200 | link $(LDFLAGS) /OUT:$@ $(LIBDIR) Wsetargv.obj fossil.res @linkopts |
| 1200 | 1201 | |
| 1201 | 1202 | $(OX)\linkopts: $B\win\Makefile.msc} |
| 1202 | 1203 | set redir {>} |
| 1203 | 1204 |
| --- src/makemake.tcl | |
| +++ src/makemake.tcl | |
| @@ -1166,12 +1166,13 @@ | |
| 1166 | writeln -nonewline "\$(OX)\\$s\$O"; incr i |
| 1167 | } |
| 1168 | writeln " \\" |
| 1169 | writeln -nonewline " \$(OX)\\fossil.res\n\n" |
| 1170 | writeln { |
| 1171 | APPNAME = $(OX)\fossil$(E) |
| 1172 | PDBNAME = $(OX)\fossil$(P) |
| 1173 | |
| 1174 | all: $(OX) $(APPNAME) |
| 1175 | |
| 1176 | zlib: |
| 1177 | @echo Building zlib from "$(ZLIBDIR)"... |
| @@ -1186,17 +1187,17 @@ | |
| 1186 | @pushd "$(SSLDIR)" && $(PERL) Configure VC-WIN32 no-asm && popd |
| 1187 | @pushd "$(SSLDIR)" && call ms\do_ms.bat && popd |
| 1188 | @pushd "$(SSLDIR)" && $(MAKE) /f ms\nt.mak all && popd |
| 1189 | !endif |
| 1190 | |
| 1191 | EXTRATARGETS = $(EXTRATARGETS) zlib |
| 1192 | |
| 1193 | !ifdef FOSSIL_ENABLE_SSL |
| 1194 | EXTRATARGETS = $(EXTRATARGETS) openssl |
| 1195 | !endif |
| 1196 | |
| 1197 | $(APPNAME) : translate$E mkindex$E headers $(OBJ) $(OX)\linkopts $(EXTRATARGETS) |
| 1198 | cd $(OX) |
| 1199 | link $(LDFLAGS) /OUT:$@ $(LIBDIR) Wsetargv.obj fossil.res @linkopts |
| 1200 | |
| 1201 | $(OX)\linkopts: $B\win\Makefile.msc} |
| 1202 | set redir {>} |
| 1203 |
| --- src/makemake.tcl | |
| +++ src/makemake.tcl | |
| @@ -1166,12 +1166,13 @@ | |
| 1166 | writeln -nonewline "\$(OX)\\$s\$O"; incr i |
| 1167 | } |
| 1168 | writeln " \\" |
| 1169 | writeln -nonewline " \$(OX)\\fossil.res\n\n" |
| 1170 | writeln { |
| 1171 | APPNAME = $(OX)\fossil$(E) |
| 1172 | PDBNAME = $(OX)\fossil$(P) |
| 1173 | APPTARGETS = |
| 1174 | |
| 1175 | all: $(OX) $(APPNAME) |
| 1176 | |
| 1177 | zlib: |
| 1178 | @echo Building zlib from "$(ZLIBDIR)"... |
| @@ -1186,17 +1187,17 @@ | |
| 1187 | @pushd "$(SSLDIR)" && $(PERL) Configure VC-WIN32 no-asm && popd |
| 1188 | @pushd "$(SSLDIR)" && call ms\do_ms.bat && popd |
| 1189 | @pushd "$(SSLDIR)" && $(MAKE) /f ms\nt.mak all && popd |
| 1190 | !endif |
| 1191 | |
| 1192 | APPTARGETS = $(APPTARGETS) zlib |
| 1193 | |
| 1194 | !ifdef FOSSIL_ENABLE_SSL |
| 1195 | APPTARGETS = $(APPTARGETS) openssl |
| 1196 | !endif |
| 1197 | |
| 1198 | $(APPNAME) : translate$E mkindex$E headers $(OBJ) $(OX)\linkopts $(APPTARGETS) |
| 1199 | cd $(OX) |
| 1200 | link $(LDFLAGS) /OUT:$@ $(LIBDIR) Wsetargv.obj fossil.res @linkopts |
| 1201 | |
| 1202 | $(OX)\linkopts: $B\win\Makefile.msc} |
| 1203 | set redir {>} |
| 1204 |
+6
-5
| --- win/Makefile.msc | ||
| +++ win/Makefile.msc | ||
| @@ -352,12 +352,13 @@ | ||
| 352 | 352 | $(OX)\xfersetup$O \ |
| 353 | 353 | $(OX)\zip$O \ |
| 354 | 354 | $(OX)\fossil.res |
| 355 | 355 | |
| 356 | 356 | |
| 357 | -APPNAME = $(OX)\fossil$(E) | |
| 358 | -PDBNAME = $(OX)\fossil$(P) | |
| 357 | +APPNAME = $(OX)\fossil$(E) | |
| 358 | +PDBNAME = $(OX)\fossil$(P) | |
| 359 | +APPTARGETS = | |
| 359 | 360 | |
| 360 | 361 | all: $(OX) $(APPNAME) |
| 361 | 362 | |
| 362 | 363 | zlib: |
| 363 | 364 | @echo Building zlib from "$(ZLIBDIR)"... |
| @@ -372,17 +373,17 @@ | ||
| 372 | 373 | @pushd "$(SSLDIR)" && $(PERL) Configure VC-WIN32 no-asm && popd |
| 373 | 374 | @pushd "$(SSLDIR)" && call ms\do_ms.bat && popd |
| 374 | 375 | @pushd "$(SSLDIR)" && $(MAKE) /f ms\nt.mak all && popd |
| 375 | 376 | !endif |
| 376 | 377 | |
| 377 | -EXTRATARGETS = $(EXTRATARGETS) zlib | |
| 378 | +APPTARGETS = $(APPTARGETS) zlib | |
| 378 | 379 | |
| 379 | 380 | !ifdef FOSSIL_ENABLE_SSL |
| 380 | -EXTRATARGETS = $(EXTRATARGETS) openssl | |
| 381 | +APPTARGETS = $(APPTARGETS) openssl | |
| 381 | 382 | !endif |
| 382 | 383 | |
| 383 | -$(APPNAME) : translate$E mkindex$E headers $(OBJ) $(OX)\linkopts $(EXTRATARGETS) | |
| 384 | +$(APPNAME) : translate$E mkindex$E headers $(OBJ) $(OX)\linkopts $(APPTARGETS) | |
| 384 | 385 | cd $(OX) |
| 385 | 386 | link $(LDFLAGS) /OUT:$@ $(LIBDIR) Wsetargv.obj fossil.res @linkopts |
| 386 | 387 | |
| 387 | 388 | $(OX)\linkopts: $B\win\Makefile.msc |
| 388 | 389 | echo $(OX)\add.obj > $@ |
| 389 | 390 |
| --- win/Makefile.msc | |
| +++ win/Makefile.msc | |
| @@ -352,12 +352,13 @@ | |
| 352 | $(OX)\xfersetup$O \ |
| 353 | $(OX)\zip$O \ |
| 354 | $(OX)\fossil.res |
| 355 | |
| 356 | |
| 357 | APPNAME = $(OX)\fossil$(E) |
| 358 | PDBNAME = $(OX)\fossil$(P) |
| 359 | |
| 360 | all: $(OX) $(APPNAME) |
| 361 | |
| 362 | zlib: |
| 363 | @echo Building zlib from "$(ZLIBDIR)"... |
| @@ -372,17 +373,17 @@ | |
| 372 | @pushd "$(SSLDIR)" && $(PERL) Configure VC-WIN32 no-asm && popd |
| 373 | @pushd "$(SSLDIR)" && call ms\do_ms.bat && popd |
| 374 | @pushd "$(SSLDIR)" && $(MAKE) /f ms\nt.mak all && popd |
| 375 | !endif |
| 376 | |
| 377 | EXTRATARGETS = $(EXTRATARGETS) zlib |
| 378 | |
| 379 | !ifdef FOSSIL_ENABLE_SSL |
| 380 | EXTRATARGETS = $(EXTRATARGETS) openssl |
| 381 | !endif |
| 382 | |
| 383 | $(APPNAME) : translate$E mkindex$E headers $(OBJ) $(OX)\linkopts $(EXTRATARGETS) |
| 384 | cd $(OX) |
| 385 | link $(LDFLAGS) /OUT:$@ $(LIBDIR) Wsetargv.obj fossil.res @linkopts |
| 386 | |
| 387 | $(OX)\linkopts: $B\win\Makefile.msc |
| 388 | echo $(OX)\add.obj > $@ |
| 389 |
| --- win/Makefile.msc | |
| +++ win/Makefile.msc | |
| @@ -352,12 +352,13 @@ | |
| 352 | $(OX)\xfersetup$O \ |
| 353 | $(OX)\zip$O \ |
| 354 | $(OX)\fossil.res |
| 355 | |
| 356 | |
| 357 | APPNAME = $(OX)\fossil$(E) |
| 358 | PDBNAME = $(OX)\fossil$(P) |
| 359 | APPTARGETS = |
| 360 | |
| 361 | all: $(OX) $(APPNAME) |
| 362 | |
| 363 | zlib: |
| 364 | @echo Building zlib from "$(ZLIBDIR)"... |
| @@ -372,17 +373,17 @@ | |
| 373 | @pushd "$(SSLDIR)" && $(PERL) Configure VC-WIN32 no-asm && popd |
| 374 | @pushd "$(SSLDIR)" && call ms\do_ms.bat && popd |
| 375 | @pushd "$(SSLDIR)" && $(MAKE) /f ms\nt.mak all && popd |
| 376 | !endif |
| 377 | |
| 378 | APPTARGETS = $(APPTARGETS) zlib |
| 379 | |
| 380 | !ifdef FOSSIL_ENABLE_SSL |
| 381 | APPTARGETS = $(APPTARGETS) openssl |
| 382 | !endif |
| 383 | |
| 384 | $(APPNAME) : translate$E mkindex$E headers $(OBJ) $(OX)\linkopts $(APPTARGETS) |
| 385 | cd $(OX) |
| 386 | link $(LDFLAGS) /OUT:$@ $(LIBDIR) Wsetargv.obj fossil.res @linkopts |
| 387 | |
| 388 | $(OX)\linkopts: $B\win\Makefile.msc |
| 389 | echo $(OX)\add.obj > $@ |
| 390 |