Fossil SCM
Fix a makefile warning issue due to build rule duplication.
Commit
9e888499e1c9fdb63bb85d22dd683fbade99cb66
Parent
779f3407f522b0c…
3 files changed
+1
-4
+1
-4
-3
+1
-4
| --- src/makemake.tcl | ||
| +++ src/makemake.tcl | ||
| @@ -931,11 +931,11 @@ | ||
| 931 | 931 | |
| 932 | 932 | ifdef FOSSIL_BUILD_SSL |
| 933 | 933 | APPTARGETS += openssl |
| 934 | 934 | endif |
| 935 | 935 | |
| 936 | -$(APPNAME): $(OBJDIR)/headers $(OBJ) $(CODECHECK1) $(EXTRAOBJ) $(OBJDIR)/fossil.o $(APPTARGETS) | |
| 936 | +$(APPNAME): $(OBJDIR)/headers $(CODECHECK1) $(OBJ) $(EXTRAOBJ) $(OBJDIR)/fossil.o $(APPTARGETS) | |
| 937 | 937 | $(CODECHECK1) $(TRANS_SRC) |
| 938 | 938 | $(TCC) -o $(APPNAME) $(OBJ) $(EXTRAOBJ) $(LIB) $(OBJDIR)/fossil.o |
| 939 | 939 | |
| 940 | 940 | # This rule prevents make from using its default rules to try build |
| 941 | 941 | # an executable named "manifest" out of the file named "manifest.c" |
| @@ -980,13 +980,10 @@ | ||
| 980 | 980 | writeln "\$(OBJDIR)/headers: Makefile\n" |
| 981 | 981 | writeln "Makefile:\n" |
| 982 | 982 | set extra_h(main) " \$(OBJDIR)/page_index.h " |
| 983 | 983 | set extra_h(builtin) " \$(OBJDIR)/builtin_data.h " |
| 984 | 984 | |
| 985 | -writeln "\$(OBJDIR)/builtin_data.h:\t\$(MKBUILTIN) \$(EXTRA_FILES)" | |
| 986 | -writeln "\t\$(MKBUILTIN) \$(EXTRA_FILES) >\$(OBJDIR)/builtin_data.h\n" | |
| 987 | - | |
| 988 | 985 | foreach s [lsort $src] { |
| 989 | 986 | writeln "\$(OBJDIR)/${s}_.c:\t\$(SRCDIR)/$s.c \$(TRANSLATE)" |
| 990 | 987 | writeln "\t\$(TRANSLATE) \$(SRCDIR)/$s.c >\$(OBJDIR)/${s}_.c\n" |
| 991 | 988 | writeln "\$(OBJDIR)/$s.o:\t\$(OBJDIR)/${s}_.c \$(OBJDIR)/$s.h$extra_h($s)\$(SRCDIR)/config.h" |
| 992 | 989 | writeln "\t\$(XTCC) -o \$(OBJDIR)/$s.o -c \$(OBJDIR)/${s}_.c\n" |
| 993 | 990 |
| --- src/makemake.tcl | |
| +++ src/makemake.tcl | |
| @@ -931,11 +931,11 @@ | |
| 931 | |
| 932 | ifdef FOSSIL_BUILD_SSL |
| 933 | APPTARGETS += openssl |
| 934 | endif |
| 935 | |
| 936 | $(APPNAME): $(OBJDIR)/headers $(OBJ) $(CODECHECK1) $(EXTRAOBJ) $(OBJDIR)/fossil.o $(APPTARGETS) |
| 937 | $(CODECHECK1) $(TRANS_SRC) |
| 938 | $(TCC) -o $(APPNAME) $(OBJ) $(EXTRAOBJ) $(LIB) $(OBJDIR)/fossil.o |
| 939 | |
| 940 | # This rule prevents make from using its default rules to try build |
| 941 | # an executable named "manifest" out of the file named "manifest.c" |
| @@ -980,13 +980,10 @@ | |
| 980 | writeln "\$(OBJDIR)/headers: Makefile\n" |
| 981 | writeln "Makefile:\n" |
| 982 | set extra_h(main) " \$(OBJDIR)/page_index.h " |
| 983 | set extra_h(builtin) " \$(OBJDIR)/builtin_data.h " |
| 984 | |
| 985 | writeln "\$(OBJDIR)/builtin_data.h:\t\$(MKBUILTIN) \$(EXTRA_FILES)" |
| 986 | writeln "\t\$(MKBUILTIN) \$(EXTRA_FILES) >\$(OBJDIR)/builtin_data.h\n" |
| 987 | |
| 988 | foreach s [lsort $src] { |
| 989 | writeln "\$(OBJDIR)/${s}_.c:\t\$(SRCDIR)/$s.c \$(TRANSLATE)" |
| 990 | writeln "\t\$(TRANSLATE) \$(SRCDIR)/$s.c >\$(OBJDIR)/${s}_.c\n" |
| 991 | writeln "\$(OBJDIR)/$s.o:\t\$(OBJDIR)/${s}_.c \$(OBJDIR)/$s.h$extra_h($s)\$(SRCDIR)/config.h" |
| 992 | writeln "\t\$(XTCC) -o \$(OBJDIR)/$s.o -c \$(OBJDIR)/${s}_.c\n" |
| 993 |
| --- src/makemake.tcl | |
| +++ src/makemake.tcl | |
| @@ -931,11 +931,11 @@ | |
| 931 | |
| 932 | ifdef FOSSIL_BUILD_SSL |
| 933 | APPTARGETS += openssl |
| 934 | endif |
| 935 | |
| 936 | $(APPNAME): $(OBJDIR)/headers $(CODECHECK1) $(OBJ) $(EXTRAOBJ) $(OBJDIR)/fossil.o $(APPTARGETS) |
| 937 | $(CODECHECK1) $(TRANS_SRC) |
| 938 | $(TCC) -o $(APPNAME) $(OBJ) $(EXTRAOBJ) $(LIB) $(OBJDIR)/fossil.o |
| 939 | |
| 940 | # This rule prevents make from using its default rules to try build |
| 941 | # an executable named "manifest" out of the file named "manifest.c" |
| @@ -980,13 +980,10 @@ | |
| 980 | writeln "\$(OBJDIR)/headers: Makefile\n" |
| 981 | writeln "Makefile:\n" |
| 982 | set extra_h(main) " \$(OBJDIR)/page_index.h " |
| 983 | set extra_h(builtin) " \$(OBJDIR)/builtin_data.h " |
| 984 | |
| 985 | foreach s [lsort $src] { |
| 986 | writeln "\$(OBJDIR)/${s}_.c:\t\$(SRCDIR)/$s.c \$(TRANSLATE)" |
| 987 | writeln "\t\$(TRANSLATE) \$(SRCDIR)/$s.c >\$(OBJDIR)/${s}_.c\n" |
| 988 | writeln "\$(OBJDIR)/$s.o:\t\$(OBJDIR)/${s}_.c \$(OBJDIR)/$s.h$extra_h($s)\$(SRCDIR)/config.h" |
| 989 | writeln "\t\$(XTCC) -o \$(OBJDIR)/$s.o -c \$(OBJDIR)/${s}_.c\n" |
| 990 |
+1
-4
| --- win/Makefile.mingw | ||
| +++ win/Makefile.mingw | ||
| @@ -831,11 +831,11 @@ | ||
| 831 | 831 | |
| 832 | 832 | ifdef FOSSIL_BUILD_SSL |
| 833 | 833 | APPTARGETS += openssl |
| 834 | 834 | endif |
| 835 | 835 | |
| 836 | -$(APPNAME): $(OBJDIR)/headers $(OBJ) $(CODECHECK1) $(EXTRAOBJ) $(OBJDIR)/fossil.o $(APPTARGETS) | |
| 836 | +$(APPNAME): $(OBJDIR)/headers $(CODECHECK1) $(OBJ) $(EXTRAOBJ) $(OBJDIR)/fossil.o $(APPTARGETS) | |
| 837 | 837 | $(CODECHECK1) $(TRANS_SRC) |
| 838 | 838 | $(TCC) -o $(APPNAME) $(OBJ) $(EXTRAOBJ) $(LIB) $(OBJDIR)/fossil.o |
| 839 | 839 | |
| 840 | 840 | # This rule prevents make from using its default rules to try build |
| 841 | 841 | # an executable named "manifest" out of the file named "manifest.c" |
| @@ -984,13 +984,10 @@ | ||
| 984 | 984 | |
| 985 | 985 | $(OBJDIR)/headers: Makefile |
| 986 | 986 | |
| 987 | 987 | Makefile: |
| 988 | 988 | |
| 989 | -$(OBJDIR)/builtin_data.h: $(MKBUILTIN) $(EXTRA_FILES) | |
| 990 | - $(MKBUILTIN) $(EXTRA_FILES) >$(OBJDIR)/builtin_data.h | |
| 991 | - | |
| 992 | 989 | $(OBJDIR)/add_.c: $(SRCDIR)/add.c $(TRANSLATE) |
| 993 | 990 | $(TRANSLATE) $(SRCDIR)/add.c >$(OBJDIR)/add_.c |
| 994 | 991 | |
| 995 | 992 | $(OBJDIR)/add.o: $(OBJDIR)/add_.c $(OBJDIR)/add.h $(SRCDIR)/config.h |
| 996 | 993 | $(XTCC) -o $(OBJDIR)/add.o -c $(OBJDIR)/add_.c |
| 997 | 994 |
| --- win/Makefile.mingw | |
| +++ win/Makefile.mingw | |
| @@ -831,11 +831,11 @@ | |
| 831 | |
| 832 | ifdef FOSSIL_BUILD_SSL |
| 833 | APPTARGETS += openssl |
| 834 | endif |
| 835 | |
| 836 | $(APPNAME): $(OBJDIR)/headers $(OBJ) $(CODECHECK1) $(EXTRAOBJ) $(OBJDIR)/fossil.o $(APPTARGETS) |
| 837 | $(CODECHECK1) $(TRANS_SRC) |
| 838 | $(TCC) -o $(APPNAME) $(OBJ) $(EXTRAOBJ) $(LIB) $(OBJDIR)/fossil.o |
| 839 | |
| 840 | # This rule prevents make from using its default rules to try build |
| 841 | # an executable named "manifest" out of the file named "manifest.c" |
| @@ -984,13 +984,10 @@ | |
| 984 | |
| 985 | $(OBJDIR)/headers: Makefile |
| 986 | |
| 987 | Makefile: |
| 988 | |
| 989 | $(OBJDIR)/builtin_data.h: $(MKBUILTIN) $(EXTRA_FILES) |
| 990 | $(MKBUILTIN) $(EXTRA_FILES) >$(OBJDIR)/builtin_data.h |
| 991 | |
| 992 | $(OBJDIR)/add_.c: $(SRCDIR)/add.c $(TRANSLATE) |
| 993 | $(TRANSLATE) $(SRCDIR)/add.c >$(OBJDIR)/add_.c |
| 994 | |
| 995 | $(OBJDIR)/add.o: $(OBJDIR)/add_.c $(OBJDIR)/add.h $(SRCDIR)/config.h |
| 996 | $(XTCC) -o $(OBJDIR)/add.o -c $(OBJDIR)/add_.c |
| 997 |
| --- win/Makefile.mingw | |
| +++ win/Makefile.mingw | |
| @@ -831,11 +831,11 @@ | |
| 831 | |
| 832 | ifdef FOSSIL_BUILD_SSL |
| 833 | APPTARGETS += openssl |
| 834 | endif |
| 835 | |
| 836 | $(APPNAME): $(OBJDIR)/headers $(CODECHECK1) $(OBJ) $(EXTRAOBJ) $(OBJDIR)/fossil.o $(APPTARGETS) |
| 837 | $(CODECHECK1) $(TRANS_SRC) |
| 838 | $(TCC) -o $(APPNAME) $(OBJ) $(EXTRAOBJ) $(LIB) $(OBJDIR)/fossil.o |
| 839 | |
| 840 | # This rule prevents make from using its default rules to try build |
| 841 | # an executable named "manifest" out of the file named "manifest.c" |
| @@ -984,13 +984,10 @@ | |
| 984 | |
| 985 | $(OBJDIR)/headers: Makefile |
| 986 | |
| 987 | Makefile: |
| 988 | |
| 989 | $(OBJDIR)/add_.c: $(SRCDIR)/add.c $(TRANSLATE) |
| 990 | $(TRANSLATE) $(SRCDIR)/add.c >$(OBJDIR)/add_.c |
| 991 | |
| 992 | $(OBJDIR)/add.o: $(OBJDIR)/add_.c $(OBJDIR)/add.h $(SRCDIR)/config.h |
| 993 | $(XTCC) -o $(OBJDIR)/add.o -c $(OBJDIR)/add_.c |
| 994 |
| --- win/Makefile.mingw.mistachkin | ||
| +++ win/Makefile.mingw.mistachkin | ||
| @@ -984,13 +984,10 @@ | ||
| 984 | 984 | |
| 985 | 985 | $(OBJDIR)/headers: Makefile |
| 986 | 986 | |
| 987 | 987 | Makefile: |
| 988 | 988 | |
| 989 | -$(OBJDIR)/builtin_data.h: $(MKBUILTIN) $(EXTRA_FILES) | |
| 990 | - $(MKBUILTIN) $(EXTRA_FILES) >$(OBJDIR)/builtin_data.h | |
| 991 | - | |
| 992 | 989 | $(OBJDIR)/add_.c: $(SRCDIR)/add.c $(TRANSLATE) |
| 993 | 990 | $(TRANSLATE) $(SRCDIR)/add.c >$(OBJDIR)/add_.c |
| 994 | 991 | |
| 995 | 992 | $(OBJDIR)/add.o: $(OBJDIR)/add_.c $(OBJDIR)/add.h $(SRCDIR)/config.h |
| 996 | 993 | $(XTCC) -o $(OBJDIR)/add.o -c $(OBJDIR)/add_.c |
| 997 | 994 |
| --- win/Makefile.mingw.mistachkin | |
| +++ win/Makefile.mingw.mistachkin | |
| @@ -984,13 +984,10 @@ | |
| 984 | |
| 985 | $(OBJDIR)/headers: Makefile |
| 986 | |
| 987 | Makefile: |
| 988 | |
| 989 | $(OBJDIR)/builtin_data.h: $(MKBUILTIN) $(EXTRA_FILES) |
| 990 | $(MKBUILTIN) $(EXTRA_FILES) >$(OBJDIR)/builtin_data.h |
| 991 | |
| 992 | $(OBJDIR)/add_.c: $(SRCDIR)/add.c $(TRANSLATE) |
| 993 | $(TRANSLATE) $(SRCDIR)/add.c >$(OBJDIR)/add_.c |
| 994 | |
| 995 | $(OBJDIR)/add.o: $(OBJDIR)/add_.c $(OBJDIR)/add.h $(SRCDIR)/config.h |
| 996 | $(XTCC) -o $(OBJDIR)/add.o -c $(OBJDIR)/add_.c |
| 997 |
| --- win/Makefile.mingw.mistachkin | |
| +++ win/Makefile.mingw.mistachkin | |
| @@ -984,13 +984,10 @@ | |
| 984 | |
| 985 | $(OBJDIR)/headers: Makefile |
| 986 | |
| 987 | Makefile: |
| 988 | |
| 989 | $(OBJDIR)/add_.c: $(SRCDIR)/add.c $(TRANSLATE) |
| 990 | $(TRANSLATE) $(SRCDIR)/add.c >$(OBJDIR)/add_.c |
| 991 | |
| 992 | $(OBJDIR)/add.o: $(OBJDIR)/add_.c $(OBJDIR)/add.h $(SRCDIR)/config.h |
| 993 | $(XTCC) -o $(OBJDIR)/add.o -c $(OBJDIR)/add_.c |
| 994 |