Fossil SCM

Fix the build of builtin_data.h for separate compilation.

drh 2015-01-26 04:06 trunk
Commit ad11262cf883dbacac51a3f46e7bac64f7a12472
Parent 72759f58595c1f9…
7 files changed +1 -1 +5 -5 +11 -12 +1 -1 +1 -1 +1 -1 +1 -1
~ src/main.mk ~ src/makemake.tcl ~ src/mkbuiltin.c ~ win/Makefile.PellesCGMake ~ win/Makefile.dmc ~ win/Makefile.mingw ~ win/Makefile.msc
M src/main.mk
+1 -1
--- src/main.mk
+++ src/main.mk
@@ -503,11 +503,11 @@
503503
504504
 $(OBJDIR)/page_index.h: $(TRANS_SRC) $(OBJDIR)/mkindex
505505
 $(OBJDIR)/mkindex $(TRANS_SRC) >$@
506506
507507
 $(OBJDIR)/builtin_data.h: $(OBJDIR)/mkbuiltin $(EXTRA_FILES)
508
- $(OBJDIR)/mkbuiltin $(EXTRA_FILES) >$@
508
+ $(OBJDIR)/mkbuiltin --prefix $(SRCDIR)/ $(EXTRA_FILES) >$@
509509
510510
 $(OBJDIR)/headers: $(OBJDIR)/page_index.h $(OBJDIR)/builtin_data.h $(OBJDIR)/makeheaders $(OBJDIR)/VERSION.h
511511
 $(OBJDIR)/makeheaders $(OBJDIR)/add_.c:$(OBJDIR)/add.h \
512512
 $(OBJDIR)/allrepo_.c:$(OBJDIR)/allrepo.h \
513513
 $(OBJDIR)/attach_.c:$(OBJDIR)/attach.h \
514514
--- src/main.mk
+++ src/main.mk
@@ -503,11 +503,11 @@
503
504 $(OBJDIR)/page_index.h: $(TRANS_SRC) $(OBJDIR)/mkindex
505 $(OBJDIR)/mkindex $(TRANS_SRC) >$@
506
507 $(OBJDIR)/builtin_data.h: $(OBJDIR)/mkbuiltin $(EXTRA_FILES)
508 $(OBJDIR)/mkbuiltin $(EXTRA_FILES) >$@
509
510 $(OBJDIR)/headers: $(OBJDIR)/page_index.h $(OBJDIR)/builtin_data.h $(OBJDIR)/makeheaders $(OBJDIR)/VERSION.h
511 $(OBJDIR)/makeheaders $(OBJDIR)/add_.c:$(OBJDIR)/add.h \
512 $(OBJDIR)/allrepo_.c:$(OBJDIR)/allrepo.h \
513 $(OBJDIR)/attach_.c:$(OBJDIR)/attach.h \
514
--- src/main.mk
+++ src/main.mk
@@ -503,11 +503,11 @@
503
504 $(OBJDIR)/page_index.h: $(TRANS_SRC) $(OBJDIR)/mkindex
505 $(OBJDIR)/mkindex $(TRANS_SRC) >$@
506
507 $(OBJDIR)/builtin_data.h: $(OBJDIR)/mkbuiltin $(EXTRA_FILES)
508 $(OBJDIR)/mkbuiltin --prefix $(SRCDIR)/ $(EXTRA_FILES) >$@
509
510 $(OBJDIR)/headers: $(OBJDIR)/page_index.h $(OBJDIR)/builtin_data.h $(OBJDIR)/makeheaders $(OBJDIR)/VERSION.h
511 $(OBJDIR)/makeheaders $(OBJDIR)/add_.c:$(OBJDIR)/add.h \
512 $(OBJDIR)/allrepo_.c:$(OBJDIR)/allrepo.h \
513 $(OBJDIR)/attach_.c:$(OBJDIR)/attach.h \
514
M src/makemake.tcl
+5 -5
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -373,11 +373,11 @@
373373
 set mhargs [string map [list <<<NEXT_LINE>>> \\\n\t] $mhargs]
374374
 writeln "\$(OBJDIR)/page_index.h: \$(TRANS_SRC) \$(OBJDIR)/mkindex"
375375
 writeln "\t\$(OBJDIR)/mkindex \$(TRANS_SRC) >\$@\n"
