Fossil SCM
In the MinGW makefile, move included LIBs after the object files.
Commit
c7117ab458bd01cb40c39603a012d0224a61a749
Parent
fc14f1431286cc5…
3 files changed
+1
-1
+1
-1
+1
-1
+1
-1
| --- src/makemake.tcl | ||
| +++ src/makemake.tcl | ||
| @@ -1030,11 +1030,11 @@ | ||
| 1030 | 1030 | APPTARGETS += openssl |
| 1031 | 1031 | endif |
| 1032 | 1032 | |
| 1033 | 1033 | $(APPNAME): $(APPTARGETS) $(OBJDIR)/headers $(CODECHECK1) $(OBJ) $(EXTRAOBJ) $(OBJDIR)/fossil.o |
| 1034 | 1034 | $(CODECHECK1) $(TRANS_SRC) |
| 1035 | - $(TCC) -o $@ $(OBJ) $(EXTRAOBJ) $(LIB) $(OBJDIR)/fossil.o | |
| 1035 | + $(TCC) -o $@ $(OBJ) $(EXTRAOBJ) $(OBJDIR)/fossil.o $(LIB) | |
| 1036 | 1036 | |
| 1037 | 1037 | # This rule prevents make from using its default rules to try build |
| 1038 | 1038 | # an executable named "manifest" out of the file named "manifest.c" |
| 1039 | 1039 | # |
| 1040 | 1040 | $(SRCDIR)/../manifest: |
| 1041 | 1041 |
| --- src/makemake.tcl | |
| +++ src/makemake.tcl | |
| @@ -1030,11 +1030,11 @@ | |
| 1030 | APPTARGETS += openssl |
| 1031 | endif |
| 1032 | |
| 1033 | $(APPNAME): $(APPTARGETS) $(OBJDIR)/headers $(CODECHECK1) $(OBJ) $(EXTRAOBJ) $(OBJDIR)/fossil.o |
| 1034 | $(CODECHECK1) $(TRANS_SRC) |
| 1035 | $(TCC) -o $@ $(OBJ) $(EXTRAOBJ) $(LIB) $(OBJDIR)/fossil.o |
| 1036 | |
| 1037 | # This rule prevents make from using its default rules to try build |
| 1038 | # an executable named "manifest" out of the file named "manifest.c" |
| 1039 | # |
| 1040 | $(SRCDIR)/../manifest: |
| 1041 |
| --- src/makemake.tcl | |
| +++ src/makemake.tcl | |
| @@ -1030,11 +1030,11 @@ | |
| 1030 | APPTARGETS += openssl |
| 1031 | endif |
| 1032 | |
| 1033 | $(APPNAME): $(APPTARGETS) $(OBJDIR)/headers $(CODECHECK1) $(OBJ) $(EXTRAOBJ) $(OBJDIR)/fossil.o |
| 1034 | $(CODECHECK1) $(TRANS_SRC) |
| 1035 | $(TCC) -o $@ $(OBJ) $(EXTRAOBJ) $(OBJDIR)/fossil.o $(LIB) |
| 1036 | |
| 1037 | # This rule prevents make from using its default rules to try build |
| 1038 | # an executable named "manifest" out of the file named "manifest.c" |
| 1039 | # |
| 1040 | $(SRCDIR)/../manifest: |
| 1041 |
+1
-1
| --- win/Makefile.mingw | ||
| +++ win/Makefile.mingw | ||
| @@ -972,11 +972,11 @@ | ||
| 972 | 972 | APPTARGETS += openssl |
| 973 | 973 | endif |
| 974 | 974 | |
| 975 | 975 | $(APPNAME): $(APPTARGETS) $(OBJDIR)/headers $(CODECHECK1) $(OBJ) $(EXTRAOBJ) $(OBJDIR)/fossil.o |
| 976 | 976 | $(CODECHECK1) $(TRANS_SRC) |
| 977 | - $(TCC) -o $@ $(OBJ) $(EXTRAOBJ) $(LIB) $(OBJDIR)/fossil.o | |
| 977 | + $(TCC) -o $@ $(OBJ) $(EXTRAOBJ) $(OBJDIR)/fossil.o $(LIB) | |
| 978 | 978 | |
| 979 | 979 | # This rule prevents make from using its default rules to try build |
| 980 | 980 | # an executable named "manifest" out of the file named "manifest.c" |
| 981 | 981 | # |
| 982 | 982 | $(SRCDIR)/../manifest: |
| 983 | 983 |
| --- win/Makefile.mingw | |
| +++ win/Makefile.mingw | |
| @@ -972,11 +972,11 @@ | |
| 972 | APPTARGETS += openssl |
| 973 | endif |
| 974 | |
| 975 | $(APPNAME): $(APPTARGETS) $(OBJDIR)/headers $(CODECHECK1) $(OBJ) $(EXTRAOBJ) $(OBJDIR)/fossil.o |
| 976 | $(CODECHECK1) $(TRANS_SRC) |
| 977 | $(TCC) -o $@ $(OBJ) $(EXTRAOBJ) $(LIB) $(OBJDIR)/fossil.o |
| 978 | |
| 979 | # This rule prevents make from using its default rules to try build |
| 980 | # an executable named "manifest" out of the file named "manifest.c" |
| 981 | # |
| 982 | $(SRCDIR)/../manifest: |
| 983 |
| --- win/Makefile.mingw | |
| +++ win/Makefile.mingw | |
| @@ -972,11 +972,11 @@ | |
| 972 | APPTARGETS += openssl |
| 973 | endif |
| 974 | |
| 975 | $(APPNAME): $(APPTARGETS) $(OBJDIR)/headers $(CODECHECK1) $(OBJ) $(EXTRAOBJ) $(OBJDIR)/fossil.o |
| 976 | $(CODECHECK1) $(TRANS_SRC) |
| 977 | $(TCC) -o $@ $(OBJ) $(EXTRAOBJ) $(OBJDIR)/fossil.o $(LIB) |
| 978 | |
| 979 | # This rule prevents make from using its default rules to try build |
| 980 | # an executable named "manifest" out of the file named "manifest.c" |
| 981 | # |
| 982 | $(SRCDIR)/../manifest: |
| 983 |
+1
-1
| --- win/Makefile.mingw.mistachkin | ||
| +++ win/Makefile.mingw.mistachkin | ||
| @@ -972,11 +972,11 @@ | ||
| 972 | 972 | APPTARGETS += openssl |
| 973 | 973 | endif |
| 974 | 974 | |
| 975 | 975 | $(APPNAME): $(APPTARGETS) $(OBJDIR)/headers $(CODECHECK1) $(OBJ) $(EXTRAOBJ) $(OBJDIR)/fossil.o |
| 976 | 976 | $(CODECHECK1) $(TRANS_SRC) |
| 977 | - $(TCC) -o $@ $(OBJ) $(EXTRAOBJ) $(LIB) $(OBJDIR)/fossil.o | |
| 977 | + $(TCC) -o $@ $(OBJ) $(EXTRAOBJ) $(OBJDIR)/fossil.o $(LIB) | |
| 978 | 978 | |
| 979 | 979 | # This rule prevents make from using its default rules to try build |
| 980 | 980 | # an executable named "manifest" out of the file named "manifest.c" |
| 981 | 981 | # |
| 982 | 982 | $(SRCDIR)/../manifest: |
| 983 | 983 |
| --- win/Makefile.mingw.mistachkin | |
| +++ win/Makefile.mingw.mistachkin | |
| @@ -972,11 +972,11 @@ | |
| 972 | APPTARGETS += openssl |
| 973 | endif |
| 974 | |
| 975 | $(APPNAME): $(APPTARGETS) $(OBJDIR)/headers $(CODECHECK1) $(OBJ) $(EXTRAOBJ) $(OBJDIR)/fossil.o |
| 976 | $(CODECHECK1) $(TRANS_SRC) |
| 977 | $(TCC) -o $@ $(OBJ) $(EXTRAOBJ) $(LIB) $(OBJDIR)/fossil.o |
| 978 | |
| 979 | # This rule prevents make from using its default rules to try build |
| 980 | # an executable named "manifest" out of the file named "manifest.c" |
| 981 | # |
| 982 | $(SRCDIR)/../manifest: |
| 983 |
| --- win/Makefile.mingw.mistachkin | |
| +++ win/Makefile.mingw.mistachkin | |
| @@ -972,11 +972,11 @@ | |
| 972 | APPTARGETS += openssl |
| 973 | endif |
| 974 | |
| 975 | $(APPNAME): $(APPTARGETS) $(OBJDIR)/headers $(CODECHECK1) $(OBJ) $(EXTRAOBJ) $(OBJDIR)/fossil.o |
| 976 | $(CODECHECK1) $(TRANS_SRC) |
| 977 | $(TCC) -o $@ $(OBJ) $(EXTRAOBJ) $(OBJDIR)/fossil.o $(LIB) |
| 978 | |
| 979 | # This rule prevents make from using its default rules to try build |
| 980 | # an executable named "manifest" out of the file named "manifest.c" |
| 981 | # |
| 982 | $(SRCDIR)/../manifest: |
| 983 |