376376
377377
 writeln "\$(OBJDIR)/builtin_data.h: \$(OBJDIR)/mkbuiltin \$(EXTRA_FILES)"
378
-writeln "\t\$(OBJDIR)/mkbuiltin \$(EXTRA_FILES) >\$@\n"
378
+writeln "\t\$(OBJDIR)/mkbuiltin --prefix \$(SRCDIR)/ \$(EXTRA_FILES) >\$@\n"
379379
380380
 writeln "\$(OBJDIR)/headers:\t\$(OBJDIR)/page_index.h \$(OBJDIR)/builtin_data.h \$(OBJDIR)/makeheaders \$(OBJDIR)/VERSION.h"
381381
 writeln "\t\$(OBJDIR)/makeheaders $mhargs"
382382
 writeln "\ttouch \$(OBJDIR)/headers"
383383
 writeln "\$(OBJDIR)/headers: Makefile"
@@ -1026,11 +1026,11 @@
10261026
 append mhargs " \\\n\t\t\$(OBJDIR)/VERSION.h"
10271027
 writeln "\$(OBJDIR)/page_index.h: \$(TRANS_SRC) \$(MKINDEX)"
10281028
 writeln "\t\$(MKINDEX) \$(TRANS_SRC) >\$@\n"
10291029
10301030
 writeln "\$(OBJDIR)/builtin_data.h:\t\$(MKBUILTIN) \$(EXTRA_FILES)"
1031
-writeln "\t\$(MKBUILTIN) \$(EXTRA_FILES) >\$@\n"
1031
+writeln "\t\$(MKBUILTIN) --prefix \$(SRCDIR)/ \$(EXTRA_FILES) >\$@\n"
10321032
10331033
 writeln "\$(OBJDIR)/headers:\t\$(OBJDIR)/page_index.h \$(OBJDIR)/builtin_data.h \$(MAKEHEADERS) \$(OBJDIR)/VERSION.h"
10341034
 writeln "\t\$(MAKEHEADERS) $mhargs"
10351035
 writeln "\techo Done >\$(OBJDIR)/headers\n"
10361036
 writeln "\$(OBJDIR)/headers: Makefile\n"
@@ -1205,11 +1205,11 @@
12051205
12061206
 page_index.h: mkindex$E $(SRC)
12071207
 +$** > $@
12081208
12091209
 builtin_data.h: mkbuiltin$E $(EXTRA_FILES)
1210
- +$** > $@
1210
+ mkbuildin$E --prefix $(SRCDIR)/ $(EXTRA_FILES) > $@
12111211
12121212
 clean:
12131213
 -del $(OBJDIR)\*.obj
12141214
 -del *.obj *_.c *.h *.map
12151215
@@ -1599,11 +1599,11 @@
15991599
16001600
 page_index.h: mkindex$E $(SRC)
16011601
 $** > $@
16021602
16031603
 builtin_data.h: mkbuiltin$E $(EXTRA_FILES)
1604
- $** > $@
1604
+ mkbuildin$E --prefix $(SRCDIR)/ $(EXTRA_FILES) > $@
16051605
16061606
 clean:
16071607
 -del $(OX)\*.obj
16081608
 -del *.obj
16091609
 -del *_.c
@@ -1831,11 +1831,11 @@
18311831
 # generate the index source, containing all web references,..
18321832
 page_index.h: $(TRANSLATEDSRC) mkindex.exe
18331833
 mkindex.exe $(TRANSLATEDSRC) >$@
18341834
18351835
 builtin_data.h: $(EXTRA_FILES) mkbuiltin.exe
1836
- mkbuiltin.exe $(EXTRA_FILES) >$@
1836
+ mkbuiltin.exe --prefix $(SRCDIR)/ $(EXTRA_FILES) >$@
18371837
18381838
 # extracting version info from manifest
18391839
 VERSION.h: version.exe ..\manifest.uuid ..\manifest ..\VERSION
18401840
 version.exe ..\manifest.uuid ..\manifest ..\VERSION >$@
18411841
18421842
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -373,11 +373,11 @@
373 set mhargs [string map [list <<<NEXT_LINE>>> \\\n\t] $mhargs]
374 writeln "\$(OBJDIR)/page_index.h: \$(TRANS_SRC) \$(OBJDIR)/mkindex"
375 writeln "\t\$(OBJDIR)/mkindex \$(TRANS_SRC) >\$@\n"
376
377 writeln "\$(OBJDIR)/builtin_data.h: \$(OBJDIR)/mkbuiltin \$(EXTRA_FILES)"
378 writeln "\t\$(OBJDIR)/mkbuiltin \$(EXTRA_FILES) >\$@\n"
379
380 writeln "\$(OBJDIR)/headers:\t\$(OBJDIR)/page_index.h \$(OBJDIR)/builtin_data.h \$(OBJDIR)/makeheaders \$(OBJDIR)/VERSION.h"
381 writeln "\t\$(OBJDIR)/makeheaders $mhargs"
382 writeln "\ttouch \$(OBJDIR)/headers"
383 writeln "\$(OBJDIR)/headers: Makefile"
@@ -1026,11 +1026,11 @@
1026 append mhargs " \\\n\t\t\$(OBJDIR)/VERSION.h"
1027 writeln "\$(OBJDIR)/page_index.h: \$(TRANS_SRC) \$(MKINDEX)"
1028 writeln "\t\$(MKINDEX) \$(TRANS_SRC) >\$@\n"
1029
1030 writeln "\$(OBJDIR)/builtin_data.h:\t\$(MKBUILTIN) \$(EXTRA_FILES)"
1031 writeln "\t\$(MKBUILTIN) \$(EXTRA_FILES) >\$@\n"
1032
1033 writeln "\$(OBJDIR)/headers:\t\$(OBJDIR)/page_index.h \$(OBJDIR)/builtin_data.h \$(MAKEHEADERS) \$(OBJDIR)/VERSION.h"
1034 writeln "\t\$(MAKEHEADERS) $mhargs"
1035 writeln "\techo Done >\$(OBJDIR)/headers\n"
1036 writeln "\$(OBJDIR)/headers: Makefile\n"
@@ -1205,11 +1205,11 @@
1205
1206 page_index.h: mkindex$E $(SRC)
1207 +$** > $@
1208
1209 builtin_data.h: mkbuiltin$E $(EXTRA_FILES)
1210 +$** > $@
1211
1212 clean:
1213 -del $(OBJDIR)\*.obj
1214 -del *.obj *_.c *.h *.map
1215
@@ -1599,11 +1599,11 @@
1599
1600 page_index.h: mkindex$E $(SRC)
1601 $** > $@
1602
1603 builtin_data.h: mkbuiltin$E $(EXTRA_FILES)
1604 $** > $@
1605
1606 clean:
1607 -del $(OX)\*.obj
1608 -del *.obj
1609 -del *_.c
@@ -1831,11 +1831,11 @@
1831 # generate the index source, containing all web references,..
1832 page_index.h: $(TRANSLATEDSRC) mkindex.exe
1833 mkindex.exe $(TRANSLATEDSRC) >$@
1834
1835 builtin_data.h: $(EXTRA_FILES) mkbuiltin.exe
1836 mkbuiltin.exe $(EXTRA_FILES) >$@
1837
1838 # extracting version info from manifest
1839 VERSION.h: version.exe ..\manifest.uuid ..\manifest ..\VERSION
1840 version.exe ..\manifest.uuid ..\manifest ..\VERSION >$@
1841
1842
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -373,11 +373,11 @@
373 set mhargs [string map [list <<<NEXT_LINE>>> \\\n\t] $mhargs]
374 writeln "\$(OBJDIR)/page_index.h: \$(TRANS_SRC) \$(OBJDIR)/mkindex"
375 writeln "\t\$(OBJDIR)/mkindex \$(TRANS_SRC) >\$@\n"
376
377 writeln "\$(OBJDIR)/builtin_data.h: \$(OBJDIR)/mkbuiltin \$(EXTRA_FILES)"
378 writeln "\t\$(OBJDIR)/mkbuiltin --prefix \$(SRCDIR)/ \$(EXTRA_FILES) >\$@\n"
379
380 writeln "\$(OBJDIR)/headers:\t\$(OBJDIR)/page_index.h \$(OBJDIR)/builtin_data.h \$(OBJDIR)/makeheaders \$(OBJDIR)/VERSION.h"
381 writeln "\t\$(OBJDIR)/makeheaders $mhargs"
382 writeln "\ttouch \$(OBJDIR)/headers"
383 writeln "\$(OBJDIR)/headers: Makefile"
@@ -1026,11 +1026,11 @@
1026 append mhargs " \\\n\t\t\$(OBJDIR)/VERSION.h"
1027 writeln "\$(OBJDIR)/page_index.h: \$(TRANS_SRC) \$(MKINDEX)"
1028 writeln "\t\$(MKINDEX) \$(TRANS_SRC) >\$@\n"
1029
1030 writeln "\$(OBJDIR)/builtin_data.h:\t\$(MKBUILTIN) \$(EXTRA_FILES)"
1031 writeln "\t\$(MKBUILTIN) --prefix \$(SRCDIR)/ \$(EXTRA_FILES) >\$@\n"
1032
1033 writeln "\$(OBJDIR)/headers:\t\$(OBJDIR)/page_index.h \$(OBJDIR)/builtin_data.h \$(MAKEHEADERS) \$(OBJDIR)/VERSION.h"
1034 writeln "\t\$(MAKEHEADERS) $mhargs"
1035 writeln "\techo Done >\$(OBJDIR)/headers\n"
1036 writeln "\$(OBJDIR)/headers: Makefile\n"
@@ -1205,11 +1205,11 @@
1205
1206 page_index.h: mkindex$E $(SRC)
1207 +$** > $@
1208
1209 builtin_data.h: mkbuiltin$E $(EXTRA_FILES)
1210 mkbuildin$E --prefix $(SRCDIR)/ $(EXTRA_FILES) > $@
1211
1212 clean:
1213 -del $(OBJDIR)\*.obj
1214 -del *.obj *_.c *.h *.map
1215
@@ -1599,11 +1599,11 @@
1599
1600 page_index.h: mkindex$E $(SRC)
1601 $** > $@
1602
1603 builtin_data.h: mkbuiltin$E $(EXTRA_FILES)
1604 mkbuildin$E --prefix $(SRCDIR)/ $(EXTRA_FILES) > $@
1605
1606 clean:
1607 -del $(OX)\*.obj
1608 -del *.obj
1609 -del *_.c
@@ -1831,11 +1831,11 @@
1831 # generate the index source, containing all web references,..
1832 page_index.h: $(TRANSLATEDSRC) mkindex.exe
1833 mkindex.exe $(TRANSLATEDSRC) >$@
1834
1835 builtin_data.h: $(EXTRA_FILES) mkbuiltin.exe
1836 mkbuiltin.exe --prefix $(SRCDIR)/ $(EXTRA_FILES) >$@
1837
1838 # extracting version info from manifest
1839 VERSION.h: version.exe ..\manifest.uuid ..\manifest ..\VERSION
1840 version.exe ..\manifest.uuid ..\manifest ..\VERSION >$@
1841
1842
M src/mkbuiltin.c
+11 -12
--- src/mkbuiltin.c
+++ src/mkbuiltin.c
@@ -80,15 +80,22 @@
8080
8181
 int main(int argc, char **argv){
8282
 int i, sz;
8383
 int j, n;
8484
 Resource *aRes;
85
- int nRes = argc-1;
85
+ int nRes;
8686
 unsigned char *pData;
8787
 int nErr = 0;
8888
 int nSkip;
89
+ int nPrefix = 0;
8990
91
+ if( argc>3 && strcmp(argv[1],"--prefix")==0 ){
92
+ nPrefix = (int)strlen(argv[2]);
93
+ argc -= 2;
94
+ argv += 2;
95
+ }
96
+ nRes = argc - 1;
9097
 aRes = malloc( nRes*sizeof(aRes[0]) );
9198
 if( aRes==0 ){
9299
 fprintf(stderr, "malloc failed\n");
93100
 return 1;
94101
 }
@@ -141,25 +148,17 @@
141148
 printf(" int nByte;\n");
142149
 printf("};\n");
143150
 printf("static const BuiltinFileTable aBuiltinFiles[] = {\n");
144151
 for(i=0; i<nRes; i++){
145152
 const char *z = aRes[i].zName;
146
- const char *zTail;
147
- int nSlash = 0;
148
- zTail = z;
149
- while( z && z[0] ){
150
- if( z[0]=='/' || z[0]=='\\' ){
151
- nSlash++;
152
- if( nSlash<=2 || z[-1]=='.' ) zTail = &z[1];
153
- }
154
- z++;
155
- }
156
- aRes[i].zName = zTail;
153
+ if( strlen(z)>=nPrefix ) z += nPrefix;
154
+ while( z[0]=='.' || z[0]=='/' ){ z++; }
155
+ aRes[i].zName = z;
157156
 }
158157
 qsort(aRes, nRes, sizeof(aRes[0]), compareResource);
159158
 for(i=0; i<nRes; i++){
160159
 printf(" { \"%s\", bidata%d, %d },\n",
161160
 aRes[i].zName, aRes[i].idx, aRes[i].nByte);
162161
 }
163162
 printf("};\n");
164163
 return nErr;
165164
 }
166165
--- src/mkbuiltin.c
+++ src/mkbuiltin.c
@@ -80,15 +80,22 @@
80
81 int main(int argc, char **argv){
82 int i, sz;
83 int j, n;
84 Resource *aRes;
85 int nRes = argc-1;
86 unsigned char *pData;
87 int nErr = 0;
88 int nSkip;
 
89
 
 
 
 
 
 
90 aRes = malloc( nRes*sizeof(aRes[0]) );
91 if( aRes==0 ){
92 fprintf(stderr, "malloc failed\n");
93 return 1;
94 }
@@ -141,25 +148,17 @@
141 printf(" int nByte;\n");
142 printf("};\n");
143 printf("static const BuiltinFileTable aBuiltinFiles[] = {\n");
144 for(i=0; i<nRes; i++){
145 const char *z = aRes[i].zName;
146 const char *zTail;
147 int nSlash = 0;
148 zTail = z;
149 while( z && z[0] ){
150 if( z[0]=='/' || z[0]=='\\' ){
151 nSlash++;
152 if( nSlash<=2 || z[-1]=='.' ) zTail = &z[1];
153 }
154 z++;
155 }
156 aRes[i].zName = zTail;
157 }
158 qsort(aRes, nRes, sizeof(aRes[0]), compareResource);
159 for(i=0; i<nRes; i++){
160 printf(" { \"%s\", bidata%d, %d },\n",
161 aRes[i].zName, aRes[i].idx, aRes[i].nByte);
162 }
163 printf("};\n");
164 return nErr;
165 }
166
--- src/mkbuiltin.c
+++ src/mkbuiltin.c
@@ -80,15 +80,22 @@
80
81 int main(int argc, char **argv){
82 int i, sz;
83 int j, n;
84 Resource *aRes;
85 int nRes;
86 unsigned char *pData;
87 int nErr = 0;
88 int nSkip;
89 int nPrefix = 0;
90
91 if( argc>3 && strcmp(argv[1],"--prefix")==0 ){
92 nPrefix = (int)strlen(argv[2]);
93 argc -= 2;
94 argv += 2;
95 }
96 nRes = argc - 1;
97 aRes = malloc( nRes*sizeof(aRes[0]) );
98 if( aRes==0 ){
99 fprintf(stderr, "malloc failed\n");
100 return 1;
101 }
@@ -141,25 +148,17 @@
148 printf(" int nByte;\n");
149 printf("};\n");
150 printf("static const BuiltinFileTable aBuiltinFiles[] = {\n");
151 for(i=0; i<nRes; i++){
152 const char *z = aRes[i].zName;
153 if( strlen(z)>=nPrefix ) z += nPrefix;
154 while( z[0]=='.' || z[0]=='/' ){ z++; }
155 aRes[i].zName = z;
 
 
 
 
 
 
 
 
156 }
157 qsort(aRes, nRes, sizeof(aRes[0]), compareResource);
158 for(i=0; i<nRes; i++){
159 printf(" { \"%s\", bidata%d, %d },\n",
160 aRes[i].zName, aRes[i].idx, aRes[i].nByte);
161 }
162 printf("};\n");
163 return nErr;
164 }
165
M win/Makefile.PellesCGMake
+1 -1
--- win/Makefile.PellesCGMake
+++ win/Makefile.PellesCGMake
@@ -141,11 +141,11 @@
141141
 # generate the index source, containing all web references,..
142142
 page_index.h: $(TRANSLATEDSRC) mkindex.exe
143143
 mkindex.exe $(TRANSLATEDSRC) >$@
144144
145145
 builtin_data.h: $(EXTRA_FILES) mkbuiltin.exe
146
- mkbuiltin.exe $(EXTRA_FILES) >$@
146
+ mkbuiltin.exe --prefix $(SRCDIR)/ $(EXTRA_FILES) >$@
147147
148148
 # extracting version info from manifest
149149
 VERSION.h: version.exe ..\manifest.uuid ..\manifest ..\VERSION
150150
 version.exe ..\manifest.uuid ..\manifest ..\VERSION >$@
151151
152152
--- win/Makefile.PellesCGMake
+++ win/Makefile.PellesCGMake
@@ -141,11 +141,11 @@
141 # generate the index source, containing all web references,..
142 page_index.h: $(TRANSLATEDSRC) mkindex.exe
143 mkindex.exe $(TRANSLATEDSRC) >$@
144
145 builtin_data.h: $(EXTRA_FILES) mkbuiltin.exe
146 mkbuiltin.exe $(EXTRA_FILES) >$@
147
148 # extracting version info from manifest
149 VERSION.h: version.exe ..\manifest.uuid ..\manifest ..\VERSION
150 version.exe ..\manifest.uuid ..\manifest ..\VERSION >$@
151
152
--- win/Makefile.PellesCGMake
+++ win/Makefile.PellesCGMake
@@ -141,11 +141,11 @@
141 # generate the index source, containing all web references,..
142 page_index.h: $(TRANSLATEDSRC) mkindex.exe
143 mkindex.exe $(TRANSLATEDSRC) >$@
144
145 builtin_data.h: $(EXTRA_FILES) mkbuiltin.exe
146 mkbuiltin.exe --prefix $(SRCDIR)/ $(EXTRA_FILES) >$@
147
148 # extracting version info from manifest
149 VERSION.h: version.exe ..\manifest.uuid ..\manifest ..\VERSION
150 version.exe ..\manifest.uuid ..\manifest ..\VERSION >$@
151
152
M win/Makefile.dmc
+1 -1
--- win/Makefile.dmc
+++ win/Makefile.dmc
@@ -96,11 +96,11 @@
9696
9797
 page_index.h: mkindex$E $(SRC)
9898
 +$** > $@
9999
100100
 builtin_data.h: mkbuiltin$E $(EXTRA_FILES)
101
- +$** > $@
101
+ mkbuildin$E --prefix $(SRCDIR)/ $(EXTRA_FILES) > $@
102102
103103
 clean:
104104
 -del $(OBJDIR)\*.obj
105105
 -del *.obj *_.c *.h *.map
106106
107107
--- win/Makefile.dmc
+++ win/Makefile.dmc
@@ -96,11 +96,11 @@
96
97 page_index.h: mkindex$E $(SRC)
98 +$** > $@
99
100 builtin_data.h: mkbuiltin$E $(EXTRA_FILES)
101 +$** > $@
102
103 clean:
104 -del $(OBJDIR)\*.obj
105 -del *.obj *_.c *.h *.map
106
107
--- win/Makefile.dmc
+++ win/Makefile.dmc
@@ -96,11 +96,11 @@
96
97 page_index.h: mkindex$E $(SRC)
98 +$** > $@
99
100 builtin_data.h: mkbuiltin$E $(EXTRA_FILES)
101 mkbuildin$E --prefix $(SRCDIR)/ $(EXTRA_FILES) > $@
102
103 clean:
104 -del $(OBJDIR)\*.obj
105 -del *.obj *_.c *.h *.map
106
107
M win/Makefile.mingw
+1 -1
--- win/Makefile.mingw
+++ win/Makefile.mingw
@@ -940,11 +940,11 @@
940940
941941
 $(OBJDIR)/page_index.h: $(TRANS_SRC) $(MKINDEX)
942942
 $(MKINDEX) $(TRANS_SRC) >$@
943943
944944
 $(OBJDIR)/builtin_data.h: $(MKBUILTIN) $(EXTRA_FILES)
945
- $(MKBUILTIN) $(EXTRA_FILES) >$@
945
+ $(MKBUILTIN) --prefix $(SRCDIR)/ $(EXTRA_FILES) >$@
946946
947947
 $(OBJDIR)/headers: $(OBJDIR)/page_index.h $(OBJDIR)/builtin_data.h $(MAKEHEADERS) $(OBJDIR)/VERSION.h
948948
 $(MAKEHEADERS) $(OBJDIR)/add_.c:$(OBJDIR)/add.h \
949949
 $(OBJDIR)/allrepo_.c:$(OBJDIR)/allrepo.h \
950950
 $(OBJDIR)/attach_.c:$(OBJDIR)/attach.h \
951951
--- win/Makefile.mingw
+++ win/Makefile.mingw
@@ -940,11 +940,11 @@
940
941 $(OBJDIR)/page_index.h: $(TRANS_SRC) $(MKINDEX)
942 $(MKINDEX) $(TRANS_SRC) >$@
943
944 $(OBJDIR)/builtin_data.h: $(MKBUILTIN) $(EXTRA_FILES)
945 $(MKBUILTIN) $(EXTRA_FILES) >$@
946
947 $(OBJDIR)/headers: $(OBJDIR)/page_index.h $(OBJDIR)/builtin_data.h $(MAKEHEADERS) $(OBJDIR)/VERSION.h
948 $(MAKEHEADERS) $(OBJDIR)/add_.c:$(OBJDIR)/add.h \
949 $(OBJDIR)/allrepo_.c:$(OBJDIR)/allrepo.h \
950 $(OBJDIR)/attach_.c:$(OBJDIR)/attach.h \
951
--- win/Makefile.mingw
+++ win/Makefile.mingw
@@ -940,11 +940,11 @@
940
941 $(OBJDIR)/page_index.h: $(TRANS_SRC) $(MKINDEX)
942 $(MKINDEX) $(TRANS_SRC) >$@
943
944 $(OBJDIR)/builtin_data.h: $(MKBUILTIN) $(EXTRA_FILES)
945 $(MKBUILTIN) --prefix $(SRCDIR)/ $(EXTRA_FILES) >$@
946
947 $(OBJDIR)/headers: $(OBJDIR)/page_index.h $(OBJDIR)/builtin_data.h $(MAKEHEADERS) $(OBJDIR)/VERSION.h
948 $(MAKEHEADERS) $(OBJDIR)/add_.c:$(OBJDIR)/add.h \
949 $(OBJDIR)/allrepo_.c:$(OBJDIR)/allrepo.h \
950 $(OBJDIR)/attach_.c:$(OBJDIR)/attach.h \
951
M win/Makefile.msc
+1 -1
--- win/Makefile.msc
+++ win/Makefile.msc
@@ -699,11 +699,11 @@
699699
700700
 page_index.h: mkindex$E $(SRC)
701701
 $** > $@
702702
703703
 builtin_data.h: mkbuiltin$E $(EXTRA_FILES)
704
- $** > $@
704
+ mkbuildin$E --prefix $(SRCDIR)/ $(EXTRA_FILES) > $@
705705
706706
 clean:
707707
 -del $(OX)\*.obj
708708
 -del *.obj
709709
 -del *_.c
710710
--- win/Makefile.msc
+++ win/Makefile.msc
@@ -699,11 +699,11 @@
699
700 page_index.h: mkindex$E $(SRC)
701 $** > $@
702
703 builtin_data.h: mkbuiltin$E $(EXTRA_FILES)
704 $** > $@
705
706 clean:
707 -del $(OX)\*.obj
708 -del *.obj
709 -del *_.c
710
--- win/Makefile.msc
+++ win/Makefile.msc
@@ -699,11 +699,11 @@
699
700 page_index.h: mkindex$E $(SRC)
701 $** > $@
702
703 builtin_data.h: mkbuiltin$E $(EXTRA_FILES)
704 mkbuildin$E --prefix $(SRCDIR)/ $(EXTRA_FILES) > $@
705
706 clean:
707 -del $(OX)\*.obj
708 -del *.obj
709 -del *_.c
710

Keyboard Shortcuts

Open search /
Next entry (timeline) j
Previous entry (timeline) k
Open focused entry Enter
Show this help ?
Toggle theme Top nav button