Fossil SCM
Moved the user-related JSON handlers into their own file.
Commit
6e18fc2ecc05830fbe079fb7d3003a358698d46c
Parent
23a35ba1cccad37…
7 files changed
+2
-96
+33
+12
-2
+5
-2
+11
-4
+12
-2
+11
-3
+2
-96
| --- src/json.c | ||
| +++ src/json.c | ||
| @@ -2092,16 +2092,10 @@ | ||
| 2092 | 2092 | #undef SETBUF |
| 2093 | 2093 | } |
| 2094 | 2094 | |
| 2095 | 2095 | |
| 2096 | 2096 | |
| 2097 | -static cson_value * json_user_list(); | |
| 2098 | -static cson_value * json_user_get(); | |
| 2099 | -#if 0 | |
| 2100 | -static cson_value * json_user_create(); | |
| 2101 | -static cson_value * json_user_edit(); | |
| 2102 | -#endif | |
| 2103 | 2097 | |
| 2104 | 2098 | /* |
| 2105 | 2099 | ** Creates a comma-separated list of command names |
| 2106 | 2100 | ** taken from zPages. zPages must be an array of objects |
| 2107 | 2101 | ** whose final entry MUST have a NULL name value or results |
| @@ -2122,22 +2116,10 @@ | ||
| 2122 | 2116 | } |
| 2123 | 2117 | } |
| 2124 | 2118 | return i; |
| 2125 | 2119 | } |
| 2126 | 2120 | |
| 2127 | -/* | |
| 2128 | -** Mapping of /json/user/XXX commands/paths to callbacks. | |
| 2129 | -*/ | |
| 2130 | -static const JsonPageDef JsonPageDefs_User[] = { | |
| 2131 | -{"create", json_page_nyi, 1}, | |
| 2132 | -{"edit", json_page_nyi, 1}, | |
| 2133 | -{"get", json_user_get, 0}, | |
| 2134 | -{"list", json_user_list, 0}, | |
| 2135 | -/* Last entry MUST have a NULL name. */ | |
| 2136 | -{NULL,NULL,0} | |
| 2137 | -}; | |
| 2138 | - | |
| 2139 | 2121 | |
| 2140 | 2122 | cson_value * json_page_dispatch_helper(JsonPageDef const * pages){ |
| 2141 | 2123 | JsonPageDef const * def; |
| 2142 | 2124 | char const * cmd = json_command_arg(1+g.json.dispatchDepth); |
| 2143 | 2125 | assert( NULL != pages ); |
| @@ -2159,18 +2141,10 @@ | ||
| 2159 | 2141 | ++g.json.dispatchDepth; |
| 2160 | 2142 | return (*def->func)(); |
| 2161 | 2143 | } |
| 2162 | 2144 | } |
| 2163 | 2145 | |
| 2164 | -/* | |
| 2165 | -** Implements the /json/user family of pages/commands. | |
| 2166 | -** | |
| 2167 | -*/ | |
| 2168 | -static cson_value * json_page_user(){ | |
| 2169 | - return json_page_dispatch_helper(&JsonPageDefs_User[0]); | |
| 2170 | -} | |
| 2171 | - | |
| 2172 | 2146 | |
| 2173 | 2147 | /* |
| 2174 | 2148 | ** Impl of /json/rebuild. Requires admin previleges. |
| 2175 | 2149 | */ |
| 2176 | 2150 | static cson_value * json_page_rebuild(){ |
| @@ -2193,80 +2167,10 @@ | ||
| 2193 | 2167 | rebuild_db(0, 0, 0); |
| 2194 | 2168 | db_end_transaction(0); |
| 2195 | 2169 | return NULL; |
| 2196 | 2170 | } |
| 2197 | 2171 | } |
| 2198 | - | |
| 2199 | -/* | |
| 2200 | -** Impl of /json/user/list. Requires admin rights. | |
| 2201 | -*/ | |
| 2202 | -static cson_value * json_user_list(){ | |
| 2203 | - cson_value * payV = NULL; | |
| 2204 | - Stmt q; | |
| 2205 | - if(!g.perm.Admin){ | |
| 2206 | - g.json.resultCode = FSL_JSON_E_DENIED; | |
| 2207 | - return NULL; | |
| 2208 | - } | |
| 2209 | - db_prepare(&q,"SELECT uid AS uid," | |
| 2210 | - " login AS name," | |
| 2211 | - " cap AS capabilities," | |
| 2212 | - " info AS info," | |
| 2213 | - " mtime AS mtime" | |
| 2214 | - " FROM user ORDER BY login"); | |
| 2215 | - payV = json_stmt_to_array_of_obj(&q, NULL); | |
| 2216 | - db_finalize(&q); | |
| 2217 | - if(NULL == payV){ | |
| 2218 | - json_set_err(FSL_JSON_E_UNKNOWN, | |
| 2219 | - "Could not convert user list to JSON."); | |
| 2220 | - } | |
| 2221 | - return payV; | |
| 2222 | -} | |
| 2223 | - | |
| 2224 | -/* | |
| 2225 | -** Impl of /json/user/get. Requires admin rights. | |
| 2226 | -*/ | |
| 2227 | -static cson_value * json_user_get(){ | |
| 2228 | - cson_value * payV = NULL; | |
| 2229 | - char const * pUser = NULL; | |
| 2230 | - Stmt q; | |
| 2231 | - if(!g.perm.Admin){ | |
| 2232 | - json_set_err(FSL_JSON_E_DENIED, | |
| 2233 | - "Requires 'a' privileges."); | |
| 2234 | - return NULL; | |
| 2235 | - } | |
| 2236 | - pUser = json_command_arg(g.json.dispatchDepth+1); | |
| 2237 | - if( g.isHTTP && (!pUser || !*pUser) ){ | |
| 2238 | - pUser = json_getenv_cstr("name") | |
| 2239 | - /* ACHTUNG: fossil apparently internally sets name=user/get/XYZ | |
| 2240 | - if we pass the name as part of the path, which is why we check | |
| 2241 | - with json_command_path() before trying to get("name"). | |
| 2242 | - */; | |
| 2243 | - } | |
| 2244 | - if(!pUser || !*pUser){ | |
| 2245 | - json_set_err(FSL_JSON_E_MISSING_ARGS,"Missing 'name' property."); | |
| 2246 | - return NULL; | |
| 2247 | - } | |
| 2248 | - db_prepare(&q,"SELECT uid AS uid," | |
| 2249 | - " login AS name," | |
| 2250 | - " cap AS capabilities," | |
| 2251 | - " info AS info," | |
| 2252 | - " mtime AS mtime" | |
| 2253 | - " FROM user" | |
| 2254 | - " WHERE login=%Q", | |
| 2255 | - pUser); | |
| 2256 | - if( (SQLITE_ROW == db_step(&q)) ){ | |
| 2257 | - payV = cson_sqlite3_row_to_object(q.pStmt); | |
| 2258 | - if(!payV){ | |
| 2259 | - json_set_err(FSL_JSON_E_UNKNOWN,"Could not convert user row to JSON."); | |
| 2260 | - } | |
| 2261 | - }else{ | |
| 2262 | - json_set_err(FSL_JSON_E_RESOURCE_NOT_FOUND,"User not found."); | |
| 2263 | - } | |
| 2264 | - db_finalize(&q); | |
| 2265 | - return payV; | |
| 2266 | -} | |
| 2267 | - | |
| 2268 | 2172 | |
| 2269 | 2173 | /* |
| 2270 | 2174 | ** Impl of /json/g. Requires admin/setup rights. |
| 2271 | 2175 | */ |
| 2272 | 2176 | static cson_value * json_page_g(){ |
| @@ -2294,10 +2198,12 @@ | ||
| 2294 | 2198 | cson_value * json_page_query(); |
| 2295 | 2199 | /* Impl in json_report.c. */ |
| 2296 | 2200 | cson_value * json_page_report(); |
| 2297 | 2201 | /* Impl in json_tag.c. */ |
| 2298 | 2202 | cson_value * json_page_tag(); |
| 2203 | +/* Impl in json_user.c. */ | |
| 2204 | +cson_value * json_page_user(); | |
| 2299 | 2205 | |
| 2300 | 2206 | /* |
| 2301 | 2207 | ** Mapping of names to JSON pages/commands. Each name is a subpath of |
| 2302 | 2208 | ** /json (in CGI mode) or a subcommand of the json command in CLI mode |
| 2303 | 2209 | */ |
| 2304 | 2210 | |
| 2305 | 2211 | ADDED src/json_user.c |
| --- src/json.c | |
| +++ src/json.c | |
| @@ -2092,16 +2092,10 @@ | |
| 2092 | #undef SETBUF |
| 2093 | } |
| 2094 | |
| 2095 | |
| 2096 | |
| 2097 | static cson_value * json_user_list(); |
| 2098 | static cson_value * json_user_get(); |
| 2099 | #if 0 |
| 2100 | static cson_value * json_user_create(); |
| 2101 | static cson_value * json_user_edit(); |
| 2102 | #endif |
| 2103 | |
| 2104 | /* |
| 2105 | ** Creates a comma-separated list of command names |
| 2106 | ** taken from zPages. zPages must be an array of objects |
| 2107 | ** whose final entry MUST have a NULL name value or results |
| @@ -2122,22 +2116,10 @@ | |
| 2122 | } |
| 2123 | } |
| 2124 | return i; |
| 2125 | } |
| 2126 | |
| 2127 | /* |
| 2128 | ** Mapping of /json/user/XXX commands/paths to callbacks. |
| 2129 | */ |
| 2130 | static const JsonPageDef JsonPageDefs_User[] = { |
| 2131 | {"create", json_page_nyi, 1}, |
| 2132 | {"edit", json_page_nyi, 1}, |
| 2133 | {"get", json_user_get, 0}, |
| 2134 | {"list", json_user_list, 0}, |
| 2135 | /* Last entry MUST have a NULL name. */ |
| 2136 | {NULL,NULL,0} |
| 2137 | }; |
| 2138 | |
| 2139 | |
| 2140 | cson_value * json_page_dispatch_helper(JsonPageDef const * pages){ |
| 2141 | JsonPageDef const * def; |
| 2142 | char const * cmd = json_command_arg(1+g.json.dispatchDepth); |
| 2143 | assert( NULL != pages ); |
| @@ -2159,18 +2141,10 @@ | |
| 2159 | ++g.json.dispatchDepth; |
| 2160 | return (*def->func)(); |
| 2161 | } |
| 2162 | } |
| 2163 | |
| 2164 | /* |
| 2165 | ** Implements the /json/user family of pages/commands. |
| 2166 | ** |
| 2167 | */ |
| 2168 | static cson_value * json_page_user(){ |
| 2169 | return json_page_dispatch_helper(&JsonPageDefs_User[0]); |
| 2170 | } |
| 2171 | |
| 2172 | |
| 2173 | /* |
| 2174 | ** Impl of /json/rebuild. Requires admin previleges. |
| 2175 | */ |
| 2176 | static cson_value * json_page_rebuild(){ |
| @@ -2193,80 +2167,10 @@ | |
| 2193 | rebuild_db(0, 0, 0); |
| 2194 | db_end_transaction(0); |
| 2195 | return NULL; |
| 2196 | } |
| 2197 | } |
| 2198 | |
| 2199 | /* |
| 2200 | ** Impl of /json/user/list. Requires admin rights. |
| 2201 | */ |
| 2202 | static cson_value * json_user_list(){ |
| 2203 | cson_value * payV = NULL; |
| 2204 | Stmt q; |
| 2205 | if(!g.perm.Admin){ |
| 2206 | g.json.resultCode = FSL_JSON_E_DENIED; |
| 2207 | return NULL; |
| 2208 | } |
| 2209 | db_prepare(&q,"SELECT uid AS uid," |
| 2210 | " login AS name," |
| 2211 | " cap AS capabilities," |
| 2212 | " info AS info," |
| 2213 | " mtime AS mtime" |
| 2214 | " FROM user ORDER BY login"); |
| 2215 | payV = json_stmt_to_array_of_obj(&q, NULL); |
| 2216 | db_finalize(&q); |
| 2217 | if(NULL == payV){ |
| 2218 | json_set_err(FSL_JSON_E_UNKNOWN, |
| 2219 | "Could not convert user list to JSON."); |
| 2220 | } |
| 2221 | return payV; |
| 2222 | } |
| 2223 | |
| 2224 | /* |
| 2225 | ** Impl of /json/user/get. Requires admin rights. |
| 2226 | */ |
| 2227 | static cson_value * json_user_get(){ |
| 2228 | cson_value * payV = NULL; |
| 2229 | char const * pUser = NULL; |
| 2230 | Stmt q; |
| 2231 | if(!g.perm.Admin){ |
| 2232 | json_set_err(FSL_JSON_E_DENIED, |
| 2233 | "Requires 'a' privileges."); |
| 2234 | return NULL; |
| 2235 | } |
| 2236 | pUser = json_command_arg(g.json.dispatchDepth+1); |
| 2237 | if( g.isHTTP && (!pUser || !*pUser) ){ |
| 2238 | pUser = json_getenv_cstr("name") |
| 2239 | /* ACHTUNG: fossil apparently internally sets name=user/get/XYZ |
| 2240 | if we pass the name as part of the path, which is why we check |
| 2241 | with json_command_path() before trying to get("name"). |
| 2242 | */; |
| 2243 | } |
| 2244 | if(!pUser || !*pUser){ |
| 2245 | json_set_err(FSL_JSON_E_MISSING_ARGS,"Missing 'name' property."); |
| 2246 | return NULL; |
| 2247 | } |
| 2248 | db_prepare(&q,"SELECT uid AS uid," |
| 2249 | " login AS name," |
| 2250 | " cap AS capabilities," |
| 2251 | " info AS info," |
| 2252 | " mtime AS mtime" |
| 2253 | " FROM user" |
| 2254 | " WHERE login=%Q", |
| 2255 | pUser); |
| 2256 | if( (SQLITE_ROW == db_step(&q)) ){ |
| 2257 | payV = cson_sqlite3_row_to_object(q.pStmt); |
| 2258 | if(!payV){ |
| 2259 | json_set_err(FSL_JSON_E_UNKNOWN,"Could not convert user row to JSON."); |
| 2260 | } |
| 2261 | }else{ |
| 2262 | json_set_err(FSL_JSON_E_RESOURCE_NOT_FOUND,"User not found."); |
| 2263 | } |
| 2264 | db_finalize(&q); |
| 2265 | return payV; |
| 2266 | } |
| 2267 | |
| 2268 | |
| 2269 | /* |
| 2270 | ** Impl of /json/g. Requires admin/setup rights. |
| 2271 | */ |
| 2272 | static cson_value * json_page_g(){ |
| @@ -2294,10 +2198,12 @@ | |
| 2294 | cson_value * json_page_query(); |
| 2295 | /* Impl in json_report.c. */ |
| 2296 | cson_value * json_page_report(); |
| 2297 | /* Impl in json_tag.c. */ |
| 2298 | cson_value * json_page_tag(); |
| 2299 | |
| 2300 | /* |
| 2301 | ** Mapping of names to JSON pages/commands. Each name is a subpath of |
| 2302 | ** /json (in CGI mode) or a subcommand of the json command in CLI mode |
| 2303 | */ |
| 2304 | |
| 2305 | DDED src/json_user.c |
| --- src/json.c | |
| +++ src/json.c | |
| @@ -2092,16 +2092,10 @@ | |
| 2092 | #undef SETBUF |
| 2093 | } |
| 2094 | |
| 2095 | |
| 2096 | |
| 2097 | |
| 2098 | /* |
| 2099 | ** Creates a comma-separated list of command names |
| 2100 | ** taken from zPages. zPages must be an array of objects |
| 2101 | ** whose final entry MUST have a NULL name value or results |
| @@ -2122,22 +2116,10 @@ | |
| 2116 | } |
| 2117 | } |
| 2118 | return i; |
| 2119 | } |
| 2120 | |
| 2121 | |
| 2122 | cson_value * json_page_dispatch_helper(JsonPageDef const * pages){ |
| 2123 | JsonPageDef const * def; |
| 2124 | char const * cmd = json_command_arg(1+g.json.dispatchDepth); |
| 2125 | assert( NULL != pages ); |
| @@ -2159,18 +2141,10 @@ | |
| 2141 | ++g.json.dispatchDepth; |
| 2142 | return (*def->func)(); |
| 2143 | } |
| 2144 | } |
| 2145 | |
| 2146 | |
| 2147 | /* |
| 2148 | ** Impl of /json/rebuild. Requires admin previleges. |
| 2149 | */ |
| 2150 | static cson_value * json_page_rebuild(){ |
| @@ -2193,80 +2167,10 @@ | |
| 2167 | rebuild_db(0, 0, 0); |
| 2168 | db_end_transaction(0); |
| 2169 | return NULL; |
| 2170 | } |
| 2171 | } |
| 2172 | |
| 2173 | /* |
| 2174 | ** Impl of /json/g. Requires admin/setup rights. |
| 2175 | */ |
| 2176 | static cson_value * json_page_g(){ |
| @@ -2294,10 +2198,12 @@ | |
| 2198 | cson_value * json_page_query(); |
| 2199 | /* Impl in json_report.c. */ |
| 2200 | cson_value * json_page_report(); |
| 2201 | /* Impl in json_tag.c. */ |
| 2202 | cson_value * json_page_tag(); |
| 2203 | /* Impl in json_user.c. */ |
| 2204 | cson_value * json_page_user(); |
| 2205 | |
| 2206 | /* |
| 2207 | ** Mapping of names to JSON pages/commands. Each name is a subpath of |
| 2208 | ** /json (in CGI mode) or a subcommand of the json command in CLI mode |
| 2209 | */ |
| 2210 | |
| 2211 | DDED src/json_user.c |
+33
| --- a/src/json_user.c | ||
| +++ b/src/json_user.c | ||
| @@ -0,0 +1,33 @@ | ||
| 1 | +set_err(FSL_JSON_E_DENIED, | |
| 2 | + "Requires 'a' or son_find_option_cstr2("namto json_load_user_by_name(), but expects a user ID. Returns | |
| 3 | +** NULL if noL if no user founson_value * tmpVcommand_arg( g.isHTTP && (!pUser || !*pUser) ){ | |
| 4 | + pUser = json_getenv_cstr("name") | |
| 5 | + /* ACHTUNG: fossil apparently internally sets name=user/get/XYZ | |
| 6 | +if we pass the name as part of the path, which is why we check | |
| 7 | + with json_command_path() before trying to get("name"). | |
| 8 | + */; | |
| 9 | + }) st(LK,NULL,NULL); password"); | |
| 10 | + PROP("in#if 0create(); | |
| 11 | + | |
| 12 | +#endifcreate", json_page_nyi, 0},e_find_option_cstr2("_find_option_cstr2(" !g.perm.Setup)(c) jsos 'a' or son_find_option_cstr2("namto json_load_user_by_name(), but expec !g.perm.Setup)(c) !g.perm.Setup)(c) ge with json_command_path(ge. | |
| 13 | + */; | |
| 14 | + }) st(LK,NULL,NULL); ption_cstr2("namto json_load_user_by_name(), but expec !g.perm.Setup)(c1 !g.perm.Setup)(c) _find_1)(c) json_set_}_find_option_cstr2("){_find_option_cstr2("namto json_load_user_by_name(), but expects a !g.perm.Setup)(c) json_set_err(FSL_JSON_E_DENIED, | |
| 15 | + } char * zPWHash = NULL++gotFields !g.perm.Setup)(c) json_set_err(FSL_JSON_E_DENIED, | |
| 16 | + "Requires 'a' or son_find_option_cstr2("namto json_load_user_by_name(), but expects a user ID. Returns | |
| 17 | +** NULL if noL if no user founson_value * tmpVcommand_arg( g.isHTTP && (!pUser || !*pUser) ){ | |
| 18 | + pUser!g.perm.Setup)(c) turns | |
| 19 | +** NULL "namto json_load_user_by_name(), but expects a user ID. Returns | |
| 20 | +** NULL if noL if no user founson_value * tmpVcommname") | |
| 21 | + /* ACHTUNG: fossil apparently iconsget/XYZ | |
| 22 | +if we pass the name as part of the path, which is why we check | |
| 23 | + with jion_cstr2("namto json_load_user_by_name(), but expec !g.perm.Setup)(c) !g.perm.Setup)(c) ge with json_command_path(ge. | |
| 24 | + */; | |
| 25 | + }) st(LK,NULL,NULL); ption_cstr2("namto json_load_user_by_name(), but expec !g.perm.Setup)(c) !g.perm.Setup)(c) _find_option_cperm.Setup)(c) json_set_err(FSL_JSON_E_DENIED, | |
| 26 | + "Requires 'a' or son_find_option_cstr2("namto json_load_user_by_nnblob_append(& | |
| 27 | + | |
| 28 | + /* | |
| 29 | +e(), but expec !g.perm.Setup)(c) turns | |
| 30 | +** NULL if noL if no u!s f user founson_value * tmACHthat logic. | |
| 31 | + */.perm.Setup ",-1 );!g.perm.Setup(c) _find_opet_err(FSL_N_E_DENIED, | |
| 32 | + "Requiet_err(FSL_JSON_E_DENIED, | |
| 33 | + "Req |
| --- a/src/json_user.c | |
| +++ b/src/json_user.c | |
| @@ -0,0 +1,33 @@ | |
| --- a/src/json_user.c | |
| +++ b/src/json_user.c | |
| @@ -0,0 +1,33 @@ | |
| 1 | set_err(FSL_JSON_E_DENIED, |
| 2 | "Requires 'a' or son_find_option_cstr2("namto json_load_user_by_name(), but expects a user ID. Returns |
| 3 | ** NULL if noL if no user founson_value * tmpVcommand_arg( g.isHTTP && (!pUser || !*pUser) ){ |
| 4 | pUser = json_getenv_cstr("name") |
| 5 | /* ACHTUNG: fossil apparently internally sets name=user/get/XYZ |
| 6 | if we pass the name as part of the path, which is why we check |
| 7 | with json_command_path() before trying to get("name"). |
| 8 | */; |
| 9 | }) st(LK,NULL,NULL); password"); |
| 10 | PROP("in#if 0create(); |
| 11 | |
| 12 | #endifcreate", json_page_nyi, 0},e_find_option_cstr2("_find_option_cstr2(" !g.perm.Setup)(c) jsos 'a' or son_find_option_cstr2("namto json_load_user_by_name(), but expec !g.perm.Setup)(c) !g.perm.Setup)(c) ge with json_command_path(ge. |
| 13 | */; |
| 14 | }) st(LK,NULL,NULL); ption_cstr2("namto json_load_user_by_name(), but expec !g.perm.Setup)(c1 !g.perm.Setup)(c) _find_1)(c) json_set_}_find_option_cstr2("){_find_option_cstr2("namto json_load_user_by_name(), but expects a !g.perm.Setup)(c) json_set_err(FSL_JSON_E_DENIED, |
| 15 | } char * zPWHash = NULL++gotFields !g.perm.Setup)(c) json_set_err(FSL_JSON_E_DENIED, |
| 16 | "Requires 'a' or son_find_option_cstr2("namto json_load_user_by_name(), but expects a user ID. Returns |
| 17 | ** NULL if noL if no user founson_value * tmpVcommand_arg( g.isHTTP && (!pUser || !*pUser) ){ |
| 18 | pUser!g.perm.Setup)(c) turns |
| 19 | ** NULL "namto json_load_user_by_name(), but expects a user ID. Returns |
| 20 | ** NULL if noL if no user founson_value * tmpVcommname") |
| 21 | /* ACHTUNG: fossil apparently iconsget/XYZ |
| 22 | if we pass the name as part of the path, which is why we check |
| 23 | with jion_cstr2("namto json_load_user_by_name(), but expec !g.perm.Setup)(c) !g.perm.Setup)(c) ge with json_command_path(ge. |
| 24 | */; |
| 25 | }) st(LK,NULL,NULL); ption_cstr2("namto json_load_user_by_name(), but expec !g.perm.Setup)(c) !g.perm.Setup)(c) _find_option_cperm.Setup)(c) json_set_err(FSL_JSON_E_DENIED, |
| 26 | "Requires 'a' or son_find_option_cstr2("namto json_load_user_by_nnblob_append(& |
| 27 | |
| 28 | /* |
| 29 | e(), but expec !g.perm.Setup)(c) turns |
| 30 | ** NULL if noL if no u!s f user founson_value * tmACHthat logic. |
| 31 | */.perm.Setup ",-1 );!g.perm.Setup(c) _find_opet_err(FSL_N_E_DENIED, |
| 32 | "Requiet_err(FSL_JSON_E_DENIED, |
| 33 | "Req |
+12
-2
| --- src/main.mk | ||
| +++ src/main.mk | ||
| @@ -56,10 +56,11 @@ | ||
| 56 | 56 | $(SRCDIR)/json_login.c \ |
| 57 | 57 | $(SRCDIR)/json_query.c \ |
| 58 | 58 | $(SRCDIR)/json_report.c \ |
| 59 | 59 | $(SRCDIR)/json_tag.c \ |
| 60 | 60 | $(SRCDIR)/json_timeline.c \ |
| 61 | + $(SRCDIR)/json_user.c \ | |
| 61 | 62 | $(SRCDIR)/json_wiki.c \ |
| 62 | 63 | $(SRCDIR)/leaf.c \ |
| 63 | 64 | $(SRCDIR)/login.c \ |
| 64 | 65 | $(SRCDIR)/main.c \ |
| 65 | 66 | $(SRCDIR)/manifest.c \ |
| @@ -150,10 +151,11 @@ | ||
| 150 | 151 | $(OBJDIR)/json_login_.c \ |
| 151 | 152 | $(OBJDIR)/json_query_.c \ |
| 152 | 153 | $(OBJDIR)/json_report_.c \ |
| 153 | 154 | $(OBJDIR)/json_tag_.c \ |
| 154 | 155 | $(OBJDIR)/json_timeline_.c \ |
| 156 | + $(OBJDIR)/json_user_.c \ | |
| 155 | 157 | $(OBJDIR)/json_wiki_.c \ |
| 156 | 158 | $(OBJDIR)/leaf_.c \ |
| 157 | 159 | $(OBJDIR)/login_.c \ |
| 158 | 160 | $(OBJDIR)/main_.c \ |
| 159 | 161 | $(OBJDIR)/manifest_.c \ |
| @@ -244,10 +246,11 @@ | ||
| 244 | 246 | $(OBJDIR)/json_login.o \ |
| 245 | 247 | $(OBJDIR)/json_query.o \ |
| 246 | 248 | $(OBJDIR)/json_report.o \ |
| 247 | 249 | $(OBJDIR)/json_tag.o \ |
| 248 | 250 | $(OBJDIR)/json_timeline.o \ |
| 251 | + $(OBJDIR)/json_user.o \ | |
| 249 | 252 | $(OBJDIR)/json_wiki.o \ |
| 250 | 253 | $(OBJDIR)/leaf.o \ |
| 251 | 254 | $(OBJDIR)/login.o \ |
| 252 | 255 | $(OBJDIR)/main.o \ |
| 253 | 256 | $(OBJDIR)/manifest.o \ |
| @@ -349,14 +352,14 @@ | ||
| 349 | 352 | |
| 350 | 353 | |
| 351 | 354 | $(OBJDIR)/page_index.h: $(TRANS_SRC) $(OBJDIR)/mkindex |
| 352 | 355 | $(OBJDIR)/mkindex $(TRANS_SRC) >$@ |
| 353 | 356 | $(OBJDIR)/headers: $(OBJDIR)/page_index.h $(OBJDIR)/makeheaders $(OBJDIR)/VERSION.h |
| 354 | - $(OBJDIR)/makeheaders $(OBJDIR)/add_.c:$(OBJDIR)/add.h $(OBJDIR)/allrepo_.c:$(OBJDIR)/allrepo.h $(OBJDIR)/attach_.c:$(OBJDIR)/attach.h $(OBJDIR)/bag_.c:$(OBJDIR)/bag.h $(OBJDIR)/bisect_.c:$(OBJDIR)/bisect.h $(OBJDIR)/blob_.c:$(OBJDIR)/blob.h $(OBJDIR)/branch_.c:$(OBJDIR)/branch.h $(OBJDIR)/browse_.c:$(OBJDIR)/browse.h $(OBJDIR)/captcha_.c:$(OBJDIR)/captcha.h $(OBJDIR)/cgi_.c:$(OBJDIR)/cgi.h $(OBJDIR)/checkin_.c:$(OBJDIR)/checkin.h $(OBJDIR)/checkout_.c:$(OBJDIR)/checkout.h $(OBJDIR)/clearsign_.c:$(OBJDIR)/clearsign.h $(OBJDIR)/clone_.c:$(OBJDIR)/clone.h $(OBJDIR)/comformat_.c:$(OBJDIR)/comformat.h $(OBJDIR)/configure_.c:$(OBJDIR)/configure.h $(OBJDIR)/content_.c:$(OBJDIR)/content.h $(OBJDIR)/db_.c:$(OBJDIR)/db.h $(OBJDIR)/delta_.c:$(OBJDIR)/delta.h $(OBJDIR)/deltacmd_.c:$(OBJDIR)/deltacmd.h $(OBJDIR)/descendants_.c:$(OBJDIR)/descendants.h $(OBJDIR)/diff_.c:$(OBJDIR)/diff.h $(OBJDIR)/diffcmd_.c:$(OBJDIR)/diffcmd.h $(OBJDIR)/doc_.c:$(OBJDIR)/doc.h $(OBJDIR)/encode_.c:$(OBJDIR)/encode.h $(OBJDIR)/event_.c:$(OBJDIR)/event.h $(OBJDIR)/export_.c:$(OBJDIR)/export.h $(OBJDIR)/file_.c:$(OBJDIR)/file.h $(OBJDIR)/finfo_.c:$(OBJDIR)/finfo.h $(OBJDIR)/glob_.c:$(OBJDIR)/glob.h $(OBJDIR)/graph_.c:$(OBJDIR)/graph.h $(OBJDIR)/gzip_.c:$(OBJDIR)/gzip.h $(OBJDIR)/http_.c:$(OBJDIR)/http.h $(OBJDIR)/http_socket_.c:$(OBJDIR)/http_socket.h $(OBJDIR)/http_ssl_.c:$(OBJDIR)/http_ssl.h $(OBJDIR)/http_transport_.c:$(OBJDIR)/http_transport.h $(OBJDIR)/import_.c:$(OBJDIR)/import.h $(OBJDIR)/info_.c:$(OBJDIR)/info.h $(OBJDIR)/json_.c:$(OBJDIR)/json.h $(OBJDIR)/json_artifact_.c:$(OBJDIR)/json_artifact.h $(OBJDIR)/json_branch_.c:$(OBJDIR)/json_branch.h $(OBJDIR)/json_diff_.c:$(OBJDIR)/json_diff.h $(OBJDIR)/json_login_.c:$(OBJDIR)/json_login.h $(OBJDIR)/json_query_.c:$(OBJDIR)/json_query.h $(OBJDIR)/json_report_.c:$(OBJDIR)/json_report.h $(OBJDIR)/json_tag_.c:$(OBJDIR)/json_tag.h $(OBJDIR)/json_timeline_.c:$(OBJDIR)/json_timeline.h $(OBJDIR)/json_wiki_.c:$(OBJDIR)/json_wiki.h $(OBJDIR)/leaf_.c:$(OBJDIR)/leaf.h $(OBJDIR)/login_.c:$(OBJDIR)/login.h $(OBJDIR)/main_.c:$(OBJDIR)/main.h $(OBJDIR)/manifest_.c:$(OBJDIR)/manifest.h $(OBJDIR)/md5_.c:$(OBJDIR)/md5.h $(OBJDIR)/merge_.c:$(OBJDIR)/merge.h $(OBJDIR)/merge3_.c:$(OBJDIR)/merge3.h $(OBJDIR)/name_.c:$(OBJDIR)/name.h $(OBJDIR)/path_.c:$(OBJDIR)/path.h $(OBJDIR)/pivot_.c:$(OBJDIR)/pivot.h $(OBJDIR)/popen_.c:$(OBJDIR)/popen.h $(OBJDIR)/pqueue_.c:$(OBJDIR)/pqueue.h $(OBJDIR)/printf_.c:$(OBJDIR)/printf.h $(OBJDIR)/rebuild_.c:$(OBJDIR)/rebuild.h $(OBJDIR)/report_.c:$(OBJDIR)/report.h $(OBJDIR)/rss_.c:$(OBJDIR)/rss.h $(OBJDIR)/schema_.c:$(OBJDIR)/schema.h $(OBJDIR)/search_.c:$(OBJDIR)/search.h $(OBJDIR)/setup_.c:$(OBJDIR)/setup.h $(OBJDIR)/sha1_.c:$(OBJDIR)/sha1.h $(OBJDIR)/shun_.c:$(OBJDIR)/shun.h $(OBJDIR)/skins_.c:$(OBJDIR)/skins.h $(OBJDIR)/sqlcmd_.c:$(OBJDIR)/sqlcmd.h $(OBJDIR)/stash_.c:$(OBJDIR)/stash.h $(OBJDIR)/stat_.c:$(OBJDIR)/stat.h $(OBJDIR)/style_.c:$(OBJDIR)/style.h $(OBJDIR)/sync_.c:$(OBJDIR)/sync.h $(OBJDIR)/tag_.c:$(OBJDIR)/tag.h $(OBJDIR)/tar_.c:$(OBJDIR)/tar.h $(OBJDIR)/th_main_.c:$(OBJDIR)/th_main.h $(OBJDIR)/timeline_.c:$(OBJDIR)/timeline.h $(OBJDIR)/tkt_.c:$(OBJDIR)/tkt.h $(OBJDIR)/tktsetup_.c:$(OBJDIR)/tktsetup.h $(OBJDIR)/undo_.c:$(OBJDIR)/undo.h $(OBJDIR)/update_.c:$(OBJDIR)/update.h $(OBJDIR)/url_.c:$(OBJDIR)/url.h $(OBJDIR)/user_.c:$(OBJDIR)/user.h $(OBJDIR)/verify_.c:$(OBJDIR)/verify.h $(OBJDIR)/vfile_.c:$(OBJDIR)/vfile.h $(OBJDIR)/wiki_.c:$(OBJDIR)/wiki.h $(OBJDIR)/wikiformat_.c:$(OBJDIR)/wikiformat.h $(OBJDIR)/winhttp_.c:$(OBJDIR)/winhttp.h $(OBJDIR)/xfer_.c:$(OBJDIR)/xfer.h $(OBJDIR)/zip_.c:$(OBJDIR)/zip.h $(SRCDIR)/sqlite3.h $(SRCDIR)/th.h $(OBJDIR)/VERSION.h | |
| 357 | + $(OBJDIR)/makeheaders $(OBJDIR)/add_.c:$(OBJDIR)/add.h $(OBJDIR)/allrepo_.c:$(OBJDIR)/allrepo.h $(OBJDIR)/attach_.c:$(OBJDIR)/attach.h $(OBJDIR)/bag_.c:$(OBJDIR)/bag.h $(OBJDIR)/bisect_.c:$(OBJDIR)/bisect.h $(OBJDIR)/blob_.c:$(OBJDIR)/blob.h $(OBJDIR)/branch_.c:$(OBJDIR)/branch.h $(OBJDIR)/browse_.c:$(OBJDIR)/browse.h $(OBJDIR)/captcha_.c:$(OBJDIR)/captcha.h $(OBJDIR)/cgi_.c:$(OBJDIR)/cgi.h $(OBJDIR)/checkin_.c:$(OBJDIR)/checkin.h $(OBJDIR)/checkout_.c:$(OBJDIR)/checkout.h $(OBJDIR)/clearsign_.c:$(OBJDIR)/clearsign.h $(OBJDIR)/clone_.c:$(OBJDIR)/clone.h $(OBJDIR)/comformat_.c:$(OBJDIR)/comformat.h $(OBJDIR)/configure_.c:$(OBJDIR)/configure.h $(OBJDIR)/content_.c:$(OBJDIR)/content.h $(OBJDIR)/db_.c:$(OBJDIR)/db.h $(OBJDIR)/delta_.c:$(OBJDIR)/delta.h $(OBJDIR)/deltacmd_.c:$(OBJDIR)/deltacmd.h $(OBJDIR)/descendants_.c:$(OBJDIR)/descendants.h $(OBJDIR)/diff_.c:$(OBJDIR)/diff.h $(OBJDIR)/diffcmd_.c:$(OBJDIR)/diffcmd.h $(OBJDIR)/doc_.c:$(OBJDIR)/doc.h $(OBJDIR)/encode_.c:$(OBJDIR)/encode.h $(OBJDIR)/event_.c:$(OBJDIR)/event.h $(OBJDIR)/export_.c:$(OBJDIR)/export.h $(OBJDIR)/file_.c:$(OBJDIR)/file.h $(OBJDIR)/finfo_.c:$(OBJDIR)/finfo.h $(OBJDIR)/glob_.c:$(OBJDIR)/glob.h $(OBJDIR)/graph_.c:$(OBJDIR)/graph.h $(OBJDIR)/gzip_.c:$(OBJDIR)/gzip.h $(OBJDIR)/http_.c:$(OBJDIR)/http.h $(OBJDIR)/http_socket_.c:$(OBJDIR)/http_socket.h $(OBJDIR)/http_ssl_.c:$(OBJDIR)/http_ssl.h $(OBJDIR)/http_transport_.c:$(OBJDIR)/http_transport.h $(OBJDIR)/import_.c:$(OBJDIR)/import.h $(OBJDIR)/info_.c:$(OBJDIR)/info.h $(OBJDIR)/json_.c:$(OBJDIR)/json.h $(OBJDIR)/json_artifact_.c:$(OBJDIR)/json_artifact.h $(OBJDIR)/json_branch_.c:$(OBJDIR)/json_branch.h $(OBJDIR)/json_diff_.c:$(OBJDIR)/json_diff.h $(OBJDIR)/json_login_.c:$(OBJDIR)/json_login.h $(OBJDIR)/json_query_.c:$(OBJDIR)/json_query.h $(OBJDIR)/json_report_.c:$(OBJDIR)/json_report.h $(OBJDIR)/json_tag_.c:$(OBJDIR)/json_tag.h $(OBJDIR)/json_timeline_.c:$(OBJDIR)/json_timeline.h $(OBJDIR)/json_user_.c:$(OBJDIR)/json_user.h $(OBJDIR)/json_wiki_.c:$(OBJDIR)/json_wiki.h $(OBJDIR)/leaf_.c:$(OBJDIR)/leaf.h $(OBJDIR)/login_.c:$(OBJDIR)/login.h $(OBJDIR)/main_.c:$(OBJDIR)/main.h $(OBJDIR)/manifest_.c:$(OBJDIR)/manifest.h $(OBJDIR)/md5_.c:$(OBJDIR)/md5.h $(OBJDIR)/merge_.c:$(OBJDIR)/merge.h $(OBJDIR)/merge3_.c:$(OBJDIR)/merge3.h $(OBJDIR)/name_.c:$(OBJDIR)/name.h $(OBJDIR)/path_.c:$(OBJDIR)/path.h $(OBJDIR)/pivot_.c:$(OBJDIR)/pivot.h $(OBJDIR)/popen_.c:$(OBJDIR)/popen.h $(OBJDIR)/pqueue_.c:$(OBJDIR)/pqueue.h $(OBJDIR)/printf_.c:$(OBJDIR)/printf.h $(OBJDIR)/rebuild_.c:$(OBJDIR)/rebuild.h $(OBJDIR)/report_.c:$(OBJDIR)/report.h $(OBJDIR)/rss_.c:$(OBJDIR)/rss.h $(OBJDIR)/schema_.c:$(OBJDIR)/schema.h $(OBJDIR)/search_.c:$(OBJDIR)/search.h $(OBJDIR)/setup_.c:$(OBJDIR)/setup.h $(OBJDIR)/sha1_.c:$(OBJDIR)/sha1.h $(OBJDIR)/shun_.c:$(OBJDIR)/shun.h $(OBJDIR)/skins_.c:$(OBJDIR)/skins.h $(OBJDIR)/sqlcmd_.c:$(OBJDIR)/sqlcmd.h $(OBJDIR)/stash_.c:$(OBJDIR)/stash.h $(OBJDIR)/stat_.c:$(OBJDIR)/stat.h $(OBJDIR)/style_.c:$(OBJDIR)/style.h $(OBJDIR)/sync_.c:$(OBJDIR)/sync.h $(OBJDIR)/tag_.c:$(OBJDIR)/tag.h $(OBJDIR)/tar_.c:$(OBJDIR)/tar.h $(OBJDIR)/th_main_.c:$(OBJDIR)/th_main.h $(OBJDIR)/timeline_.c:$(OBJDIR)/timeline.h $(OBJDIR)/tkt_.c:$(OBJDIR)/tkt.h $(OBJDIR)/tktsetup_.c:$(OBJDIR)/tktsetup.h $(OBJDIR)/undo_.c:$(OBJDIR)/undo.h $(OBJDIR)/update_.c:$(OBJDIR)/update.h $(OBJDIR)/url_.c:$(OBJDIR)/url.h $(OBJDIR)/user_.c:$(OBJDIR)/user.h $(OBJDIR)/verify_.c:$(OBJDIR)/verify.h $(OBJDIR)/vfile_.c:$(OBJDIR)/vfile.h $(OBJDIR)/wiki_.c:$(OBJDIR)/wiki.h $(OBJDIR)/wikiformat_.c:$(OBJDIR)/wikiformat.h $(OBJDIR)/winhttp_.c:$(OBJDIR)/winhttp.h $(OBJDIR)/xfer_.c:$(OBJDIR)/xfer.h $(OBJDIR)/zip_.c:$(OBJDIR)/zip.h $(SRCDIR)/sqlite3.h $(SRCDIR)/th.h $(OBJDIR)/VERSION.h | |
| 355 | 358 | touch $(OBJDIR)/headers |
| 356 | 359 | $(OBJDIR)/headers: Makefile |
| 357 | -$(OBJDIR)/json.o $(OBJDIR)/json_artifact.o $(OBJDIR)/json_branch.o $(OBJDIR)/json_diff.o $(OBJDIR)/json_login.o $(OBJDIR)/json_query.o $(OBJDIR)/json_report.o $(OBJDIR)/json_tag.o $(OBJDIR)/json_timeline.o $(OBJDIR)/json_wiki.o : $(SRCDIR)/json_detail.h | |
| 360 | +$(OBJDIR)/json.o $(OBJDIR)/json_artifact.o $(OBJDIR)/json_branch.o $(OBJDIR)/json_diff.o $(OBJDIR)/json_login.o $(OBJDIR)/json_query.o $(OBJDIR)/json_report.o $(OBJDIR)/json_tag.o $(OBJDIR)/json_timeline.o $(OBJDIR)/json_user.o $(OBJDIR)/json_wiki.o : $(SRCDIR)/json_detail.h | |
| 358 | 361 | Makefile: |
| 359 | 362 | $(OBJDIR)/add_.c: $(SRCDIR)/add.c $(OBJDIR)/translate |
| 360 | 363 | $(OBJDIR)/translate $(SRCDIR)/add.c >$(OBJDIR)/add_.c |
| 361 | 364 | |
| 362 | 365 | $(OBJDIR)/add.o: $(OBJDIR)/add_.c $(OBJDIR)/add.h $(SRCDIR)/config.h |
| @@ -683,10 +686,17 @@ | ||
| 683 | 686 | |
| 684 | 687 | $(OBJDIR)/json_timeline.o: $(OBJDIR)/json_timeline_.c $(OBJDIR)/json_timeline.h $(SRCDIR)/config.h |
| 685 | 688 | $(XTCC) -o $(OBJDIR)/json_timeline.o -c $(OBJDIR)/json_timeline_.c |
| 686 | 689 | |
| 687 | 690 | $(OBJDIR)/json_timeline.h: $(OBJDIR)/headers |
| 691 | +$(OBJDIR)/json_user_.c: $(SRCDIR)/json_user.c $(OBJDIR)/translate | |
| 692 | + $(OBJDIR)/translate $(SRCDIR)/json_user.c >$(OBJDIR)/json_user_.c | |
| 693 | + | |
| 694 | +$(OBJDIR)/json_user.o: $(OBJDIR)/json_user_.c $(OBJDIR)/json_user.h $(SRCDIR)/config.h | |
| 695 | + $(XTCC) -o $(OBJDIR)/json_user.o -c $(OBJDIR)/json_user_.c | |
| 696 | + | |
| 697 | +$(OBJDIR)/json_user.h: $(OBJDIR)/headers | |
| 688 | 698 | $(OBJDIR)/json_wiki_.c: $(SRCDIR)/json_wiki.c $(OBJDIR)/translate |
| 689 | 699 | $(OBJDIR)/translate $(SRCDIR)/json_wiki.c >$(OBJDIR)/json_wiki_.c |
| 690 | 700 | |
| 691 | 701 | $(OBJDIR)/json_wiki.o: $(OBJDIR)/json_wiki_.c $(OBJDIR)/json_wiki.h $(SRCDIR)/config.h |
| 692 | 702 | $(XTCC) -o $(OBJDIR)/json_wiki.o -c $(OBJDIR)/json_wiki_.c |
| 693 | 703 |
| --- src/main.mk | |
| +++ src/main.mk | |
| @@ -56,10 +56,11 @@ | |
| 56 | $(SRCDIR)/json_login.c \ |
| 57 | $(SRCDIR)/json_query.c \ |
| 58 | $(SRCDIR)/json_report.c \ |
| 59 | $(SRCDIR)/json_tag.c \ |
| 60 | $(SRCDIR)/json_timeline.c \ |
| 61 | $(SRCDIR)/json_wiki.c \ |
| 62 | $(SRCDIR)/leaf.c \ |
| 63 | $(SRCDIR)/login.c \ |
| 64 | $(SRCDIR)/main.c \ |
| 65 | $(SRCDIR)/manifest.c \ |
| @@ -150,10 +151,11 @@ | |
| 150 | $(OBJDIR)/json_login_.c \ |
| 151 | $(OBJDIR)/json_query_.c \ |
| 152 | $(OBJDIR)/json_report_.c \ |
| 153 | $(OBJDIR)/json_tag_.c \ |
| 154 | $(OBJDIR)/json_timeline_.c \ |
| 155 | $(OBJDIR)/json_wiki_.c \ |
| 156 | $(OBJDIR)/leaf_.c \ |
| 157 | $(OBJDIR)/login_.c \ |
| 158 | $(OBJDIR)/main_.c \ |
| 159 | $(OBJDIR)/manifest_.c \ |
| @@ -244,10 +246,11 @@ | |
| 244 | $(OBJDIR)/json_login.o \ |
| 245 | $(OBJDIR)/json_query.o \ |
| 246 | $(OBJDIR)/json_report.o \ |
| 247 | $(OBJDIR)/json_tag.o \ |
| 248 | $(OBJDIR)/json_timeline.o \ |
| 249 | $(OBJDIR)/json_wiki.o \ |
| 250 | $(OBJDIR)/leaf.o \ |
| 251 | $(OBJDIR)/login.o \ |
| 252 | $(OBJDIR)/main.o \ |
| 253 | $(OBJDIR)/manifest.o \ |
| @@ -349,14 +352,14 @@ | |
| 349 | |
| 350 | |
| 351 | $(OBJDIR)/page_index.h: $(TRANS_SRC) $(OBJDIR)/mkindex |
| 352 | $(OBJDIR)/mkindex $(TRANS_SRC) >$@ |
| 353 | $(OBJDIR)/headers: $(OBJDIR)/page_index.h $(OBJDIR)/makeheaders $(OBJDIR)/VERSION.h |
| 354 | $(OBJDIR)/makeheaders $(OBJDIR)/add_.c:$(OBJDIR)/add.h $(OBJDIR)/allrepo_.c:$(OBJDIR)/allrepo.h $(OBJDIR)/attach_.c:$(OBJDIR)/attach.h $(OBJDIR)/bag_.c:$(OBJDIR)/bag.h $(OBJDIR)/bisect_.c:$(OBJDIR)/bisect.h $(OBJDIR)/blob_.c:$(OBJDIR)/blob.h $(OBJDIR)/branch_.c:$(OBJDIR)/branch.h $(OBJDIR)/browse_.c:$(OBJDIR)/browse.h $(OBJDIR)/captcha_.c:$(OBJDIR)/captcha.h $(OBJDIR)/cgi_.c:$(OBJDIR)/cgi.h $(OBJDIR)/checkin_.c:$(OBJDIR)/checkin.h $(OBJDIR)/checkout_.c:$(OBJDIR)/checkout.h $(OBJDIR)/clearsign_.c:$(OBJDIR)/clearsign.h $(OBJDIR)/clone_.c:$(OBJDIR)/clone.h $(OBJDIR)/comformat_.c:$(OBJDIR)/comformat.h $(OBJDIR)/configure_.c:$(OBJDIR)/configure.h $(OBJDIR)/content_.c:$(OBJDIR)/content.h $(OBJDIR)/db_.c:$(OBJDIR)/db.h $(OBJDIR)/delta_.c:$(OBJDIR)/delta.h $(OBJDIR)/deltacmd_.c:$(OBJDIR)/deltacmd.h $(OBJDIR)/descendants_.c:$(OBJDIR)/descendants.h $(OBJDIR)/diff_.c:$(OBJDIR)/diff.h $(OBJDIR)/diffcmd_.c:$(OBJDIR)/diffcmd.h $(OBJDIR)/doc_.c:$(OBJDIR)/doc.h $(OBJDIR)/encode_.c:$(OBJDIR)/encode.h $(OBJDIR)/event_.c:$(OBJDIR)/event.h $(OBJDIR)/export_.c:$(OBJDIR)/export.h $(OBJDIR)/file_.c:$(OBJDIR)/file.h $(OBJDIR)/finfo_.c:$(OBJDIR)/finfo.h $(OBJDIR)/glob_.c:$(OBJDIR)/glob.h $(OBJDIR)/graph_.c:$(OBJDIR)/graph.h $(OBJDIR)/gzip_.c:$(OBJDIR)/gzip.h $(OBJDIR)/http_.c:$(OBJDIR)/http.h $(OBJDIR)/http_socket_.c:$(OBJDIR)/http_socket.h $(OBJDIR)/http_ssl_.c:$(OBJDIR)/http_ssl.h $(OBJDIR)/http_transport_.c:$(OBJDIR)/http_transport.h $(OBJDIR)/import_.c:$(OBJDIR)/import.h $(OBJDIR)/info_.c:$(OBJDIR)/info.h $(OBJDIR)/json_.c:$(OBJDIR)/json.h $(OBJDIR)/json_artifact_.c:$(OBJDIR)/json_artifact.h $(OBJDIR)/json_branch_.c:$(OBJDIR)/json_branch.h $(OBJDIR)/json_diff_.c:$(OBJDIR)/json_diff.h $(OBJDIR)/json_login_.c:$(OBJDIR)/json_login.h $(OBJDIR)/json_query_.c:$(OBJDIR)/json_query.h $(OBJDIR)/json_report_.c:$(OBJDIR)/json_report.h $(OBJDIR)/json_tag_.c:$(OBJDIR)/json_tag.h $(OBJDIR)/json_timeline_.c:$(OBJDIR)/json_timeline.h $(OBJDIR)/json_wiki_.c:$(OBJDIR)/json_wiki.h $(OBJDIR)/leaf_.c:$(OBJDIR)/leaf.h $(OBJDIR)/login_.c:$(OBJDIR)/login.h $(OBJDIR)/main_.c:$(OBJDIR)/main.h $(OBJDIR)/manifest_.c:$(OBJDIR)/manifest.h $(OBJDIR)/md5_.c:$(OBJDIR)/md5.h $(OBJDIR)/merge_.c:$(OBJDIR)/merge.h $(OBJDIR)/merge3_.c:$(OBJDIR)/merge3.h $(OBJDIR)/name_.c:$(OBJDIR)/name.h $(OBJDIR)/path_.c:$(OBJDIR)/path.h $(OBJDIR)/pivot_.c:$(OBJDIR)/pivot.h $(OBJDIR)/popen_.c:$(OBJDIR)/popen.h $(OBJDIR)/pqueue_.c:$(OBJDIR)/pqueue.h $(OBJDIR)/printf_.c:$(OBJDIR)/printf.h $(OBJDIR)/rebuild_.c:$(OBJDIR)/rebuild.h $(OBJDIR)/report_.c:$(OBJDIR)/report.h $(OBJDIR)/rss_.c:$(OBJDIR)/rss.h $(OBJDIR)/schema_.c:$(OBJDIR)/schema.h $(OBJDIR)/search_.c:$(OBJDIR)/search.h $(OBJDIR)/setup_.c:$(OBJDIR)/setup.h $(OBJDIR)/sha1_.c:$(OBJDIR)/sha1.h $(OBJDIR)/shun_.c:$(OBJDIR)/shun.h $(OBJDIR)/skins_.c:$(OBJDIR)/skins.h $(OBJDIR)/sqlcmd_.c:$(OBJDIR)/sqlcmd.h $(OBJDIR)/stash_.c:$(OBJDIR)/stash.h $(OBJDIR)/stat_.c:$(OBJDIR)/stat.h $(OBJDIR)/style_.c:$(OBJDIR)/style.h $(OBJDIR)/sync_.c:$(OBJDIR)/sync.h $(OBJDIR)/tag_.c:$(OBJDIR)/tag.h $(OBJDIR)/tar_.c:$(OBJDIR)/tar.h $(OBJDIR)/th_main_.c:$(OBJDIR)/th_main.h $(OBJDIR)/timeline_.c:$(OBJDIR)/timeline.h $(OBJDIR)/tkt_.c:$(OBJDIR)/tkt.h $(OBJDIR)/tktsetup_.c:$(OBJDIR)/tktsetup.h $(OBJDIR)/undo_.c:$(OBJDIR)/undo.h $(OBJDIR)/update_.c:$(OBJDIR)/update.h $(OBJDIR)/url_.c:$(OBJDIR)/url.h $(OBJDIR)/user_.c:$(OBJDIR)/user.h $(OBJDIR)/verify_.c:$(OBJDIR)/verify.h $(OBJDIR)/vfile_.c:$(OBJDIR)/vfile.h $(OBJDIR)/wiki_.c:$(OBJDIR)/wiki.h $(OBJDIR)/wikiformat_.c:$(OBJDIR)/wikiformat.h $(OBJDIR)/winhttp_.c:$(OBJDIR)/winhttp.h $(OBJDIR)/xfer_.c:$(OBJDIR)/xfer.h $(OBJDIR)/zip_.c:$(OBJDIR)/zip.h $(SRCDIR)/sqlite3.h $(SRCDIR)/th.h $(OBJDIR)/VERSION.h |
| 355 | touch $(OBJDIR)/headers |
| 356 | $(OBJDIR)/headers: Makefile |
| 357 | $(OBJDIR)/json.o $(OBJDIR)/json_artifact.o $(OBJDIR)/json_branch.o $(OBJDIR)/json_diff.o $(OBJDIR)/json_login.o $(OBJDIR)/json_query.o $(OBJDIR)/json_report.o $(OBJDIR)/json_tag.o $(OBJDIR)/json_timeline.o $(OBJDIR)/json_wiki.o : $(SRCDIR)/json_detail.h |
| 358 | Makefile: |
| 359 | $(OBJDIR)/add_.c: $(SRCDIR)/add.c $(OBJDIR)/translate |
| 360 | $(OBJDIR)/translate $(SRCDIR)/add.c >$(OBJDIR)/add_.c |
| 361 | |
| 362 | $(OBJDIR)/add.o: $(OBJDIR)/add_.c $(OBJDIR)/add.h $(SRCDIR)/config.h |
| @@ -683,10 +686,17 @@ | |
| 683 | |
| 684 | $(OBJDIR)/json_timeline.o: $(OBJDIR)/json_timeline_.c $(OBJDIR)/json_timeline.h $(SRCDIR)/config.h |
| 685 | $(XTCC) -o $(OBJDIR)/json_timeline.o -c $(OBJDIR)/json_timeline_.c |
| 686 | |
| 687 | $(OBJDIR)/json_timeline.h: $(OBJDIR)/headers |
| 688 | $(OBJDIR)/json_wiki_.c: $(SRCDIR)/json_wiki.c $(OBJDIR)/translate |
| 689 | $(OBJDIR)/translate $(SRCDIR)/json_wiki.c >$(OBJDIR)/json_wiki_.c |
| 690 | |
| 691 | $(OBJDIR)/json_wiki.o: $(OBJDIR)/json_wiki_.c $(OBJDIR)/json_wiki.h $(SRCDIR)/config.h |
| 692 | $(XTCC) -o $(OBJDIR)/json_wiki.o -c $(OBJDIR)/json_wiki_.c |
| 693 |
| --- src/main.mk | |
| +++ src/main.mk | |
| @@ -56,10 +56,11 @@ | |
| 56 | $(SRCDIR)/json_login.c \ |
| 57 | $(SRCDIR)/json_query.c \ |
| 58 | $(SRCDIR)/json_report.c \ |
| 59 | $(SRCDIR)/json_tag.c \ |
| 60 | $(SRCDIR)/json_timeline.c \ |
| 61 | $(SRCDIR)/json_user.c \ |
| 62 | $(SRCDIR)/json_wiki.c \ |
| 63 | $(SRCDIR)/leaf.c \ |
| 64 | $(SRCDIR)/login.c \ |
| 65 | $(SRCDIR)/main.c \ |
| 66 | $(SRCDIR)/manifest.c \ |
| @@ -150,10 +151,11 @@ | |
| 151 | $(OBJDIR)/json_login_.c \ |
| 152 | $(OBJDIR)/json_query_.c \ |
| 153 | $(OBJDIR)/json_report_.c \ |
| 154 | $(OBJDIR)/json_tag_.c \ |
| 155 | $(OBJDIR)/json_timeline_.c \ |
| 156 | $(OBJDIR)/json_user_.c \ |
| 157 | $(OBJDIR)/json_wiki_.c \ |
| 158 | $(OBJDIR)/leaf_.c \ |
| 159 | $(OBJDIR)/login_.c \ |
| 160 | $(OBJDIR)/main_.c \ |
| 161 | $(OBJDIR)/manifest_.c \ |
| @@ -244,10 +246,11 @@ | |
| 246 | $(OBJDIR)/json_login.o \ |
| 247 | $(OBJDIR)/json_query.o \ |
| 248 | $(OBJDIR)/json_report.o \ |
| 249 | $(OBJDIR)/json_tag.o \ |
| 250 | $(OBJDIR)/json_timeline.o \ |
| 251 | $(OBJDIR)/json_user.o \ |
| 252 | $(OBJDIR)/json_wiki.o \ |
| 253 | $(OBJDIR)/leaf.o \ |
| 254 | $(OBJDIR)/login.o \ |
| 255 | $(OBJDIR)/main.o \ |
| 256 | $(OBJDIR)/manifest.o \ |
| @@ -349,14 +352,14 @@ | |
| 352 | |
| 353 | |
| 354 | $(OBJDIR)/page_index.h: $(TRANS_SRC) $(OBJDIR)/mkindex |
| 355 | $(OBJDIR)/mkindex $(TRANS_SRC) >$@ |
| 356 | $(OBJDIR)/headers: $(OBJDIR)/page_index.h $(OBJDIR)/makeheaders $(OBJDIR)/VERSION.h |
| 357 | $(OBJDIR)/makeheaders $(OBJDIR)/add_.c:$(OBJDIR)/add.h $(OBJDIR)/allrepo_.c:$(OBJDIR)/allrepo.h $(OBJDIR)/attach_.c:$(OBJDIR)/attach.h $(OBJDIR)/bag_.c:$(OBJDIR)/bag.h $(OBJDIR)/bisect_.c:$(OBJDIR)/bisect.h $(OBJDIR)/blob_.c:$(OBJDIR)/blob.h $(OBJDIR)/branch_.c:$(OBJDIR)/branch.h $(OBJDIR)/browse_.c:$(OBJDIR)/browse.h $(OBJDIR)/captcha_.c:$(OBJDIR)/captcha.h $(OBJDIR)/cgi_.c:$(OBJDIR)/cgi.h $(OBJDIR)/checkin_.c:$(OBJDIR)/checkin.h $(OBJDIR)/checkout_.c:$(OBJDIR)/checkout.h $(OBJDIR)/clearsign_.c:$(OBJDIR)/clearsign.h $(OBJDIR)/clone_.c:$(OBJDIR)/clone.h $(OBJDIR)/comformat_.c:$(OBJDIR)/comformat.h $(OBJDIR)/configure_.c:$(OBJDIR)/configure.h $(OBJDIR)/content_.c:$(OBJDIR)/content.h $(OBJDIR)/db_.c:$(OBJDIR)/db.h $(OBJDIR)/delta_.c:$(OBJDIR)/delta.h $(OBJDIR)/deltacmd_.c:$(OBJDIR)/deltacmd.h $(OBJDIR)/descendants_.c:$(OBJDIR)/descendants.h $(OBJDIR)/diff_.c:$(OBJDIR)/diff.h $(OBJDIR)/diffcmd_.c:$(OBJDIR)/diffcmd.h $(OBJDIR)/doc_.c:$(OBJDIR)/doc.h $(OBJDIR)/encode_.c:$(OBJDIR)/encode.h $(OBJDIR)/event_.c:$(OBJDIR)/event.h $(OBJDIR)/export_.c:$(OBJDIR)/export.h $(OBJDIR)/file_.c:$(OBJDIR)/file.h $(OBJDIR)/finfo_.c:$(OBJDIR)/finfo.h $(OBJDIR)/glob_.c:$(OBJDIR)/glob.h $(OBJDIR)/graph_.c:$(OBJDIR)/graph.h $(OBJDIR)/gzip_.c:$(OBJDIR)/gzip.h $(OBJDIR)/http_.c:$(OBJDIR)/http.h $(OBJDIR)/http_socket_.c:$(OBJDIR)/http_socket.h $(OBJDIR)/http_ssl_.c:$(OBJDIR)/http_ssl.h $(OBJDIR)/http_transport_.c:$(OBJDIR)/http_transport.h $(OBJDIR)/import_.c:$(OBJDIR)/import.h $(OBJDIR)/info_.c:$(OBJDIR)/info.h $(OBJDIR)/json_.c:$(OBJDIR)/json.h $(OBJDIR)/json_artifact_.c:$(OBJDIR)/json_artifact.h $(OBJDIR)/json_branch_.c:$(OBJDIR)/json_branch.h $(OBJDIR)/json_diff_.c:$(OBJDIR)/json_diff.h $(OBJDIR)/json_login_.c:$(OBJDIR)/json_login.h $(OBJDIR)/json_query_.c:$(OBJDIR)/json_query.h $(OBJDIR)/json_report_.c:$(OBJDIR)/json_report.h $(OBJDIR)/json_tag_.c:$(OBJDIR)/json_tag.h $(OBJDIR)/json_timeline_.c:$(OBJDIR)/json_timeline.h $(OBJDIR)/json_user_.c:$(OBJDIR)/json_user.h $(OBJDIR)/json_wiki_.c:$(OBJDIR)/json_wiki.h $(OBJDIR)/leaf_.c:$(OBJDIR)/leaf.h $(OBJDIR)/login_.c:$(OBJDIR)/login.h $(OBJDIR)/main_.c:$(OBJDIR)/main.h $(OBJDIR)/manifest_.c:$(OBJDIR)/manifest.h $(OBJDIR)/md5_.c:$(OBJDIR)/md5.h $(OBJDIR)/merge_.c:$(OBJDIR)/merge.h $(OBJDIR)/merge3_.c:$(OBJDIR)/merge3.h $(OBJDIR)/name_.c:$(OBJDIR)/name.h $(OBJDIR)/path_.c:$(OBJDIR)/path.h $(OBJDIR)/pivot_.c:$(OBJDIR)/pivot.h $(OBJDIR)/popen_.c:$(OBJDIR)/popen.h $(OBJDIR)/pqueue_.c:$(OBJDIR)/pqueue.h $(OBJDIR)/printf_.c:$(OBJDIR)/printf.h $(OBJDIR)/rebuild_.c:$(OBJDIR)/rebuild.h $(OBJDIR)/report_.c:$(OBJDIR)/report.h $(OBJDIR)/rss_.c:$(OBJDIR)/rss.h $(OBJDIR)/schema_.c:$(OBJDIR)/schema.h $(OBJDIR)/search_.c:$(OBJDIR)/search.h $(OBJDIR)/setup_.c:$(OBJDIR)/setup.h $(OBJDIR)/sha1_.c:$(OBJDIR)/sha1.h $(OBJDIR)/shun_.c:$(OBJDIR)/shun.h $(OBJDIR)/skins_.c:$(OBJDIR)/skins.h $(OBJDIR)/sqlcmd_.c:$(OBJDIR)/sqlcmd.h $(OBJDIR)/stash_.c:$(OBJDIR)/stash.h $(OBJDIR)/stat_.c:$(OBJDIR)/stat.h $(OBJDIR)/style_.c:$(OBJDIR)/style.h $(OBJDIR)/sync_.c:$(OBJDIR)/sync.h $(OBJDIR)/tag_.c:$(OBJDIR)/tag.h $(OBJDIR)/tar_.c:$(OBJDIR)/tar.h $(OBJDIR)/th_main_.c:$(OBJDIR)/th_main.h $(OBJDIR)/timeline_.c:$(OBJDIR)/timeline.h $(OBJDIR)/tkt_.c:$(OBJDIR)/tkt.h $(OBJDIR)/tktsetup_.c:$(OBJDIR)/tktsetup.h $(OBJDIR)/undo_.c:$(OBJDIR)/undo.h $(OBJDIR)/update_.c:$(OBJDIR)/update.h $(OBJDIR)/url_.c:$(OBJDIR)/url.h $(OBJDIR)/user_.c:$(OBJDIR)/user.h $(OBJDIR)/verify_.c:$(OBJDIR)/verify.h $(OBJDIR)/vfile_.c:$(OBJDIR)/vfile.h $(OBJDIR)/wiki_.c:$(OBJDIR)/wiki.h $(OBJDIR)/wikiformat_.c:$(OBJDIR)/wikiformat.h $(OBJDIR)/winhttp_.c:$(OBJDIR)/winhttp.h $(OBJDIR)/xfer_.c:$(OBJDIR)/xfer.h $(OBJDIR)/zip_.c:$(OBJDIR)/zip.h $(SRCDIR)/sqlite3.h $(SRCDIR)/th.h $(OBJDIR)/VERSION.h |
| 358 | touch $(OBJDIR)/headers |
| 359 | $(OBJDIR)/headers: Makefile |
| 360 | $(OBJDIR)/json.o $(OBJDIR)/json_artifact.o $(OBJDIR)/json_branch.o $(OBJDIR)/json_diff.o $(OBJDIR)/json_login.o $(OBJDIR)/json_query.o $(OBJDIR)/json_report.o $(OBJDIR)/json_tag.o $(OBJDIR)/json_timeline.o $(OBJDIR)/json_user.o $(OBJDIR)/json_wiki.o : $(SRCDIR)/json_detail.h |
| 361 | Makefile: |
| 362 | $(OBJDIR)/add_.c: $(SRCDIR)/add.c $(OBJDIR)/translate |
| 363 | $(OBJDIR)/translate $(SRCDIR)/add.c >$(OBJDIR)/add_.c |
| 364 | |
| 365 | $(OBJDIR)/add.o: $(OBJDIR)/add_.c $(OBJDIR)/add.h $(SRCDIR)/config.h |
| @@ -683,10 +686,17 @@ | |
| 686 | |
| 687 | $(OBJDIR)/json_timeline.o: $(OBJDIR)/json_timeline_.c $(OBJDIR)/json_timeline.h $(SRCDIR)/config.h |
| 688 | $(XTCC) -o $(OBJDIR)/json_timeline.o -c $(OBJDIR)/json_timeline_.c |
| 689 | |
| 690 | $(OBJDIR)/json_timeline.h: $(OBJDIR)/headers |
| 691 | $(OBJDIR)/json_user_.c: $(SRCDIR)/json_user.c $(OBJDIR)/translate |
| 692 | $(OBJDIR)/translate $(SRCDIR)/json_user.c >$(OBJDIR)/json_user_.c |
| 693 | |
| 694 | $(OBJDIR)/json_user.o: $(OBJDIR)/json_user_.c $(OBJDIR)/json_user.h $(SRCDIR)/config.h |
| 695 | $(XTCC) -o $(OBJDIR)/json_user.o -c $(OBJDIR)/json_user_.c |
| 696 | |
| 697 | $(OBJDIR)/json_user.h: $(OBJDIR)/headers |
| 698 | $(OBJDIR)/json_wiki_.c: $(SRCDIR)/json_wiki.c $(OBJDIR)/translate |
| 699 | $(OBJDIR)/translate $(SRCDIR)/json_wiki.c >$(OBJDIR)/json_wiki_.c |
| 700 | |
| 701 | $(OBJDIR)/json_wiki.o: $(OBJDIR)/json_wiki_.c $(OBJDIR)/json_wiki.h $(SRCDIR)/config.h |
| 702 | $(XTCC) -o $(OBJDIR)/json_wiki.o -c $(OBJDIR)/json_wiki_.c |
| 703 |
+5
-2
| --- src/makemake.tcl | ||
| +++ src/makemake.tcl | ||
| @@ -62,10 +62,11 @@ | ||
| 62 | 62 | json_login |
| 63 | 63 | json_query |
| 64 | 64 | json_report |
| 65 | 65 | json_tag |
| 66 | 66 | json_timeline |
| 67 | + json_user | |
| 67 | 68 | json_wiki |
| 68 | 69 | leaf |
| 69 | 70 | login |
| 70 | 71 | main |
| 71 | 72 | manifest |
| @@ -244,11 +245,11 @@ | ||
| 244 | 245 | writeln "\t\$(OBJDIR)/mkindex \$(TRANS_SRC) >$@" |
| 245 | 246 | writeln "\$(OBJDIR)/headers:\t\$(OBJDIR)/page_index.h \$(OBJDIR)/makeheaders \$(OBJDIR)/VERSION.h" |
| 246 | 247 | writeln "\t\$(OBJDIR)/makeheaders $mhargs" |
| 247 | 248 | writeln "\ttouch \$(OBJDIR)/headers" |
| 248 | 249 | writeln "\$(OBJDIR)/headers: Makefile" |
| 249 | -writeln "\$(OBJDIR)/json.o \$(OBJDIR)/json_artifact.o \$(OBJDIR)/json_branch.o \$(OBJDIR)/json_diff.o \$(OBJDIR)/json_login.o \$(OBJDIR)/json_query.o \$(OBJDIR)/json_report.o \$(OBJDIR)/json_tag.o \$(OBJDIR)/json_timeline.o \$(OBJDIR)/json_wiki.o : \$(SRCDIR)/json_detail.h" | |
| 250 | +writeln "\$(OBJDIR)/json.o \$(OBJDIR)/json_artifact.o \$(OBJDIR)/json_branch.o \$(OBJDIR)/json_diff.o \$(OBJDIR)/json_login.o \$(OBJDIR)/json_query.o \$(OBJDIR)/json_report.o \$(OBJDIR)/json_tag.o \$(OBJDIR)/json_timeline.o \$(OBJDIR)/json_user.o \$(OBJDIR)/json_wiki.o : \$(SRCDIR)/json_detail.h" | |
| 250 | 251 | writeln "Makefile:" |
| 251 | 252 | set extra_h(main) \$(OBJDIR)/page_index.h |
| 252 | 253 | |
| 253 | 254 | foreach s [lsort $src] { |
| 254 | 255 | writeln "\$(OBJDIR)/${s}_.c:\t\$(SRCDIR)/$s.c \$(OBJDIR)/translate" |
| @@ -490,11 +491,11 @@ | ||
| 490 | 491 | writeln "\t\$(XTCC) $opt -c \$(SRCDIR)/sqlite3.c -o \$(OBJDIR)/sqlite3.o\n" |
| 491 | 492 | |
| 492 | 493 | set opt {} |
| 493 | 494 | writeln "\$(OBJDIR)/cson_amalgamation.o:\t\$(SRCDIR)/cson_amalgamation.c" |
| 494 | 495 | writeln "\t\$(XTCC) $opt -c \$(SRCDIR)/cson_amalgamation.c -o \$(OBJDIR)/cson_amalgamation.o -DCSON_FOSSIL_MODE\n" |
| 495 | -writeln "\$(OBJDIR)/json.o \$(OBJDIR)/json_artifact.o \$(OBJDIR)/json_branch.o \$(OBJDIR)/json_diff.o \$(OBJDIR)/json_login.o \$(OBJDIR)/json_query.o \$(OBJDIR)/json_report.o \$(OBJDIR)/json_tag.o \$(OBJDIR)/json_timeline.o \$(OBJDIR)/json_wiki.o : \$(SRCDIR)/json_detail.h" | |
| 496 | +writeln "\$(OBJDIR)/json.o \$(OBJDIR)/json_artifact.o \$(OBJDIR)/json_branch.o \$(OBJDIR)/json_diff.o \$(OBJDIR)/json_login.o \$(OBJDIR)/json_query.o \$(OBJDIR)/json_report.o \$(OBJDIR)/json_tag.o \$(OBJDIR)/json_timeline.o \$(OBJDIR)/json_user.o \$(OBJDIR)/json_wiki.o : \$(SRCDIR)/json_detail.h" | |
| 496 | 497 | |
| 497 | 498 | writeln "\$(OBJDIR)/shell.o:\t\$(SRCDIR)/shell.c \$(SRCDIR)/sqlite3.h" |
| 498 | 499 | set opt {-Dmain=sqlite3_shell} |
| 499 | 500 | append opt " -DSQLITE_OMIT_LOAD_EXTENSION=1" |
| 500 | 501 | writeln "\t\$(XTCC) $opt -c \$(SRCDIR)/shell.c -o \$(OBJDIR)/shell.o\n" |
| @@ -629,10 +630,11 @@ | ||
| 629 | 630 | $(OBJDIR)\json_login$O : $(SRCDIR)\json_detail.h |
| 630 | 631 | $(OBJDIR)\json_query$O : $(SRCDIR)\json_detail.h |
| 631 | 632 | $(OBJDIR)\json_report$O : $(SRCDIR)\json_detail.h |
| 632 | 633 | $(OBJDIR)\json_tag$O : $(SRCDIR)\json_detail.h |
| 633 | 634 | $(OBJDIR)\json_timeline$O : $(SRCDIR)\json_detail.h |
| 635 | +$(OBJDIR)\json_user$O : $(SRCDIR)\json_detail.h | |
| 634 | 636 | $(OBJDIR)\json_wiki$O : $(SRCDIR)\json_detail.h |
| 635 | 637 | |
| 636 | 638 | |
| 637 | 639 | } |
| 638 | 640 | foreach s [lsort $src] { |
| @@ -781,10 +783,11 @@ | ||
| 781 | 783 | $(OBJDIR)\json_login$O : $(SRCDIR)\json_detail.h |
| 782 | 784 | $(OBJDIR)\json_query$O : $(SRCDIR)\json_detail.h |
| 783 | 785 | $(OBJDIR)\json_report$O : $(SRCDIR)\json_detail.h |
| 784 | 786 | $(OBJDIR)\json_tag$O : $(SRCDIR)\json_detail.h |
| 785 | 787 | $(OBJDIR)\json_timeline$O : $(SRCDIR)\json_detail.h |
| 788 | +$(OBJDIR)\json_user$O : $(SRCDIR)\json_detail.h | |
| 786 | 789 | $(OBJDIR)\json_wiki$O : $(SRCDIR)\json_detail.h |
| 787 | 790 | |
| 788 | 791 | } |
| 789 | 792 | foreach s [lsort $src] { |
| 790 | 793 | writeln "\$(OX)\\$s\$O : ${s}_.c ${s}.h" |
| 791 | 794 |
| --- src/makemake.tcl | |
| +++ src/makemake.tcl | |
| @@ -62,10 +62,11 @@ | |
| 62 | json_login |
| 63 | json_query |
| 64 | json_report |
| 65 | json_tag |
| 66 | json_timeline |
| 67 | json_wiki |
| 68 | leaf |
| 69 | login |
| 70 | main |
| 71 | manifest |
| @@ -244,11 +245,11 @@ | |
| 244 | writeln "\t\$(OBJDIR)/mkindex \$(TRANS_SRC) >$@" |
| 245 | writeln "\$(OBJDIR)/headers:\t\$(OBJDIR)/page_index.h \$(OBJDIR)/makeheaders \$(OBJDIR)/VERSION.h" |
| 246 | writeln "\t\$(OBJDIR)/makeheaders $mhargs" |
| 247 | writeln "\ttouch \$(OBJDIR)/headers" |
| 248 | writeln "\$(OBJDIR)/headers: Makefile" |
| 249 | writeln "\$(OBJDIR)/json.o \$(OBJDIR)/json_artifact.o \$(OBJDIR)/json_branch.o \$(OBJDIR)/json_diff.o \$(OBJDIR)/json_login.o \$(OBJDIR)/json_query.o \$(OBJDIR)/json_report.o \$(OBJDIR)/json_tag.o \$(OBJDIR)/json_timeline.o \$(OBJDIR)/json_wiki.o : \$(SRCDIR)/json_detail.h" |
| 250 | writeln "Makefile:" |
| 251 | set extra_h(main) \$(OBJDIR)/page_index.h |
| 252 | |
| 253 | foreach s [lsort $src] { |
| 254 | writeln "\$(OBJDIR)/${s}_.c:\t\$(SRCDIR)/$s.c \$(OBJDIR)/translate" |
| @@ -490,11 +491,11 @@ | |
| 490 | writeln "\t\$(XTCC) $opt -c \$(SRCDIR)/sqlite3.c -o \$(OBJDIR)/sqlite3.o\n" |
| 491 | |
| 492 | set opt {} |
| 493 | writeln "\$(OBJDIR)/cson_amalgamation.o:\t\$(SRCDIR)/cson_amalgamation.c" |
| 494 | writeln "\t\$(XTCC) $opt -c \$(SRCDIR)/cson_amalgamation.c -o \$(OBJDIR)/cson_amalgamation.o -DCSON_FOSSIL_MODE\n" |
| 495 | writeln "\$(OBJDIR)/json.o \$(OBJDIR)/json_artifact.o \$(OBJDIR)/json_branch.o \$(OBJDIR)/json_diff.o \$(OBJDIR)/json_login.o \$(OBJDIR)/json_query.o \$(OBJDIR)/json_report.o \$(OBJDIR)/json_tag.o \$(OBJDIR)/json_timeline.o \$(OBJDIR)/json_wiki.o : \$(SRCDIR)/json_detail.h" |
| 496 | |
| 497 | writeln "\$(OBJDIR)/shell.o:\t\$(SRCDIR)/shell.c \$(SRCDIR)/sqlite3.h" |
| 498 | set opt {-Dmain=sqlite3_shell} |
| 499 | append opt " -DSQLITE_OMIT_LOAD_EXTENSION=1" |
| 500 | writeln "\t\$(XTCC) $opt -c \$(SRCDIR)/shell.c -o \$(OBJDIR)/shell.o\n" |
| @@ -629,10 +630,11 @@ | |
| 629 | $(OBJDIR)\json_login$O : $(SRCDIR)\json_detail.h |
| 630 | $(OBJDIR)\json_query$O : $(SRCDIR)\json_detail.h |
| 631 | $(OBJDIR)\json_report$O : $(SRCDIR)\json_detail.h |
| 632 | $(OBJDIR)\json_tag$O : $(SRCDIR)\json_detail.h |
| 633 | $(OBJDIR)\json_timeline$O : $(SRCDIR)\json_detail.h |
| 634 | $(OBJDIR)\json_wiki$O : $(SRCDIR)\json_detail.h |
| 635 | |
| 636 | |
| 637 | } |
| 638 | foreach s [lsort $src] { |
| @@ -781,10 +783,11 @@ | |
| 781 | $(OBJDIR)\json_login$O : $(SRCDIR)\json_detail.h |
| 782 | $(OBJDIR)\json_query$O : $(SRCDIR)\json_detail.h |
| 783 | $(OBJDIR)\json_report$O : $(SRCDIR)\json_detail.h |
| 784 | $(OBJDIR)\json_tag$O : $(SRCDIR)\json_detail.h |
| 785 | $(OBJDIR)\json_timeline$O : $(SRCDIR)\json_detail.h |
| 786 | $(OBJDIR)\json_wiki$O : $(SRCDIR)\json_detail.h |
| 787 | |
| 788 | } |
| 789 | foreach s [lsort $src] { |
| 790 | writeln "\$(OX)\\$s\$O : ${s}_.c ${s}.h" |
| 791 |
| --- src/makemake.tcl | |
| +++ src/makemake.tcl | |
| @@ -62,10 +62,11 @@ | |
| 62 | json_login |
| 63 | json_query |
| 64 | json_report |
| 65 | json_tag |
| 66 | json_timeline |
| 67 | json_user |
| 68 | json_wiki |
| 69 | leaf |
| 70 | login |
| 71 | main |
| 72 | manifest |
| @@ -244,11 +245,11 @@ | |
| 245 | writeln "\t\$(OBJDIR)/mkindex \$(TRANS_SRC) >$@" |
| 246 | writeln "\$(OBJDIR)/headers:\t\$(OBJDIR)/page_index.h \$(OBJDIR)/makeheaders \$(OBJDIR)/VERSION.h" |
| 247 | writeln "\t\$(OBJDIR)/makeheaders $mhargs" |
| 248 | writeln "\ttouch \$(OBJDIR)/headers" |
| 249 | writeln "\$(OBJDIR)/headers: Makefile" |
| 250 | writeln "\$(OBJDIR)/json.o \$(OBJDIR)/json_artifact.o \$(OBJDIR)/json_branch.o \$(OBJDIR)/json_diff.o \$(OBJDIR)/json_login.o \$(OBJDIR)/json_query.o \$(OBJDIR)/json_report.o \$(OBJDIR)/json_tag.o \$(OBJDIR)/json_timeline.o \$(OBJDIR)/json_user.o \$(OBJDIR)/json_wiki.o : \$(SRCDIR)/json_detail.h" |
| 251 | writeln "Makefile:" |
| 252 | set extra_h(main) \$(OBJDIR)/page_index.h |
| 253 | |
| 254 | foreach s [lsort $src] { |
| 255 | writeln "\$(OBJDIR)/${s}_.c:\t\$(SRCDIR)/$s.c \$(OBJDIR)/translate" |
| @@ -490,11 +491,11 @@ | |
| 491 | writeln "\t\$(XTCC) $opt -c \$(SRCDIR)/sqlite3.c -o \$(OBJDIR)/sqlite3.o\n" |
| 492 | |
| 493 | set opt {} |
| 494 | writeln "\$(OBJDIR)/cson_amalgamation.o:\t\$(SRCDIR)/cson_amalgamation.c" |
| 495 | writeln "\t\$(XTCC) $opt -c \$(SRCDIR)/cson_amalgamation.c -o \$(OBJDIR)/cson_amalgamation.o -DCSON_FOSSIL_MODE\n" |
| 496 | writeln "\$(OBJDIR)/json.o \$(OBJDIR)/json_artifact.o \$(OBJDIR)/json_branch.o \$(OBJDIR)/json_diff.o \$(OBJDIR)/json_login.o \$(OBJDIR)/json_query.o \$(OBJDIR)/json_report.o \$(OBJDIR)/json_tag.o \$(OBJDIR)/json_timeline.o \$(OBJDIR)/json_user.o \$(OBJDIR)/json_wiki.o : \$(SRCDIR)/json_detail.h" |
| 497 | |
| 498 | writeln "\$(OBJDIR)/shell.o:\t\$(SRCDIR)/shell.c \$(SRCDIR)/sqlite3.h" |
| 499 | set opt {-Dmain=sqlite3_shell} |
| 500 | append opt " -DSQLITE_OMIT_LOAD_EXTENSION=1" |
| 501 | writeln "\t\$(XTCC) $opt -c \$(SRCDIR)/shell.c -o \$(OBJDIR)/shell.o\n" |
| @@ -629,10 +630,11 @@ | |
| 630 | $(OBJDIR)\json_login$O : $(SRCDIR)\json_detail.h |
| 631 | $(OBJDIR)\json_query$O : $(SRCDIR)\json_detail.h |
| 632 | $(OBJDIR)\json_report$O : $(SRCDIR)\json_detail.h |
| 633 | $(OBJDIR)\json_tag$O : $(SRCDIR)\json_detail.h |
| 634 | $(OBJDIR)\json_timeline$O : $(SRCDIR)\json_detail.h |
| 635 | $(OBJDIR)\json_user$O : $(SRCDIR)\json_detail.h |
| 636 | $(OBJDIR)\json_wiki$O : $(SRCDIR)\json_detail.h |
| 637 | |
| 638 | |
| 639 | } |
| 640 | foreach s [lsort $src] { |
| @@ -781,10 +783,11 @@ | |
| 783 | $(OBJDIR)\json_login$O : $(SRCDIR)\json_detail.h |
| 784 | $(OBJDIR)\json_query$O : $(SRCDIR)\json_detail.h |
| 785 | $(OBJDIR)\json_report$O : $(SRCDIR)\json_detail.h |
| 786 | $(OBJDIR)\json_tag$O : $(SRCDIR)\json_detail.h |
| 787 | $(OBJDIR)\json_timeline$O : $(SRCDIR)\json_detail.h |
| 788 | $(OBJDIR)\json_user$O : $(SRCDIR)\json_detail.h |
| 789 | $(OBJDIR)\json_wiki$O : $(SRCDIR)\json_detail.h |
| 790 | |
| 791 | } |
| 792 | foreach s [lsort $src] { |
| 793 | writeln "\$(OX)\\$s\$O : ${s}_.c ${s}.h" |
| 794 |
+11
-4
| --- win/Makefile.dmc | ||
| +++ win/Makefile.dmc | ||
| @@ -22,13 +22,13 @@ | ||
| 22 | 22 | TCC = $(DMDIR)\bin\dmc $(CFLAGS) $(DMCDEF) $(SSL) $(INCL) |
| 23 | 23 | LIBS = $(DMDIR)\extra\lib\ zlib wsock32 |
| 24 | 24 | |
| 25 | 25 | SQLITE_OPTIONS = -DSQLITE_OMIT_LOAD_EXTENSION=1 -DSQLITE_THREADSAFE=0 -DSQLITE_DEFAULT_FILE_FORMAT=4 -DSQLITE_ENABLE_STAT3 -Dlocaltime=fossil_localtime -DSQLITE_ENABLE_LOCKING_STYLE=0 |
| 26 | 26 | |
| 27 | -SRC = add_.c allrepo_.c attach_.c bag_.c bisect_.c blob_.c branch_.c browse_.c captcha_.c cgi_.c checkin_.c checkout_.c clearsign_.c clone_.c comformat_.c configure_.c content_.c db_.c delta_.c deltacmd_.c descendants_.c diff_.c diffcmd_.c doc_.c encode_.c event_.c export_.c file_.c finfo_.c glob_.c graph_.c gzip_.c http_.c http_socket_.c http_ssl_.c http_transport_.c import_.c info_.c json_.c json_artifact_.c json_branch_.c json_diff_.c json_login_.c json_query_.c json_report_.c json_tag_.c json_timeline_.c json_wiki_.c leaf_.c login_.c main_.c manifest_.c md5_.c merge_.c merge3_.c name_.c path_.c pivot_.c popen_.c pqueue_.c printf_.c rebuild_.c report_.c rss_.c schema_.c search_.c setup_.c sha1_.c shun_.c skins_.c sqlcmd_.c stash_.c stat_.c style_.c sync_.c tag_.c tar_.c th_main_.c timeline_.c tkt_.c tktsetup_.c undo_.c update_.c url_.c user_.c verify_.c vfile_.c wiki_.c wikiformat_.c winhttp_.c xfer_.c zip_.c | |
| 27 | +SRC = add_.c allrepo_.c attach_.c bag_.c bisect_.c blob_.c branch_.c browse_.c captcha_.c cgi_.c checkin_.c checkout_.c clearsign_.c clone_.c comformat_.c configure_.c content_.c db_.c delta_.c deltacmd_.c descendants_.c diff_.c diffcmd_.c doc_.c encode_.c event_.c export_.c file_.c finfo_.c glob_.c graph_.c gzip_.c http_.c http_socket_.c http_ssl_.c http_transport_.c import_.c info_.c json_.c json_artifact_.c json_branch_.c json_diff_.c json_login_.c json_query_.c json_report_.c json_tag_.c json_timeline_.c json_user_.c json_wiki_.c leaf_.c login_.c main_.c manifest_.c md5_.c merge_.c merge3_.c name_.c path_.c pivot_.c popen_.c pqueue_.c printf_.c rebuild_.c report_.c rss_.c schema_.c search_.c setup_.c sha1_.c shun_.c skins_.c sqlcmd_.c stash_.c stat_.c style_.c sync_.c tag_.c tar_.c th_main_.c timeline_.c tkt_.c tktsetup_.c undo_.c update_.c url_.c user_.c verify_.c vfile_.c wiki_.c wikiformat_.c winhttp_.c xfer_.c zip_.c | |
| 28 | 28 | |
| 29 | -OBJ = $(OBJDIR)\add$O $(OBJDIR)\allrepo$O $(OBJDIR)\attach$O $(OBJDIR)\bag$O $(OBJDIR)\bisect$O $(OBJDIR)\blob$O $(OBJDIR)\branch$O $(OBJDIR)\browse$O $(OBJDIR)\captcha$O $(OBJDIR)\cgi$O $(OBJDIR)\checkin$O $(OBJDIR)\checkout$O $(OBJDIR)\clearsign$O $(OBJDIR)\clone$O $(OBJDIR)\comformat$O $(OBJDIR)\configure$O $(OBJDIR)\content$O $(OBJDIR)\db$O $(OBJDIR)\delta$O $(OBJDIR)\deltacmd$O $(OBJDIR)\descendants$O $(OBJDIR)\diff$O $(OBJDIR)\diffcmd$O $(OBJDIR)\doc$O $(OBJDIR)\encode$O $(OBJDIR)\event$O $(OBJDIR)\export$O $(OBJDIR)\file$O $(OBJDIR)\finfo$O $(OBJDIR)\glob$O $(OBJDIR)\graph$O $(OBJDIR)\gzip$O $(OBJDIR)\http$O $(OBJDIR)\http_socket$O $(OBJDIR)\http_ssl$O $(OBJDIR)\http_transport$O $(OBJDIR)\import$O $(OBJDIR)\info$O $(OBJDIR)\json$O $(OBJDIR)\json_artifact$O $(OBJDIR)\json_branch$O $(OBJDIR)\json_diff$O $(OBJDIR)\json_login$O $(OBJDIR)\json_query$O $(OBJDIR)\json_report$O $(OBJDIR)\json_tag$O $(OBJDIR)\json_timeline$O $(OBJDIR)\json_wiki$O $(OBJDIR)\leaf$O $(OBJDIR)\login$O $(OBJDIR)\main$O $(OBJDIR)\manifest$O $(OBJDIR)\md5$O $(OBJDIR)\merge$O $(OBJDIR)\merge3$O $(OBJDIR)\name$O $(OBJDIR)\path$O $(OBJDIR)\pivot$O $(OBJDIR)\popen$O $(OBJDIR)\pqueue$O $(OBJDIR)\printf$O $(OBJDIR)\rebuild$O $(OBJDIR)\report$O $(OBJDIR)\rss$O $(OBJDIR)\schema$O $(OBJDIR)\search$O $(OBJDIR)\setup$O $(OBJDIR)\sha1$O $(OBJDIR)\shun$O $(OBJDIR)\skins$O $(OBJDIR)\sqlcmd$O $(OBJDIR)\stash$O $(OBJDIR)\stat$O $(OBJDIR)\style$O $(OBJDIR)\sync$O $(OBJDIR)\tag$O $(OBJDIR)\tar$O $(OBJDIR)\th_main$O $(OBJDIR)\timeline$O $(OBJDIR)\tkt$O $(OBJDIR)\tktsetup$O $(OBJDIR)\undo$O $(OBJDIR)\update$O $(OBJDIR)\url$O $(OBJDIR)\user$O $(OBJDIR)\verify$O $(OBJDIR)\vfile$O $(OBJDIR)\wiki$O $(OBJDIR)\wikiformat$O $(OBJDIR)\winhttp$O $(OBJDIR)\xfer$O $(OBJDIR)\zip$O $(OBJDIR)\shell$O $(OBJDIR)\sqlite3$O $(OBJDIR)\th$O $(OBJDIR)\th_lang$O | |
| 29 | +OBJ = $(OBJDIR)\add$O $(OBJDIR)\allrepo$O $(OBJDIR)\attach$O $(OBJDIR)\bag$O $(OBJDIR)\bisect$O $(OBJDIR)\blob$O $(OBJDIR)\branch$O $(OBJDIR)\browse$O $(OBJDIR)\captcha$O $(OBJDIR)\cgi$O $(OBJDIR)\checkin$O $(OBJDIR)\checkout$O $(OBJDIR)\clearsign$O $(OBJDIR)\clone$O $(OBJDIR)\comformat$O $(OBJDIR)\configure$O $(OBJDIR)\content$O $(OBJDIR)\db$O $(OBJDIR)\delta$O $(OBJDIR)\deltacmd$O $(OBJDIR)\descendants$O $(OBJDIR)\diff$O $(OBJDIR)\diffcmd$O $(OBJDIR)\doc$O $(OBJDIR)\encode$O $(OBJDIR)\event$O $(OBJDIR)\export$O $(OBJDIR)\file$O $(OBJDIR)\finfo$O $(OBJDIR)\glob$O $(OBJDIR)\graph$O $(OBJDIR)\gzip$O $(OBJDIR)\http$O $(OBJDIR)\http_socket$O $(OBJDIR)\http_ssl$O $(OBJDIR)\http_transport$O $(OBJDIR)\import$O $(OBJDIR)\info$O $(OBJDIR)\json$O $(OBJDIR)\json_artifact$O $(OBJDIR)\json_branch$O $(OBJDIR)\json_diff$O $(OBJDIR)\json_login$O $(OBJDIR)\json_query$O $(OBJDIR)\json_report$O $(OBJDIR)\json_tag$O $(OBJDIR)\json_timeline$O $(OBJDIR)\json_user$O $(OBJDIR)\json_wiki$O $(OBJDIR)\leaf$O $(OBJDIR)\login$O $(OBJDIR)\main$O $(OBJDIR)\manifest$O $(OBJDIR)\md5$O $(OBJDIR)\merge$O $(OBJDIR)\merge3$O $(OBJDIR)\name$O $(OBJDIR)\path$O $(OBJDIR)\pivot$O $(OBJDIR)\popen$O $(OBJDIR)\pqueue$O $(OBJDIR)\printf$O $(OBJDIR)\rebuild$O $(OBJDIR)\report$O $(OBJDIR)\rss$O $(OBJDIR)\schema$O $(OBJDIR)\search$O $(OBJDIR)\setup$O $(OBJDIR)\sha1$O $(OBJDIR)\shun$O $(OBJDIR)\skins$O $(OBJDIR)\sqlcmd$O $(OBJDIR)\stash$O $(OBJDIR)\stat$O $(OBJDIR)\style$O $(OBJDIR)\sync$O $(OBJDIR)\tag$O $(OBJDIR)\tar$O $(OBJDIR)\th_main$O $(OBJDIR)\timeline$O $(OBJDIR)\tkt$O $(OBJDIR)\tktsetup$O $(OBJDIR)\undo$O $(OBJDIR)\update$O $(OBJDIR)\url$O $(OBJDIR)\user$O $(OBJDIR)\verify$O $(OBJDIR)\vfile$O $(OBJDIR)\wiki$O $(OBJDIR)\wikiformat$O $(OBJDIR)\winhttp$O $(OBJDIR)\xfer$O $(OBJDIR)\zip$O $(OBJDIR)\shell$O $(OBJDIR)\sqlite3$O $(OBJDIR)\th$O $(OBJDIR)\th_lang$O | |
| 30 | 30 | |
| 31 | 31 | |
| 32 | 32 | RC=$(DMDIR)\bin\rcc |
| 33 | 33 | RCFLAGS=-32 -w1 -I$(SRCDIR) /D__DMC__ |
| 34 | 34 | |
| @@ -42,11 +42,11 @@ | ||
| 42 | 42 | |
| 43 | 43 | $(OBJDIR)\fossil.res: $B\win\fossil.rc |
| 44 | 44 | $(RC) $(RCFLAGS) -o$@ $** |
| 45 | 45 | |
| 46 | 46 | $(OBJDIR)\link: $B\win\Makefile.dmc $(OBJDIR)\fossil.res |
| 47 | - +echo add allrepo attach bag bisect blob branch browse captcha cgi checkin checkout clearsign clone comformat configure content db delta deltacmd descendants diff diffcmd doc encode event export file finfo glob graph gzip http http_socket http_ssl http_transport import info json json_artifact json_branch json_diff json_login json_query json_report json_tag json_timeline json_wiki leaf login main manifest md5 merge merge3 name path pivot popen pqueue printf rebuild report rss schema search setup sha1 shun skins sqlcmd stash stat style sync tag tar th_main timeline tkt tktsetup undo update url user verify vfile wiki wikiformat winhttp xfer zip shell sqlite3 th th_lang > $@ | |
| 47 | + +echo add allrepo attach bag bisect blob branch browse captcha cgi checkin checkout clearsign clone comformat configure content db delta deltacmd descendants diff diffcmd doc encode event export file finfo glob graph gzip http http_socket http_ssl http_transport import info json json_artifact json_branch json_diff json_login json_query json_report json_tag json_timeline json_user json_wiki leaf login main manifest md5 merge merge3 name path pivot popen pqueue printf rebuild report rss schema search setup sha1 shun skins sqlcmd stash stat style sync tag tar th_main timeline tkt tktsetup undo update url user verify vfile wiki wikiformat winhttp xfer zip shell sqlite3 th th_lang > $@ | |
| 48 | 48 | +echo fossil >> $@ |
| 49 | 49 | +echo fossil >> $@ |
| 50 | 50 | +echo $(LIBS) >> $@ |
| 51 | 51 | +echo. >> $@ |
| 52 | 52 | +echo fossil >> $@ |
| @@ -98,10 +98,11 @@ | ||
| 98 | 98 | $(OBJDIR)\json_login$O : $(SRCDIR)\json_detail.h |
| 99 | 99 | $(OBJDIR)\json_query$O : $(SRCDIR)\json_detail.h |
| 100 | 100 | $(OBJDIR)\json_report$O : $(SRCDIR)\json_detail.h |
| 101 | 101 | $(OBJDIR)\json_tag$O : $(SRCDIR)\json_detail.h |
| 102 | 102 | $(OBJDIR)\json_timeline$O : $(SRCDIR)\json_detail.h |
| 103 | +$(OBJDIR)\json_user$O : $(SRCDIR)\json_detail.h | |
| 103 | 104 | $(OBJDIR)\json_wiki$O : $(SRCDIR)\json_detail.h |
| 104 | 105 | |
| 105 | 106 | |
| 106 | 107 | |
| 107 | 108 | $(OBJDIR)\add$O : add_.c add.h |
| @@ -383,10 +384,16 @@ | ||
| 383 | 384 | $(OBJDIR)\json_timeline$O : json_timeline_.c json_timeline.h |
| 384 | 385 | $(TCC) -o$@ -c json_timeline_.c |
| 385 | 386 | |
| 386 | 387 | json_timeline_.c : $(SRCDIR)\json_timeline.c |
| 387 | 388 | +translate$E $** > $@ |
| 389 | + | |
| 390 | +$(OBJDIR)\json_user$O : json_user_.c json_user.h | |
| 391 | + $(TCC) -o$@ -c json_user_.c | |
| 392 | + | |
| 393 | +json_user_.c : $(SRCDIR)\json_user.c | |
| 394 | + +translate$E $** > $@ | |
| 388 | 395 | |
| 389 | 396 | $(OBJDIR)\json_wiki$O : json_wiki_.c json_wiki.h |
| 390 | 397 | $(TCC) -o$@ -c json_wiki_.c |
| 391 | 398 | |
| 392 | 399 | json_wiki_.c : $(SRCDIR)\json_wiki.c |
| @@ -655,7 +662,7 @@ | ||
| 655 | 662 | |
| 656 | 663 | zip_.c : $(SRCDIR)\zip.c |
| 657 | 664 | +translate$E $** > $@ |
| 658 | 665 | |
| 659 | 666 | headers: makeheaders$E page_index.h VERSION.h |
| 660 | - +makeheaders$E add_.c:add.h allrepo_.c:allrepo.h attach_.c:attach.h bag_.c:bag.h bisect_.c:bisect.h blob_.c:blob.h branch_.c:branch.h browse_.c:browse.h captcha_.c:captcha.h cgi_.c:cgi.h checkin_.c:checkin.h checkout_.c:checkout.h clearsign_.c:clearsign.h clone_.c:clone.h comformat_.c:comformat.h configure_.c:configure.h content_.c:content.h db_.c:db.h delta_.c:delta.h deltacmd_.c:deltacmd.h descendants_.c:descendants.h diff_.c:diff.h diffcmd_.c:diffcmd.h doc_.c:doc.h encode_.c:encode.h event_.c:event.h export_.c:export.h file_.c:file.h finfo_.c:finfo.h glob_.c:glob.h graph_.c:graph.h gzip_.c:gzip.h http_.c:http.h http_socket_.c:http_socket.h http_ssl_.c:http_ssl.h http_transport_.c:http_transport.h import_.c:import.h info_.c:info.h json_.c:json.h json_artifact_.c:json_artifact.h json_branch_.c:json_branch.h json_diff_.c:json_diff.h json_login_.c:json_login.h json_query_.c:json_query.h json_report_.c:json_report.h json_tag_.c:json_tag.h json_timeline_.c:json_timeline.h json_wiki_.c:json_wiki.h leaf_.c:leaf.h login_.c:login.h main_.c:main.h manifest_.c:manifest.h md5_.c:md5.h merge_.c:merge.h merge3_.c:merge3.h name_.c:name.h path_.c:path.h pivot_.c:pivot.h popen_.c:popen.h pqueue_.c:pqueue.h printf_.c:printf.h rebuild_.c:rebuild.h report_.c:report.h rss_.c:rss.h schema_.c:schema.h search_.c:search.h setup_.c:setup.h sha1_.c:sha1.h shun_.c:shun.h skins_.c:skins.h sqlcmd_.c:sqlcmd.h stash_.c:stash.h stat_.c:stat.h style_.c:style.h sync_.c:sync.h tag_.c:tag.h tar_.c:tar.h th_main_.c:th_main.h timeline_.c:timeline.h tkt_.c:tkt.h tktsetup_.c:tktsetup.h undo_.c:undo.h update_.c:update.h url_.c:url.h user_.c:user.h verify_.c:verify.h vfile_.c:vfile.h wiki_.c:wiki.h wikiformat_.c:wikiformat.h winhttp_.c:winhttp.h xfer_.c:xfer.h zip_.c:zip.h $(SRCDIR)\sqlite3.h $(SRCDIR)\th.h VERSION.h $(SRCDIR)\cson_amalgamation.h | |
| 667 | + +makeheaders$E add_.c:add.h allrepo_.c:allrepo.h attach_.c:attach.h bag_.c:bag.h bisect_.c:bisect.h blob_.c:blob.h branch_.c:branch.h browse_.c:browse.h captcha_.c:captcha.h cgi_.c:cgi.h checkin_.c:checkin.h checkout_.c:checkout.h clearsign_.c:clearsign.h clone_.c:clone.h comformat_.c:comformat.h configure_.c:configure.h content_.c:content.h db_.c:db.h delta_.c:delta.h deltacmd_.c:deltacmd.h descendants_.c:descendants.h diff_.c:diff.h diffcmd_.c:diffcmd.h doc_.c:doc.h encode_.c:encode.h event_.c:event.h export_.c:export.h file_.c:file.h finfo_.c:finfo.h glob_.c:glob.h graph_.c:graph.h gzip_.c:gzip.h http_.c:http.h http_socket_.c:http_socket.h http_ssl_.c:http_ssl.h http_transport_.c:http_transport.h import_.c:import.h info_.c:info.h json_.c:json.h json_artifact_.c:json_artifact.h json_branch_.c:json_branch.h json_diff_.c:json_diff.h json_login_.c:json_login.h json_query_.c:json_query.h json_report_.c:json_report.h json_tag_.c:json_tag.h json_timeline_.c:json_timeline.h json_user_.c:json_user.h json_wiki_.c:json_wiki.h leaf_.c:leaf.h login_.c:login.h main_.c:main.h manifest_.c:manifest.h md5_.c:md5.h merge_.c:merge.h merge3_.c:merge3.h name_.c:name.h path_.c:path.h pivot_.c:pivot.h popen_.c:popen.h pqueue_.c:pqueue.h printf_.c:printf.h rebuild_.c:rebuild.h report_.c:report.h rss_.c:rss.h schema_.c:schema.h search_.c:search.h setup_.c:setup.h sha1_.c:sha1.h shun_.c:shun.h skins_.c:skins.h sqlcmd_.c:sqlcmd.h stash_.c:stash.h stat_.c:stat.h style_.c:style.h sync_.c:sync.h tag_.c:tag.h tar_.c:tar.h th_main_.c:th_main.h timeline_.c:timeline.h tkt_.c:tkt.h tktsetup_.c:tktsetup.h undo_.c:undo.h update_.c:update.h url_.c:url.h user_.c:user.h verify_.c:verify.h vfile_.c:vfile.h wiki_.c:wiki.h wikiformat_.c:wikiformat.h winhttp_.c:winhttp.h xfer_.c:xfer.h zip_.c:zip.h $(SRCDIR)\sqlite3.h $(SRCDIR)\th.h VERSION.h $(SRCDIR)\cson_amalgamation.h | |
| 661 | 668 | @copy /Y nul: headers |
| 662 | 669 |
| --- win/Makefile.dmc | |
| +++ win/Makefile.dmc | |
| @@ -22,13 +22,13 @@ | |
| 22 | TCC = $(DMDIR)\bin\dmc $(CFLAGS) $(DMCDEF) $(SSL) $(INCL) |
| 23 | LIBS = $(DMDIR)\extra\lib\ zlib wsock32 |
| 24 | |
| 25 | SQLITE_OPTIONS = -DSQLITE_OMIT_LOAD_EXTENSION=1 -DSQLITE_THREADSAFE=0 -DSQLITE_DEFAULT_FILE_FORMAT=4 -DSQLITE_ENABLE_STAT3 -Dlocaltime=fossil_localtime -DSQLITE_ENABLE_LOCKING_STYLE=0 |
| 26 | |
| 27 | SRC = add_.c allrepo_.c attach_.c bag_.c bisect_.c blob_.c branch_.c browse_.c captcha_.c cgi_.c checkin_.c checkout_.c clearsign_.c clone_.c comformat_.c configure_.c content_.c db_.c delta_.c deltacmd_.c descendants_.c diff_.c diffcmd_.c doc_.c encode_.c event_.c export_.c file_.c finfo_.c glob_.c graph_.c gzip_.c http_.c http_socket_.c http_ssl_.c http_transport_.c import_.c info_.c json_.c json_artifact_.c json_branch_.c json_diff_.c json_login_.c json_query_.c json_report_.c json_tag_.c json_timeline_.c json_wiki_.c leaf_.c login_.c main_.c manifest_.c md5_.c merge_.c merge3_.c name_.c path_.c pivot_.c popen_.c pqueue_.c printf_.c rebuild_.c report_.c rss_.c schema_.c search_.c setup_.c sha1_.c shun_.c skins_.c sqlcmd_.c stash_.c stat_.c style_.c sync_.c tag_.c tar_.c th_main_.c timeline_.c tkt_.c tktsetup_.c undo_.c update_.c url_.c user_.c verify_.c vfile_.c wiki_.c wikiformat_.c winhttp_.c xfer_.c zip_.c |
| 28 | |
| 29 | OBJ = $(OBJDIR)\add$O $(OBJDIR)\allrepo$O $(OBJDIR)\attach$O $(OBJDIR)\bag$O $(OBJDIR)\bisect$O $(OBJDIR)\blob$O $(OBJDIR)\branch$O $(OBJDIR)\browse$O $(OBJDIR)\captcha$O $(OBJDIR)\cgi$O $(OBJDIR)\checkin$O $(OBJDIR)\checkout$O $(OBJDIR)\clearsign$O $(OBJDIR)\clone$O $(OBJDIR)\comformat$O $(OBJDIR)\configure$O $(OBJDIR)\content$O $(OBJDIR)\db$O $(OBJDIR)\delta$O $(OBJDIR)\deltacmd$O $(OBJDIR)\descendants$O $(OBJDIR)\diff$O $(OBJDIR)\diffcmd$O $(OBJDIR)\doc$O $(OBJDIR)\encode$O $(OBJDIR)\event$O $(OBJDIR)\export$O $(OBJDIR)\file$O $(OBJDIR)\finfo$O $(OBJDIR)\glob$O $(OBJDIR)\graph$O $(OBJDIR)\gzip$O $(OBJDIR)\http$O $(OBJDIR)\http_socket$O $(OBJDIR)\http_ssl$O $(OBJDIR)\http_transport$O $(OBJDIR)\import$O $(OBJDIR)\info$O $(OBJDIR)\json$O $(OBJDIR)\json_artifact$O $(OBJDIR)\json_branch$O $(OBJDIR)\json_diff$O $(OBJDIR)\json_login$O $(OBJDIR)\json_query$O $(OBJDIR)\json_report$O $(OBJDIR)\json_tag$O $(OBJDIR)\json_timeline$O $(OBJDIR)\json_wiki$O $(OBJDIR)\leaf$O $(OBJDIR)\login$O $(OBJDIR)\main$O $(OBJDIR)\manifest$O $(OBJDIR)\md5$O $(OBJDIR)\merge$O $(OBJDIR)\merge3$O $(OBJDIR)\name$O $(OBJDIR)\path$O $(OBJDIR)\pivot$O $(OBJDIR)\popen$O $(OBJDIR)\pqueue$O $(OBJDIR)\printf$O $(OBJDIR)\rebuild$O $(OBJDIR)\report$O $(OBJDIR)\rss$O $(OBJDIR)\schema$O $(OBJDIR)\search$O $(OBJDIR)\setup$O $(OBJDIR)\sha1$O $(OBJDIR)\shun$O $(OBJDIR)\skins$O $(OBJDIR)\sqlcmd$O $(OBJDIR)\stash$O $(OBJDIR)\stat$O $(OBJDIR)\style$O $(OBJDIR)\sync$O $(OBJDIR)\tag$O $(OBJDIR)\tar$O $(OBJDIR)\th_main$O $(OBJDIR)\timeline$O $(OBJDIR)\tkt$O $(OBJDIR)\tktsetup$O $(OBJDIR)\undo$O $(OBJDIR)\update$O $(OBJDIR)\url$O $(OBJDIR)\user$O $(OBJDIR)\verify$O $(OBJDIR)\vfile$O $(OBJDIR)\wiki$O $(OBJDIR)\wikiformat$O $(OBJDIR)\winhttp$O $(OBJDIR)\xfer$O $(OBJDIR)\zip$O $(OBJDIR)\shell$O $(OBJDIR)\sqlite3$O $(OBJDIR)\th$O $(OBJDIR)\th_lang$O |
| 30 | |
| 31 | |
| 32 | RC=$(DMDIR)\bin\rcc |
| 33 | RCFLAGS=-32 -w1 -I$(SRCDIR) /D__DMC__ |
| 34 | |
| @@ -42,11 +42,11 @@ | |
| 42 | |
| 43 | $(OBJDIR)\fossil.res: $B\win\fossil.rc |
| 44 | $(RC) $(RCFLAGS) -o$@ $** |
| 45 | |
| 46 | $(OBJDIR)\link: $B\win\Makefile.dmc $(OBJDIR)\fossil.res |
| 47 | +echo add allrepo attach bag bisect blob branch browse captcha cgi checkin checkout clearsign clone comformat configure content db delta deltacmd descendants diff diffcmd doc encode event export file finfo glob graph gzip http http_socket http_ssl http_transport import info json json_artifact json_branch json_diff json_login json_query json_report json_tag json_timeline json_wiki leaf login main manifest md5 merge merge3 name path pivot popen pqueue printf rebuild report rss schema search setup sha1 shun skins sqlcmd stash stat style sync tag tar th_main timeline tkt tktsetup undo update url user verify vfile wiki wikiformat winhttp xfer zip shell sqlite3 th th_lang > $@ |
| 48 | +echo fossil >> $@ |
| 49 | +echo fossil >> $@ |
| 50 | +echo $(LIBS) >> $@ |
| 51 | +echo. >> $@ |
| 52 | +echo fossil >> $@ |
| @@ -98,10 +98,11 @@ | |
| 98 | $(OBJDIR)\json_login$O : $(SRCDIR)\json_detail.h |
| 99 | $(OBJDIR)\json_query$O : $(SRCDIR)\json_detail.h |
| 100 | $(OBJDIR)\json_report$O : $(SRCDIR)\json_detail.h |
| 101 | $(OBJDIR)\json_tag$O : $(SRCDIR)\json_detail.h |
| 102 | $(OBJDIR)\json_timeline$O : $(SRCDIR)\json_detail.h |
| 103 | $(OBJDIR)\json_wiki$O : $(SRCDIR)\json_detail.h |
| 104 | |
| 105 | |
| 106 | |
| 107 | $(OBJDIR)\add$O : add_.c add.h |
| @@ -383,10 +384,16 @@ | |
| 383 | $(OBJDIR)\json_timeline$O : json_timeline_.c json_timeline.h |
| 384 | $(TCC) -o$@ -c json_timeline_.c |
| 385 | |
| 386 | json_timeline_.c : $(SRCDIR)\json_timeline.c |
| 387 | +translate$E $** > $@ |
| 388 | |
| 389 | $(OBJDIR)\json_wiki$O : json_wiki_.c json_wiki.h |
| 390 | $(TCC) -o$@ -c json_wiki_.c |
| 391 | |
| 392 | json_wiki_.c : $(SRCDIR)\json_wiki.c |
| @@ -655,7 +662,7 @@ | |
| 655 | |
| 656 | zip_.c : $(SRCDIR)\zip.c |
| 657 | +translate$E $** > $@ |
| 658 | |
| 659 | headers: makeheaders$E page_index.h VERSION.h |
| 660 | +makeheaders$E add_.c:add.h allrepo_.c:allrepo.h attach_.c:attach.h bag_.c:bag.h bisect_.c:bisect.h blob_.c:blob.h branch_.c:branch.h browse_.c:browse.h captcha_.c:captcha.h cgi_.c:cgi.h checkin_.c:checkin.h checkout_.c:checkout.h clearsign_.c:clearsign.h clone_.c:clone.h comformat_.c:comformat.h configure_.c:configure.h content_.c:content.h db_.c:db.h delta_.c:delta.h deltacmd_.c:deltacmd.h descendants_.c:descendants.h diff_.c:diff.h diffcmd_.c:diffcmd.h doc_.c:doc.h encode_.c:encode.h event_.c:event.h export_.c:export.h file_.c:file.h finfo_.c:finfo.h glob_.c:glob.h graph_.c:graph.h gzip_.c:gzip.h http_.c:http.h http_socket_.c:http_socket.h http_ssl_.c:http_ssl.h http_transport_.c:http_transport.h import_.c:import.h info_.c:info.h json_.c:json.h json_artifact_.c:json_artifact.h json_branch_.c:json_branch.h json_diff_.c:json_diff.h json_login_.c:json_login.h json_query_.c:json_query.h json_report_.c:json_report.h json_tag_.c:json_tag.h json_timeline_.c:json_timeline.h json_wiki_.c:json_wiki.h leaf_.c:leaf.h login_.c:login.h main_.c:main.h manifest_.c:manifest.h md5_.c:md5.h merge_.c:merge.h merge3_.c:merge3.h name_.c:name.h path_.c:path.h pivot_.c:pivot.h popen_.c:popen.h pqueue_.c:pqueue.h printf_.c:printf.h rebuild_.c:rebuild.h report_.c:report.h rss_.c:rss.h schema_.c:schema.h search_.c:search.h setup_.c:setup.h sha1_.c:sha1.h shun_.c:shun.h skins_.c:skins.h sqlcmd_.c:sqlcmd.h stash_.c:stash.h stat_.c:stat.h style_.c:style.h sync_.c:sync.h tag_.c:tag.h tar_.c:tar.h th_main_.c:th_main.h timeline_.c:timeline.h tkt_.c:tkt.h tktsetup_.c:tktsetup.h undo_.c:undo.h update_.c:update.h url_.c:url.h user_.c:user.h verify_.c:verify.h vfile_.c:vfile.h wiki_.c:wiki.h wikiformat_.c:wikiformat.h winhttp_.c:winhttp.h xfer_.c:xfer.h zip_.c:zip.h $(SRCDIR)\sqlite3.h $(SRCDIR)\th.h VERSION.h $(SRCDIR)\cson_amalgamation.h |
| 661 | @copy /Y nul: headers |
| 662 |
| --- win/Makefile.dmc | |
| +++ win/Makefile.dmc | |
| @@ -22,13 +22,13 @@ | |
| 22 | TCC = $(DMDIR)\bin\dmc $(CFLAGS) $(DMCDEF) $(SSL) $(INCL) |
| 23 | LIBS = $(DMDIR)\extra\lib\ zlib wsock32 |
| 24 | |
| 25 | SQLITE_OPTIONS = -DSQLITE_OMIT_LOAD_EXTENSION=1 -DSQLITE_THREADSAFE=0 -DSQLITE_DEFAULT_FILE_FORMAT=4 -DSQLITE_ENABLE_STAT3 -Dlocaltime=fossil_localtime -DSQLITE_ENABLE_LOCKING_STYLE=0 |
| 26 | |
| 27 | SRC = add_.c allrepo_.c attach_.c bag_.c bisect_.c blob_.c branch_.c browse_.c captcha_.c cgi_.c checkin_.c checkout_.c clearsign_.c clone_.c comformat_.c configure_.c content_.c db_.c delta_.c deltacmd_.c descendants_.c diff_.c diffcmd_.c doc_.c encode_.c event_.c export_.c file_.c finfo_.c glob_.c graph_.c gzip_.c http_.c http_socket_.c http_ssl_.c http_transport_.c import_.c info_.c json_.c json_artifact_.c json_branch_.c json_diff_.c json_login_.c json_query_.c json_report_.c json_tag_.c json_timeline_.c json_user_.c json_wiki_.c leaf_.c login_.c main_.c manifest_.c md5_.c merge_.c merge3_.c name_.c path_.c pivot_.c popen_.c pqueue_.c printf_.c rebuild_.c report_.c rss_.c schema_.c search_.c setup_.c sha1_.c shun_.c skins_.c sqlcmd_.c stash_.c stat_.c style_.c sync_.c tag_.c tar_.c th_main_.c timeline_.c tkt_.c tktsetup_.c undo_.c update_.c url_.c user_.c verify_.c vfile_.c wiki_.c wikiformat_.c winhttp_.c xfer_.c zip_.c |
| 28 | |
| 29 | OBJ = $(OBJDIR)\add$O $(OBJDIR)\allrepo$O $(OBJDIR)\attach$O $(OBJDIR)\bag$O $(OBJDIR)\bisect$O $(OBJDIR)\blob$O $(OBJDIR)\branch$O $(OBJDIR)\browse$O $(OBJDIR)\captcha$O $(OBJDIR)\cgi$O $(OBJDIR)\checkin$O $(OBJDIR)\checkout$O $(OBJDIR)\clearsign$O $(OBJDIR)\clone$O $(OBJDIR)\comformat$O $(OBJDIR)\configure$O $(OBJDIR)\content$O $(OBJDIR)\db$O $(OBJDIR)\delta$O $(OBJDIR)\deltacmd$O $(OBJDIR)\descendants$O $(OBJDIR)\diff$O $(OBJDIR)\diffcmd$O $(OBJDIR)\doc$O $(OBJDIR)\encode$O $(OBJDIR)\event$O $(OBJDIR)\export$O $(OBJDIR)\file$O $(OBJDIR)\finfo$O $(OBJDIR)\glob$O $(OBJDIR)\graph$O $(OBJDIR)\gzip$O $(OBJDIR)\http$O $(OBJDIR)\http_socket$O $(OBJDIR)\http_ssl$O $(OBJDIR)\http_transport$O $(OBJDIR)\import$O $(OBJDIR)\info$O $(OBJDIR)\json$O $(OBJDIR)\json_artifact$O $(OBJDIR)\json_branch$O $(OBJDIR)\json_diff$O $(OBJDIR)\json_login$O $(OBJDIR)\json_query$O $(OBJDIR)\json_report$O $(OBJDIR)\json_tag$O $(OBJDIR)\json_timeline$O $(OBJDIR)\json_user$O $(OBJDIR)\json_wiki$O $(OBJDIR)\leaf$O $(OBJDIR)\login$O $(OBJDIR)\main$O $(OBJDIR)\manifest$O $(OBJDIR)\md5$O $(OBJDIR)\merge$O $(OBJDIR)\merge3$O $(OBJDIR)\name$O $(OBJDIR)\path$O $(OBJDIR)\pivot$O $(OBJDIR)\popen$O $(OBJDIR)\pqueue$O $(OBJDIR)\printf$O $(OBJDIR)\rebuild$O $(OBJDIR)\report$O $(OBJDIR)\rss$O $(OBJDIR)\schema$O $(OBJDIR)\search$O $(OBJDIR)\setup$O $(OBJDIR)\sha1$O $(OBJDIR)\shun$O $(OBJDIR)\skins$O $(OBJDIR)\sqlcmd$O $(OBJDIR)\stash$O $(OBJDIR)\stat$O $(OBJDIR)\style$O $(OBJDIR)\sync$O $(OBJDIR)\tag$O $(OBJDIR)\tar$O $(OBJDIR)\th_main$O $(OBJDIR)\timeline$O $(OBJDIR)\tkt$O $(OBJDIR)\tktsetup$O $(OBJDIR)\undo$O $(OBJDIR)\update$O $(OBJDIR)\url$O $(OBJDIR)\user$O $(OBJDIR)\verify$O $(OBJDIR)\vfile$O $(OBJDIR)\wiki$O $(OBJDIR)\wikiformat$O $(OBJDIR)\winhttp$O $(OBJDIR)\xfer$O $(OBJDIR)\zip$O $(OBJDIR)\shell$O $(OBJDIR)\sqlite3$O $(OBJDIR)\th$O $(OBJDIR)\th_lang$O |
| 30 | |
| 31 | |
| 32 | RC=$(DMDIR)\bin\rcc |
| 33 | RCFLAGS=-32 -w1 -I$(SRCDIR) /D__DMC__ |
| 34 | |
| @@ -42,11 +42,11 @@ | |
| 42 | |
| 43 | $(OBJDIR)\fossil.res: $B\win\fossil.rc |
| 44 | $(RC) $(RCFLAGS) -o$@ $** |
| 45 | |
| 46 | $(OBJDIR)\link: $B\win\Makefile.dmc $(OBJDIR)\fossil.res |
| 47 | +echo add allrepo attach bag bisect blob branch browse captcha cgi checkin checkout clearsign clone comformat configure content db delta deltacmd descendants diff diffcmd doc encode event export file finfo glob graph gzip http http_socket http_ssl http_transport import info json json_artifact json_branch json_diff json_login json_query json_report json_tag json_timeline json_user json_wiki leaf login main manifest md5 merge merge3 name path pivot popen pqueue printf rebuild report rss schema search setup sha1 shun skins sqlcmd stash stat style sync tag tar th_main timeline tkt tktsetup undo update url user verify vfile wiki wikiformat winhttp xfer zip shell sqlite3 th th_lang > $@ |
| 48 | +echo fossil >> $@ |
| 49 | +echo fossil >> $@ |
| 50 | +echo $(LIBS) >> $@ |
| 51 | +echo. >> $@ |
| 52 | +echo fossil >> $@ |
| @@ -98,10 +98,11 @@ | |
| 98 | $(OBJDIR)\json_login$O : $(SRCDIR)\json_detail.h |
| 99 | $(OBJDIR)\json_query$O : $(SRCDIR)\json_detail.h |
| 100 | $(OBJDIR)\json_report$O : $(SRCDIR)\json_detail.h |
| 101 | $(OBJDIR)\json_tag$O : $(SRCDIR)\json_detail.h |
| 102 | $(OBJDIR)\json_timeline$O : $(SRCDIR)\json_detail.h |
| 103 | $(OBJDIR)\json_user$O : $(SRCDIR)\json_detail.h |
| 104 | $(OBJDIR)\json_wiki$O : $(SRCDIR)\json_detail.h |
| 105 | |
| 106 | |
| 107 | |
| 108 | $(OBJDIR)\add$O : add_.c add.h |
| @@ -383,10 +384,16 @@ | |
| 384 | $(OBJDIR)\json_timeline$O : json_timeline_.c json_timeline.h |
| 385 | $(TCC) -o$@ -c json_timeline_.c |
| 386 | |
| 387 | json_timeline_.c : $(SRCDIR)\json_timeline.c |
| 388 | +translate$E $** > $@ |
| 389 | |
| 390 | $(OBJDIR)\json_user$O : json_user_.c json_user.h |
| 391 | $(TCC) -o$@ -c json_user_.c |
| 392 | |
| 393 | json_user_.c : $(SRCDIR)\json_user.c |
| 394 | +translate$E $** > $@ |
| 395 | |
| 396 | $(OBJDIR)\json_wiki$O : json_wiki_.c json_wiki.h |
| 397 | $(TCC) -o$@ -c json_wiki_.c |
| 398 | |
| 399 | json_wiki_.c : $(SRCDIR)\json_wiki.c |
| @@ -655,7 +662,7 @@ | |
| 662 | |
| 663 | zip_.c : $(SRCDIR)\zip.c |
| 664 | +translate$E $** > $@ |
| 665 | |
| 666 | headers: makeheaders$E page_index.h VERSION.h |
| 667 | +makeheaders$E add_.c:add.h allrepo_.c:allrepo.h attach_.c:attach.h bag_.c:bag.h bisect_.c:bisect.h blob_.c:blob.h branch_.c:branch.h browse_.c:browse.h captcha_.c:captcha.h cgi_.c:cgi.h checkin_.c:checkin.h checkout_.c:checkout.h clearsign_.c:clearsign.h clone_.c:clone.h comformat_.c:comformat.h configure_.c:configure.h content_.c:content.h db_.c:db.h delta_.c:delta.h deltacmd_.c:deltacmd.h descendants_.c:descendants.h diff_.c:diff.h diffcmd_.c:diffcmd.h doc_.c:doc.h encode_.c:encode.h event_.c:event.h export_.c:export.h file_.c:file.h finfo_.c:finfo.h glob_.c:glob.h graph_.c:graph.h gzip_.c:gzip.h http_.c:http.h http_socket_.c:http_socket.h http_ssl_.c:http_ssl.h http_transport_.c:http_transport.h import_.c:import.h info_.c:info.h json_.c:json.h json_artifact_.c:json_artifact.h json_branch_.c:json_branch.h json_diff_.c:json_diff.h json_login_.c:json_login.h json_query_.c:json_query.h json_report_.c:json_report.h json_tag_.c:json_tag.h json_timeline_.c:json_timeline.h json_user_.c:json_user.h json_wiki_.c:json_wiki.h leaf_.c:leaf.h login_.c:login.h main_.c:main.h manifest_.c:manifest.h md5_.c:md5.h merge_.c:merge.h merge3_.c:merge3.h name_.c:name.h path_.c:path.h pivot_.c:pivot.h popen_.c:popen.h pqueue_.c:pqueue.h printf_.c:printf.h rebuild_.c:rebuild.h report_.c:report.h rss_.c:rss.h schema_.c:schema.h search_.c:search.h setup_.c:setup.h sha1_.c:sha1.h shun_.c:shun.h skins_.c:skins.h sqlcmd_.c:sqlcmd.h stash_.c:stash.h stat_.c:stat.h style_.c:style.h sync_.c:sync.h tag_.c:tag.h tar_.c:tar.h th_main_.c:th_main.h timeline_.c:timeline.h tkt_.c:tkt.h tktsetup_.c:tktsetup.h undo_.c:undo.h update_.c:update.h url_.c:url.h user_.c:user.h verify_.c:verify.h vfile_.c:vfile.h wiki_.c:wiki.h wikiformat_.c:wikiformat.h winhttp_.c:winhttp.h xfer_.c:xfer.h zip_.c:zip.h $(SRCDIR)\sqlite3.h $(SRCDIR)\th.h VERSION.h $(SRCDIR)\cson_amalgamation.h |
| 668 | @copy /Y nul: headers |
| 669 |
+12
-2
| --- win/Makefile.mingw | ||
| +++ win/Makefile.mingw | ||
| @@ -119,10 +119,11 @@ | ||
| 119 | 119 | $(SRCDIR)/json_login.c \ |
| 120 | 120 | $(SRCDIR)/json_query.c \ |
| 121 | 121 | $(SRCDIR)/json_report.c \ |
| 122 | 122 | $(SRCDIR)/json_tag.c \ |
| 123 | 123 | $(SRCDIR)/json_timeline.c \ |
| 124 | + $(SRCDIR)/json_user.c \ | |
| 124 | 125 | $(SRCDIR)/json_wiki.c \ |
| 125 | 126 | $(SRCDIR)/leaf.c \ |
| 126 | 127 | $(SRCDIR)/login.c \ |
| 127 | 128 | $(SRCDIR)/main.c \ |
| 128 | 129 | $(SRCDIR)/manifest.c \ |
| @@ -213,10 +214,11 @@ | ||
| 213 | 214 | $(OBJDIR)/json_login_.c \ |
| 214 | 215 | $(OBJDIR)/json_query_.c \ |
| 215 | 216 | $(OBJDIR)/json_report_.c \ |
| 216 | 217 | $(OBJDIR)/json_tag_.c \ |
| 217 | 218 | $(OBJDIR)/json_timeline_.c \ |
| 219 | + $(OBJDIR)/json_user_.c \ | |
| 218 | 220 | $(OBJDIR)/json_wiki_.c \ |
| 219 | 221 | $(OBJDIR)/leaf_.c \ |
| 220 | 222 | $(OBJDIR)/login_.c \ |
| 221 | 223 | $(OBJDIR)/main_.c \ |
| 222 | 224 | $(OBJDIR)/manifest_.c \ |
| @@ -307,10 +309,11 @@ | ||
| 307 | 309 | $(OBJDIR)/json_login.o \ |
| 308 | 310 | $(OBJDIR)/json_query.o \ |
| 309 | 311 | $(OBJDIR)/json_report.o \ |
| 310 | 312 | $(OBJDIR)/json_tag.o \ |
| 311 | 313 | $(OBJDIR)/json_timeline.o \ |
| 314 | + $(OBJDIR)/json_user.o \ | |
| 312 | 315 | $(OBJDIR)/json_wiki.o \ |
| 313 | 316 | $(OBJDIR)/leaf.o \ |
| 314 | 317 | $(OBJDIR)/login.o \ |
| 315 | 318 | $(OBJDIR)/main.o \ |
| 316 | 319 | $(OBJDIR)/manifest.o \ |
| @@ -418,11 +421,11 @@ | ||
| 418 | 421 | |
| 419 | 422 | |
| 420 | 423 | $(OBJDIR)/page_index.h: $(TRANS_SRC) $(OBJDIR)/mkindex |
| 421 | 424 | $(MKINDEX) $(TRANS_SRC) >$@ |
| 422 | 425 | $(OBJDIR)/headers: $(OBJDIR)/page_index.h $(OBJDIR)/makeheaders $(OBJDIR)/VERSION.h |
| 423 | - $(MAKEHEADERS) $(OBJDIR)/add_.c:$(OBJDIR)/add.h $(OBJDIR)/allrepo_.c:$(OBJDIR)/allrepo.h $(OBJDIR)/attach_.c:$(OBJDIR)/attach.h $(OBJDIR)/bag_.c:$(OBJDIR)/bag.h $(OBJDIR)/bisect_.c:$(OBJDIR)/bisect.h $(OBJDIR)/blob_.c:$(OBJDIR)/blob.h $(OBJDIR)/branch_.c:$(OBJDIR)/branch.h $(OBJDIR)/browse_.c:$(OBJDIR)/browse.h $(OBJDIR)/captcha_.c:$(OBJDIR)/captcha.h $(OBJDIR)/cgi_.c:$(OBJDIR)/cgi.h $(OBJDIR)/checkin_.c:$(OBJDIR)/checkin.h $(OBJDIR)/checkout_.c:$(OBJDIR)/checkout.h $(OBJDIR)/clearsign_.c:$(OBJDIR)/clearsign.h $(OBJDIR)/clone_.c:$(OBJDIR)/clone.h $(OBJDIR)/comformat_.c:$(OBJDIR)/comformat.h $(OBJDIR)/configure_.c:$(OBJDIR)/configure.h $(OBJDIR)/content_.c:$(OBJDIR)/content.h $(OBJDIR)/db_.c:$(OBJDIR)/db.h $(OBJDIR)/delta_.c:$(OBJDIR)/delta.h $(OBJDIR)/deltacmd_.c:$(OBJDIR)/deltacmd.h $(OBJDIR)/descendants_.c:$(OBJDIR)/descendants.h $(OBJDIR)/diff_.c:$(OBJDIR)/diff.h $(OBJDIR)/diffcmd_.c:$(OBJDIR)/diffcmd.h $(OBJDIR)/doc_.c:$(OBJDIR)/doc.h $(OBJDIR)/encode_.c:$(OBJDIR)/encode.h $(OBJDIR)/event_.c:$(OBJDIR)/event.h $(OBJDIR)/export_.c:$(OBJDIR)/export.h $(OBJDIR)/file_.c:$(OBJDIR)/file.h $(OBJDIR)/finfo_.c:$(OBJDIR)/finfo.h $(OBJDIR)/glob_.c:$(OBJDIR)/glob.h $(OBJDIR)/graph_.c:$(OBJDIR)/graph.h $(OBJDIR)/gzip_.c:$(OBJDIR)/gzip.h $(OBJDIR)/http_.c:$(OBJDIR)/http.h $(OBJDIR)/http_socket_.c:$(OBJDIR)/http_socket.h $(OBJDIR)/http_ssl_.c:$(OBJDIR)/http_ssl.h $(OBJDIR)/http_transport_.c:$(OBJDIR)/http_transport.h $(OBJDIR)/import_.c:$(OBJDIR)/import.h $(OBJDIR)/info_.c:$(OBJDIR)/info.h $(OBJDIR)/json_.c:$(OBJDIR)/json.h $(OBJDIR)/json_artifact_.c:$(OBJDIR)/json_artifact.h $(OBJDIR)/json_branch_.c:$(OBJDIR)/json_branch.h $(OBJDIR)/json_diff_.c:$(OBJDIR)/json_diff.h $(OBJDIR)/json_login_.c:$(OBJDIR)/json_login.h $(OBJDIR)/json_query_.c:$(OBJDIR)/json_query.h $(OBJDIR)/json_report_.c:$(OBJDIR)/json_report.h $(OBJDIR)/json_tag_.c:$(OBJDIR)/json_tag.h $(OBJDIR)/json_timeline_.c:$(OBJDIR)/json_timeline.h $(OBJDIR)/json_wiki_.c:$(OBJDIR)/json_wiki.h $(OBJDIR)/leaf_.c:$(OBJDIR)/leaf.h $(OBJDIR)/login_.c:$(OBJDIR)/login.h $(OBJDIR)/main_.c:$(OBJDIR)/main.h $(OBJDIR)/manifest_.c:$(OBJDIR)/manifest.h $(OBJDIR)/md5_.c:$(OBJDIR)/md5.h $(OBJDIR)/merge_.c:$(OBJDIR)/merge.h $(OBJDIR)/merge3_.c:$(OBJDIR)/merge3.h $(OBJDIR)/name_.c:$(OBJDIR)/name.h $(OBJDIR)/path_.c:$(OBJDIR)/path.h $(OBJDIR)/pivot_.c:$(OBJDIR)/pivot.h $(OBJDIR)/popen_.c:$(OBJDIR)/popen.h $(OBJDIR)/pqueue_.c:$(OBJDIR)/pqueue.h $(OBJDIR)/printf_.c:$(OBJDIR)/printf.h $(OBJDIR)/rebuild_.c:$(OBJDIR)/rebuild.h $(OBJDIR)/report_.c:$(OBJDIR)/report.h $(OBJDIR)/rss_.c:$(OBJDIR)/rss.h $(OBJDIR)/schema_.c:$(OBJDIR)/schema.h $(OBJDIR)/search_.c:$(OBJDIR)/search.h $(OBJDIR)/setup_.c:$(OBJDIR)/setup.h $(OBJDIR)/sha1_.c:$(OBJDIR)/sha1.h $(OBJDIR)/shun_.c:$(OBJDIR)/shun.h $(OBJDIR)/skins_.c:$(OBJDIR)/skins.h $(OBJDIR)/sqlcmd_.c:$(OBJDIR)/sqlcmd.h $(OBJDIR)/stash_.c:$(OBJDIR)/stash.h $(OBJDIR)/stat_.c:$(OBJDIR)/stat.h $(OBJDIR)/style_.c:$(OBJDIR)/style.h $(OBJDIR)/sync_.c:$(OBJDIR)/sync.h $(OBJDIR)/tag_.c:$(OBJDIR)/tag.h $(OBJDIR)/tar_.c:$(OBJDIR)/tar.h $(OBJDIR)/th_main_.c:$(OBJDIR)/th_main.h $(OBJDIR)/timeline_.c:$(OBJDIR)/timeline.h $(OBJDIR)/tkt_.c:$(OBJDIR)/tkt.h $(OBJDIR)/tktsetup_.c:$(OBJDIR)/tktsetup.h $(OBJDIR)/undo_.c:$(OBJDIR)/undo.h $(OBJDIR)/update_.c:$(OBJDIR)/update.h $(OBJDIR)/url_.c:$(OBJDIR)/url.h $(OBJDIR)/user_.c:$(OBJDIR)/user.h $(OBJDIR)/verify_.c:$(OBJDIR)/verify.h $(OBJDIR)/vfile_.c:$(OBJDIR)/vfile.h $(OBJDIR)/wiki_.c:$(OBJDIR)/wiki.h $(OBJDIR)/wikiformat_.c:$(OBJDIR)/wikiformat.h $(OBJDIR)/winhttp_.c:$(OBJDIR)/winhttp.h $(OBJDIR)/xfer_.c:$(OBJDIR)/xfer.h $(OBJDIR)/zip_.c:$(OBJDIR)/zip.h $(SRCDIR)/sqlite3.h $(SRCDIR)/th.h $(OBJDIR)/VERSION.h | |
| 426 | + $(MAKEHEADERS) $(OBJDIR)/add_.c:$(OBJDIR)/add.h $(OBJDIR)/allrepo_.c:$(OBJDIR)/allrepo.h $(OBJDIR)/attach_.c:$(OBJDIR)/attach.h $(OBJDIR)/bag_.c:$(OBJDIR)/bag.h $(OBJDIR)/bisect_.c:$(OBJDIR)/bisect.h $(OBJDIR)/blob_.c:$(OBJDIR)/blob.h $(OBJDIR)/branch_.c:$(OBJDIR)/branch.h $(OBJDIR)/browse_.c:$(OBJDIR)/browse.h $(OBJDIR)/captcha_.c:$(OBJDIR)/captcha.h $(OBJDIR)/cgi_.c:$(OBJDIR)/cgi.h $(OBJDIR)/checkin_.c:$(OBJDIR)/checkin.h $(OBJDIR)/checkout_.c:$(OBJDIR)/checkout.h $(OBJDIR)/clearsign_.c:$(OBJDIR)/clearsign.h $(OBJDIR)/clone_.c:$(OBJDIR)/clone.h $(OBJDIR)/comformat_.c:$(OBJDIR)/comformat.h $(OBJDIR)/configure_.c:$(OBJDIR)/configure.h $(OBJDIR)/content_.c:$(OBJDIR)/content.h $(OBJDIR)/db_.c:$(OBJDIR)/db.h $(OBJDIR)/delta_.c:$(OBJDIR)/delta.h $(OBJDIR)/deltacmd_.c:$(OBJDIR)/deltacmd.h $(OBJDIR)/descendants_.c:$(OBJDIR)/descendants.h $(OBJDIR)/diff_.c:$(OBJDIR)/diff.h $(OBJDIR)/diffcmd_.c:$(OBJDIR)/diffcmd.h $(OBJDIR)/doc_.c:$(OBJDIR)/doc.h $(OBJDIR)/encode_.c:$(OBJDIR)/encode.h $(OBJDIR)/event_.c:$(OBJDIR)/event.h $(OBJDIR)/export_.c:$(OBJDIR)/export.h $(OBJDIR)/file_.c:$(OBJDIR)/file.h $(OBJDIR)/finfo_.c:$(OBJDIR)/finfo.h $(OBJDIR)/glob_.c:$(OBJDIR)/glob.h $(OBJDIR)/graph_.c:$(OBJDIR)/graph.h $(OBJDIR)/gzip_.c:$(OBJDIR)/gzip.h $(OBJDIR)/http_.c:$(OBJDIR)/http.h $(OBJDIR)/http_socket_.c:$(OBJDIR)/http_socket.h $(OBJDIR)/http_ssl_.c:$(OBJDIR)/http_ssl.h $(OBJDIR)/http_transport_.c:$(OBJDIR)/http_transport.h $(OBJDIR)/import_.c:$(OBJDIR)/import.h $(OBJDIR)/info_.c:$(OBJDIR)/info.h $(OBJDIR)/json_.c:$(OBJDIR)/json.h $(OBJDIR)/json_artifact_.c:$(OBJDIR)/json_artifact.h $(OBJDIR)/json_branch_.c:$(OBJDIR)/json_branch.h $(OBJDIR)/json_diff_.c:$(OBJDIR)/json_diff.h $(OBJDIR)/json_login_.c:$(OBJDIR)/json_login.h $(OBJDIR)/json_query_.c:$(OBJDIR)/json_query.h $(OBJDIR)/json_report_.c:$(OBJDIR)/json_report.h $(OBJDIR)/json_tag_.c:$(OBJDIR)/json_tag.h $(OBJDIR)/json_timeline_.c:$(OBJDIR)/json_timeline.h $(OBJDIR)/json_user_.c:$(OBJDIR)/json_user.h $(OBJDIR)/json_wiki_.c:$(OBJDIR)/json_wiki.h $(OBJDIR)/leaf_.c:$(OBJDIR)/leaf.h $(OBJDIR)/login_.c:$(OBJDIR)/login.h $(OBJDIR)/main_.c:$(OBJDIR)/main.h $(OBJDIR)/manifest_.c:$(OBJDIR)/manifest.h $(OBJDIR)/md5_.c:$(OBJDIR)/md5.h $(OBJDIR)/merge_.c:$(OBJDIR)/merge.h $(OBJDIR)/merge3_.c:$(OBJDIR)/merge3.h $(OBJDIR)/name_.c:$(OBJDIR)/name.h $(OBJDIR)/path_.c:$(OBJDIR)/path.h $(OBJDIR)/pivot_.c:$(OBJDIR)/pivot.h $(OBJDIR)/popen_.c:$(OBJDIR)/popen.h $(OBJDIR)/pqueue_.c:$(OBJDIR)/pqueue.h $(OBJDIR)/printf_.c:$(OBJDIR)/printf.h $(OBJDIR)/rebuild_.c:$(OBJDIR)/rebuild.h $(OBJDIR)/report_.c:$(OBJDIR)/report.h $(OBJDIR)/rss_.c:$(OBJDIR)/rss.h $(OBJDIR)/schema_.c:$(OBJDIR)/schema.h $(OBJDIR)/search_.c:$(OBJDIR)/search.h $(OBJDIR)/setup_.c:$(OBJDIR)/setup.h $(OBJDIR)/sha1_.c:$(OBJDIR)/sha1.h $(OBJDIR)/shun_.c:$(OBJDIR)/shun.h $(OBJDIR)/skins_.c:$(OBJDIR)/skins.h $(OBJDIR)/sqlcmd_.c:$(OBJDIR)/sqlcmd.h $(OBJDIR)/stash_.c:$(OBJDIR)/stash.h $(OBJDIR)/stat_.c:$(OBJDIR)/stat.h $(OBJDIR)/style_.c:$(OBJDIR)/style.h $(OBJDIR)/sync_.c:$(OBJDIR)/sync.h $(OBJDIR)/tag_.c:$(OBJDIR)/tag.h $(OBJDIR)/tar_.c:$(OBJDIR)/tar.h $(OBJDIR)/th_main_.c:$(OBJDIR)/th_main.h $(OBJDIR)/timeline_.c:$(OBJDIR)/timeline.h $(OBJDIR)/tkt_.c:$(OBJDIR)/tkt.h $(OBJDIR)/tktsetup_.c:$(OBJDIR)/tktsetup.h $(OBJDIR)/undo_.c:$(OBJDIR)/undo.h $(OBJDIR)/update_.c:$(OBJDIR)/update.h $(OBJDIR)/url_.c:$(OBJDIR)/url.h $(OBJDIR)/user_.c:$(OBJDIR)/user.h $(OBJDIR)/verify_.c:$(OBJDIR)/verify.h $(OBJDIR)/vfile_.c:$(OBJDIR)/vfile.h $(OBJDIR)/wiki_.c:$(OBJDIR)/wiki.h $(OBJDIR)/wikiformat_.c:$(OBJDIR)/wikiformat.h $(OBJDIR)/winhttp_.c:$(OBJDIR)/winhttp.h $(OBJDIR)/xfer_.c:$(OBJDIR)/xfer.h $(OBJDIR)/zip_.c:$(OBJDIR)/zip.h $(SRCDIR)/sqlite3.h $(SRCDIR)/th.h $(OBJDIR)/VERSION.h | |
| 424 | 427 | echo Done >$(OBJDIR)/headers |
| 425 | 428 | |
| 426 | 429 | $(OBJDIR)/headers: Makefile |
| 427 | 430 | Makefile: |
| 428 | 431 | $(OBJDIR)/add_.c: $(SRCDIR)/add.c $(OBJDIR)/translate |
| @@ -752,10 +755,17 @@ | ||
| 752 | 755 | |
| 753 | 756 | $(OBJDIR)/json_timeline.o: $(OBJDIR)/json_timeline_.c $(OBJDIR)/json_timeline.h $(SRCDIR)/config.h |
| 754 | 757 | $(XTCC) -o $(OBJDIR)/json_timeline.o -c $(OBJDIR)/json_timeline_.c |
| 755 | 758 | |
| 756 | 759 | json_timeline.h: $(OBJDIR)/headers |
| 760 | +$(OBJDIR)/json_user_.c: $(SRCDIR)/json_user.c $(OBJDIR)/translate | |
| 761 | + $(TRANSLATE) $(SRCDIR)/json_user.c >$(OBJDIR)/json_user_.c | |
| 762 | + | |
| 763 | +$(OBJDIR)/json_user.o: $(OBJDIR)/json_user_.c $(OBJDIR)/json_user.h $(SRCDIR)/config.h | |
| 764 | + $(XTCC) -o $(OBJDIR)/json_user.o -c $(OBJDIR)/json_user_.c | |
| 765 | + | |
| 766 | +json_user.h: $(OBJDIR)/headers | |
| 757 | 767 | $(OBJDIR)/json_wiki_.c: $(SRCDIR)/json_wiki.c $(OBJDIR)/translate |
| 758 | 768 | $(TRANSLATE) $(SRCDIR)/json_wiki.c >$(OBJDIR)/json_wiki_.c |
| 759 | 769 | |
| 760 | 770 | $(OBJDIR)/json_wiki.o: $(OBJDIR)/json_wiki_.c $(OBJDIR)/json_wiki.h $(SRCDIR)/config.h |
| 761 | 771 | $(XTCC) -o $(OBJDIR)/json_wiki.o -c $(OBJDIR)/json_wiki_.c |
| @@ -1073,15 +1083,15 @@ | ||
| 1073 | 1083 | $(XTCC) -DSQLITE_OMIT_LOAD_EXTENSION=1 -DSQLITE_THREADSAFE=0 -DSQLITE_DEFAULT_FILE_FORMAT=4 -DSQLITE_ENABLE_STAT3 -Dlocaltime=fossil_localtime -DSQLITE_ENABLE_LOCKING_STYLE=0 -c $(SRCDIR)/sqlite3.c -o $(OBJDIR)/sqlite3.o |
| 1074 | 1084 | |
| 1075 | 1085 | $(OBJDIR)/cson_amalgamation.o: $(SRCDIR)/cson_amalgamation.c |
| 1076 | 1086 | $(XTCC) -c $(SRCDIR)/cson_amalgamation.c -o $(OBJDIR)/cson_amalgamation.o -DCSON_FOSSIL_MODE |
| 1077 | 1087 | |
| 1078 | -$(OBJDIR)/json.o $(OBJDIR)/json_artifact.o $(OBJDIR)/json_branch.o $(OBJDIR)/json_diff.o $(OBJDIR)/json_login.o $(OBJDIR)/json_query.o $(OBJDIR)/json_report.o $(OBJDIR)/json_tag.o $(OBJDIR)/json_timeline.o $(OBJDIR)/json_wiki.o : $(SRCDIR)/json_detail.h | |
| 1088 | +$(OBJDIR)/json.o $(OBJDIR)/json_artifact.o $(OBJDIR)/json_branch.o $(OBJDIR)/json_diff.o $(OBJDIR)/json_login.o $(OBJDIR)/json_query.o $(OBJDIR)/json_report.o $(OBJDIR)/json_tag.o $(OBJDIR)/json_timeline.o $(OBJDIR)/json_user.o $(OBJDIR)/json_wiki.o : $(SRCDIR)/json_detail.h | |
| 1079 | 1089 | $(OBJDIR)/shell.o: $(SRCDIR)/shell.c $(SRCDIR)/sqlite3.h |
| 1080 | 1090 | $(XTCC) -Dmain=sqlite3_shell -DSQLITE_OMIT_LOAD_EXTENSION=1 -c $(SRCDIR)/shell.c -o $(OBJDIR)/shell.o |
| 1081 | 1091 | |
| 1082 | 1092 | $(OBJDIR)/th.o: $(SRCDIR)/th.c |
| 1083 | 1093 | $(XTCC) -I$(SRCDIR) -c $(SRCDIR)/th.c -o $(OBJDIR)/th.o |
| 1084 | 1094 | |
| 1085 | 1095 | $(OBJDIR)/th_lang.o: $(SRCDIR)/th_lang.c |
| 1086 | 1096 | $(XTCC) -I$(SRCDIR) -c $(SRCDIR)/th_lang.c -o $(OBJDIR)/th_lang.o |
| 1087 | 1097 | |
| 1088 | 1098 |
| --- win/Makefile.mingw | |
| +++ win/Makefile.mingw | |
| @@ -119,10 +119,11 @@ | |
| 119 | $(SRCDIR)/json_login.c \ |
| 120 | $(SRCDIR)/json_query.c \ |
| 121 | $(SRCDIR)/json_report.c \ |
| 122 | $(SRCDIR)/json_tag.c \ |
| 123 | $(SRCDIR)/json_timeline.c \ |
| 124 | $(SRCDIR)/json_wiki.c \ |
| 125 | $(SRCDIR)/leaf.c \ |
| 126 | $(SRCDIR)/login.c \ |
| 127 | $(SRCDIR)/main.c \ |
| 128 | $(SRCDIR)/manifest.c \ |
| @@ -213,10 +214,11 @@ | |
| 213 | $(OBJDIR)/json_login_.c \ |
| 214 | $(OBJDIR)/json_query_.c \ |
| 215 | $(OBJDIR)/json_report_.c \ |
| 216 | $(OBJDIR)/json_tag_.c \ |
| 217 | $(OBJDIR)/json_timeline_.c \ |
| 218 | $(OBJDIR)/json_wiki_.c \ |
| 219 | $(OBJDIR)/leaf_.c \ |
| 220 | $(OBJDIR)/login_.c \ |
| 221 | $(OBJDIR)/main_.c \ |
| 222 | $(OBJDIR)/manifest_.c \ |
| @@ -307,10 +309,11 @@ | |
| 307 | $(OBJDIR)/json_login.o \ |
| 308 | $(OBJDIR)/json_query.o \ |
| 309 | $(OBJDIR)/json_report.o \ |
| 310 | $(OBJDIR)/json_tag.o \ |
| 311 | $(OBJDIR)/json_timeline.o \ |
| 312 | $(OBJDIR)/json_wiki.o \ |
| 313 | $(OBJDIR)/leaf.o \ |
| 314 | $(OBJDIR)/login.o \ |
| 315 | $(OBJDIR)/main.o \ |
| 316 | $(OBJDIR)/manifest.o \ |
| @@ -418,11 +421,11 @@ | |
| 418 | |
| 419 | |
| 420 | $(OBJDIR)/page_index.h: $(TRANS_SRC) $(OBJDIR)/mkindex |
| 421 | $(MKINDEX) $(TRANS_SRC) >$@ |
| 422 | $(OBJDIR)/headers: $(OBJDIR)/page_index.h $(OBJDIR)/makeheaders $(OBJDIR)/VERSION.h |
| 423 | $(MAKEHEADERS) $(OBJDIR)/add_.c:$(OBJDIR)/add.h $(OBJDIR)/allrepo_.c:$(OBJDIR)/allrepo.h $(OBJDIR)/attach_.c:$(OBJDIR)/attach.h $(OBJDIR)/bag_.c:$(OBJDIR)/bag.h $(OBJDIR)/bisect_.c:$(OBJDIR)/bisect.h $(OBJDIR)/blob_.c:$(OBJDIR)/blob.h $(OBJDIR)/branch_.c:$(OBJDIR)/branch.h $(OBJDIR)/browse_.c:$(OBJDIR)/browse.h $(OBJDIR)/captcha_.c:$(OBJDIR)/captcha.h $(OBJDIR)/cgi_.c:$(OBJDIR)/cgi.h $(OBJDIR)/checkin_.c:$(OBJDIR)/checkin.h $(OBJDIR)/checkout_.c:$(OBJDIR)/checkout.h $(OBJDIR)/clearsign_.c:$(OBJDIR)/clearsign.h $(OBJDIR)/clone_.c:$(OBJDIR)/clone.h $(OBJDIR)/comformat_.c:$(OBJDIR)/comformat.h $(OBJDIR)/configure_.c:$(OBJDIR)/configure.h $(OBJDIR)/content_.c:$(OBJDIR)/content.h $(OBJDIR)/db_.c:$(OBJDIR)/db.h $(OBJDIR)/delta_.c:$(OBJDIR)/delta.h $(OBJDIR)/deltacmd_.c:$(OBJDIR)/deltacmd.h $(OBJDIR)/descendants_.c:$(OBJDIR)/descendants.h $(OBJDIR)/diff_.c:$(OBJDIR)/diff.h $(OBJDIR)/diffcmd_.c:$(OBJDIR)/diffcmd.h $(OBJDIR)/doc_.c:$(OBJDIR)/doc.h $(OBJDIR)/encode_.c:$(OBJDIR)/encode.h $(OBJDIR)/event_.c:$(OBJDIR)/event.h $(OBJDIR)/export_.c:$(OBJDIR)/export.h $(OBJDIR)/file_.c:$(OBJDIR)/file.h $(OBJDIR)/finfo_.c:$(OBJDIR)/finfo.h $(OBJDIR)/glob_.c:$(OBJDIR)/glob.h $(OBJDIR)/graph_.c:$(OBJDIR)/graph.h $(OBJDIR)/gzip_.c:$(OBJDIR)/gzip.h $(OBJDIR)/http_.c:$(OBJDIR)/http.h $(OBJDIR)/http_socket_.c:$(OBJDIR)/http_socket.h $(OBJDIR)/http_ssl_.c:$(OBJDIR)/http_ssl.h $(OBJDIR)/http_transport_.c:$(OBJDIR)/http_transport.h $(OBJDIR)/import_.c:$(OBJDIR)/import.h $(OBJDIR)/info_.c:$(OBJDIR)/info.h $(OBJDIR)/json_.c:$(OBJDIR)/json.h $(OBJDIR)/json_artifact_.c:$(OBJDIR)/json_artifact.h $(OBJDIR)/json_branch_.c:$(OBJDIR)/json_branch.h $(OBJDIR)/json_diff_.c:$(OBJDIR)/json_diff.h $(OBJDIR)/json_login_.c:$(OBJDIR)/json_login.h $(OBJDIR)/json_query_.c:$(OBJDIR)/json_query.h $(OBJDIR)/json_report_.c:$(OBJDIR)/json_report.h $(OBJDIR)/json_tag_.c:$(OBJDIR)/json_tag.h $(OBJDIR)/json_timeline_.c:$(OBJDIR)/json_timeline.h $(OBJDIR)/json_wiki_.c:$(OBJDIR)/json_wiki.h $(OBJDIR)/leaf_.c:$(OBJDIR)/leaf.h $(OBJDIR)/login_.c:$(OBJDIR)/login.h $(OBJDIR)/main_.c:$(OBJDIR)/main.h $(OBJDIR)/manifest_.c:$(OBJDIR)/manifest.h $(OBJDIR)/md5_.c:$(OBJDIR)/md5.h $(OBJDIR)/merge_.c:$(OBJDIR)/merge.h $(OBJDIR)/merge3_.c:$(OBJDIR)/merge3.h $(OBJDIR)/name_.c:$(OBJDIR)/name.h $(OBJDIR)/path_.c:$(OBJDIR)/path.h $(OBJDIR)/pivot_.c:$(OBJDIR)/pivot.h $(OBJDIR)/popen_.c:$(OBJDIR)/popen.h $(OBJDIR)/pqueue_.c:$(OBJDIR)/pqueue.h $(OBJDIR)/printf_.c:$(OBJDIR)/printf.h $(OBJDIR)/rebuild_.c:$(OBJDIR)/rebuild.h $(OBJDIR)/report_.c:$(OBJDIR)/report.h $(OBJDIR)/rss_.c:$(OBJDIR)/rss.h $(OBJDIR)/schema_.c:$(OBJDIR)/schema.h $(OBJDIR)/search_.c:$(OBJDIR)/search.h $(OBJDIR)/setup_.c:$(OBJDIR)/setup.h $(OBJDIR)/sha1_.c:$(OBJDIR)/sha1.h $(OBJDIR)/shun_.c:$(OBJDIR)/shun.h $(OBJDIR)/skins_.c:$(OBJDIR)/skins.h $(OBJDIR)/sqlcmd_.c:$(OBJDIR)/sqlcmd.h $(OBJDIR)/stash_.c:$(OBJDIR)/stash.h $(OBJDIR)/stat_.c:$(OBJDIR)/stat.h $(OBJDIR)/style_.c:$(OBJDIR)/style.h $(OBJDIR)/sync_.c:$(OBJDIR)/sync.h $(OBJDIR)/tag_.c:$(OBJDIR)/tag.h $(OBJDIR)/tar_.c:$(OBJDIR)/tar.h $(OBJDIR)/th_main_.c:$(OBJDIR)/th_main.h $(OBJDIR)/timeline_.c:$(OBJDIR)/timeline.h $(OBJDIR)/tkt_.c:$(OBJDIR)/tkt.h $(OBJDIR)/tktsetup_.c:$(OBJDIR)/tktsetup.h $(OBJDIR)/undo_.c:$(OBJDIR)/undo.h $(OBJDIR)/update_.c:$(OBJDIR)/update.h $(OBJDIR)/url_.c:$(OBJDIR)/url.h $(OBJDIR)/user_.c:$(OBJDIR)/user.h $(OBJDIR)/verify_.c:$(OBJDIR)/verify.h $(OBJDIR)/vfile_.c:$(OBJDIR)/vfile.h $(OBJDIR)/wiki_.c:$(OBJDIR)/wiki.h $(OBJDIR)/wikiformat_.c:$(OBJDIR)/wikiformat.h $(OBJDIR)/winhttp_.c:$(OBJDIR)/winhttp.h $(OBJDIR)/xfer_.c:$(OBJDIR)/xfer.h $(OBJDIR)/zip_.c:$(OBJDIR)/zip.h $(SRCDIR)/sqlite3.h $(SRCDIR)/th.h $(OBJDIR)/VERSION.h |
| 424 | echo Done >$(OBJDIR)/headers |
| 425 | |
| 426 | $(OBJDIR)/headers: Makefile |
| 427 | Makefile: |
| 428 | $(OBJDIR)/add_.c: $(SRCDIR)/add.c $(OBJDIR)/translate |
| @@ -752,10 +755,17 @@ | |
| 752 | |
| 753 | $(OBJDIR)/json_timeline.o: $(OBJDIR)/json_timeline_.c $(OBJDIR)/json_timeline.h $(SRCDIR)/config.h |
| 754 | $(XTCC) -o $(OBJDIR)/json_timeline.o -c $(OBJDIR)/json_timeline_.c |
| 755 | |
| 756 | json_timeline.h: $(OBJDIR)/headers |
| 757 | $(OBJDIR)/json_wiki_.c: $(SRCDIR)/json_wiki.c $(OBJDIR)/translate |
| 758 | $(TRANSLATE) $(SRCDIR)/json_wiki.c >$(OBJDIR)/json_wiki_.c |
| 759 | |
| 760 | $(OBJDIR)/json_wiki.o: $(OBJDIR)/json_wiki_.c $(OBJDIR)/json_wiki.h $(SRCDIR)/config.h |
| 761 | $(XTCC) -o $(OBJDIR)/json_wiki.o -c $(OBJDIR)/json_wiki_.c |
| @@ -1073,15 +1083,15 @@ | |
| 1073 | $(XTCC) -DSQLITE_OMIT_LOAD_EXTENSION=1 -DSQLITE_THREADSAFE=0 -DSQLITE_DEFAULT_FILE_FORMAT=4 -DSQLITE_ENABLE_STAT3 -Dlocaltime=fossil_localtime -DSQLITE_ENABLE_LOCKING_STYLE=0 -c $(SRCDIR)/sqlite3.c -o $(OBJDIR)/sqlite3.o |
| 1074 | |
| 1075 | $(OBJDIR)/cson_amalgamation.o: $(SRCDIR)/cson_amalgamation.c |
| 1076 | $(XTCC) -c $(SRCDIR)/cson_amalgamation.c -o $(OBJDIR)/cson_amalgamation.o -DCSON_FOSSIL_MODE |
| 1077 | |
| 1078 | $(OBJDIR)/json.o $(OBJDIR)/json_artifact.o $(OBJDIR)/json_branch.o $(OBJDIR)/json_diff.o $(OBJDIR)/json_login.o $(OBJDIR)/json_query.o $(OBJDIR)/json_report.o $(OBJDIR)/json_tag.o $(OBJDIR)/json_timeline.o $(OBJDIR)/json_wiki.o : $(SRCDIR)/json_detail.h |
| 1079 | $(OBJDIR)/shell.o: $(SRCDIR)/shell.c $(SRCDIR)/sqlite3.h |
| 1080 | $(XTCC) -Dmain=sqlite3_shell -DSQLITE_OMIT_LOAD_EXTENSION=1 -c $(SRCDIR)/shell.c -o $(OBJDIR)/shell.o |
| 1081 | |
| 1082 | $(OBJDIR)/th.o: $(SRCDIR)/th.c |
| 1083 | $(XTCC) -I$(SRCDIR) -c $(SRCDIR)/th.c -o $(OBJDIR)/th.o |
| 1084 | |
| 1085 | $(OBJDIR)/th_lang.o: $(SRCDIR)/th_lang.c |
| 1086 | $(XTCC) -I$(SRCDIR) -c $(SRCDIR)/th_lang.c -o $(OBJDIR)/th_lang.o |
| 1087 | |
| 1088 |
| --- win/Makefile.mingw | |
| +++ win/Makefile.mingw | |
| @@ -119,10 +119,11 @@ | |
| 119 | $(SRCDIR)/json_login.c \ |
| 120 | $(SRCDIR)/json_query.c \ |
| 121 | $(SRCDIR)/json_report.c \ |
| 122 | $(SRCDIR)/json_tag.c \ |
| 123 | $(SRCDIR)/json_timeline.c \ |
| 124 | $(SRCDIR)/json_user.c \ |
| 125 | $(SRCDIR)/json_wiki.c \ |
| 126 | $(SRCDIR)/leaf.c \ |
| 127 | $(SRCDIR)/login.c \ |
| 128 | $(SRCDIR)/main.c \ |
| 129 | $(SRCDIR)/manifest.c \ |
| @@ -213,10 +214,11 @@ | |
| 214 | $(OBJDIR)/json_login_.c \ |
| 215 | $(OBJDIR)/json_query_.c \ |
| 216 | $(OBJDIR)/json_report_.c \ |
| 217 | $(OBJDIR)/json_tag_.c \ |
| 218 | $(OBJDIR)/json_timeline_.c \ |
| 219 | $(OBJDIR)/json_user_.c \ |
| 220 | $(OBJDIR)/json_wiki_.c \ |
| 221 | $(OBJDIR)/leaf_.c \ |
| 222 | $(OBJDIR)/login_.c \ |
| 223 | $(OBJDIR)/main_.c \ |
| 224 | $(OBJDIR)/manifest_.c \ |
| @@ -307,10 +309,11 @@ | |
| 309 | $(OBJDIR)/json_login.o \ |
| 310 | $(OBJDIR)/json_query.o \ |
| 311 | $(OBJDIR)/json_report.o \ |
| 312 | $(OBJDIR)/json_tag.o \ |
| 313 | $(OBJDIR)/json_timeline.o \ |
| 314 | $(OBJDIR)/json_user.o \ |
| 315 | $(OBJDIR)/json_wiki.o \ |
| 316 | $(OBJDIR)/leaf.o \ |
| 317 | $(OBJDIR)/login.o \ |
| 318 | $(OBJDIR)/main.o \ |
| 319 | $(OBJDIR)/manifest.o \ |
| @@ -418,11 +421,11 @@ | |
| 421 | |
| 422 | |
| 423 | $(OBJDIR)/page_index.h: $(TRANS_SRC) $(OBJDIR)/mkindex |
| 424 | $(MKINDEX) $(TRANS_SRC) >$@ |
| 425 | $(OBJDIR)/headers: $(OBJDIR)/page_index.h $(OBJDIR)/makeheaders $(OBJDIR)/VERSION.h |
| 426 | $(MAKEHEADERS) $(OBJDIR)/add_.c:$(OBJDIR)/add.h $(OBJDIR)/allrepo_.c:$(OBJDIR)/allrepo.h $(OBJDIR)/attach_.c:$(OBJDIR)/attach.h $(OBJDIR)/bag_.c:$(OBJDIR)/bag.h $(OBJDIR)/bisect_.c:$(OBJDIR)/bisect.h $(OBJDIR)/blob_.c:$(OBJDIR)/blob.h $(OBJDIR)/branch_.c:$(OBJDIR)/branch.h $(OBJDIR)/browse_.c:$(OBJDIR)/browse.h $(OBJDIR)/captcha_.c:$(OBJDIR)/captcha.h $(OBJDIR)/cgi_.c:$(OBJDIR)/cgi.h $(OBJDIR)/checkin_.c:$(OBJDIR)/checkin.h $(OBJDIR)/checkout_.c:$(OBJDIR)/checkout.h $(OBJDIR)/clearsign_.c:$(OBJDIR)/clearsign.h $(OBJDIR)/clone_.c:$(OBJDIR)/clone.h $(OBJDIR)/comformat_.c:$(OBJDIR)/comformat.h $(OBJDIR)/configure_.c:$(OBJDIR)/configure.h $(OBJDIR)/content_.c:$(OBJDIR)/content.h $(OBJDIR)/db_.c:$(OBJDIR)/db.h $(OBJDIR)/delta_.c:$(OBJDIR)/delta.h $(OBJDIR)/deltacmd_.c:$(OBJDIR)/deltacmd.h $(OBJDIR)/descendants_.c:$(OBJDIR)/descendants.h $(OBJDIR)/diff_.c:$(OBJDIR)/diff.h $(OBJDIR)/diffcmd_.c:$(OBJDIR)/diffcmd.h $(OBJDIR)/doc_.c:$(OBJDIR)/doc.h $(OBJDIR)/encode_.c:$(OBJDIR)/encode.h $(OBJDIR)/event_.c:$(OBJDIR)/event.h $(OBJDIR)/export_.c:$(OBJDIR)/export.h $(OBJDIR)/file_.c:$(OBJDIR)/file.h $(OBJDIR)/finfo_.c:$(OBJDIR)/finfo.h $(OBJDIR)/glob_.c:$(OBJDIR)/glob.h $(OBJDIR)/graph_.c:$(OBJDIR)/graph.h $(OBJDIR)/gzip_.c:$(OBJDIR)/gzip.h $(OBJDIR)/http_.c:$(OBJDIR)/http.h $(OBJDIR)/http_socket_.c:$(OBJDIR)/http_socket.h $(OBJDIR)/http_ssl_.c:$(OBJDIR)/http_ssl.h $(OBJDIR)/http_transport_.c:$(OBJDIR)/http_transport.h $(OBJDIR)/import_.c:$(OBJDIR)/import.h $(OBJDIR)/info_.c:$(OBJDIR)/info.h $(OBJDIR)/json_.c:$(OBJDIR)/json.h $(OBJDIR)/json_artifact_.c:$(OBJDIR)/json_artifact.h $(OBJDIR)/json_branch_.c:$(OBJDIR)/json_branch.h $(OBJDIR)/json_diff_.c:$(OBJDIR)/json_diff.h $(OBJDIR)/json_login_.c:$(OBJDIR)/json_login.h $(OBJDIR)/json_query_.c:$(OBJDIR)/json_query.h $(OBJDIR)/json_report_.c:$(OBJDIR)/json_report.h $(OBJDIR)/json_tag_.c:$(OBJDIR)/json_tag.h $(OBJDIR)/json_timeline_.c:$(OBJDIR)/json_timeline.h $(OBJDIR)/json_user_.c:$(OBJDIR)/json_user.h $(OBJDIR)/json_wiki_.c:$(OBJDIR)/json_wiki.h $(OBJDIR)/leaf_.c:$(OBJDIR)/leaf.h $(OBJDIR)/login_.c:$(OBJDIR)/login.h $(OBJDIR)/main_.c:$(OBJDIR)/main.h $(OBJDIR)/manifest_.c:$(OBJDIR)/manifest.h $(OBJDIR)/md5_.c:$(OBJDIR)/md5.h $(OBJDIR)/merge_.c:$(OBJDIR)/merge.h $(OBJDIR)/merge3_.c:$(OBJDIR)/merge3.h $(OBJDIR)/name_.c:$(OBJDIR)/name.h $(OBJDIR)/path_.c:$(OBJDIR)/path.h $(OBJDIR)/pivot_.c:$(OBJDIR)/pivot.h $(OBJDIR)/popen_.c:$(OBJDIR)/popen.h $(OBJDIR)/pqueue_.c:$(OBJDIR)/pqueue.h $(OBJDIR)/printf_.c:$(OBJDIR)/printf.h $(OBJDIR)/rebuild_.c:$(OBJDIR)/rebuild.h $(OBJDIR)/report_.c:$(OBJDIR)/report.h $(OBJDIR)/rss_.c:$(OBJDIR)/rss.h $(OBJDIR)/schema_.c:$(OBJDIR)/schema.h $(OBJDIR)/search_.c:$(OBJDIR)/search.h $(OBJDIR)/setup_.c:$(OBJDIR)/setup.h $(OBJDIR)/sha1_.c:$(OBJDIR)/sha1.h $(OBJDIR)/shun_.c:$(OBJDIR)/shun.h $(OBJDIR)/skins_.c:$(OBJDIR)/skins.h $(OBJDIR)/sqlcmd_.c:$(OBJDIR)/sqlcmd.h $(OBJDIR)/stash_.c:$(OBJDIR)/stash.h $(OBJDIR)/stat_.c:$(OBJDIR)/stat.h $(OBJDIR)/style_.c:$(OBJDIR)/style.h $(OBJDIR)/sync_.c:$(OBJDIR)/sync.h $(OBJDIR)/tag_.c:$(OBJDIR)/tag.h $(OBJDIR)/tar_.c:$(OBJDIR)/tar.h $(OBJDIR)/th_main_.c:$(OBJDIR)/th_main.h $(OBJDIR)/timeline_.c:$(OBJDIR)/timeline.h $(OBJDIR)/tkt_.c:$(OBJDIR)/tkt.h $(OBJDIR)/tktsetup_.c:$(OBJDIR)/tktsetup.h $(OBJDIR)/undo_.c:$(OBJDIR)/undo.h $(OBJDIR)/update_.c:$(OBJDIR)/update.h $(OBJDIR)/url_.c:$(OBJDIR)/url.h $(OBJDIR)/user_.c:$(OBJDIR)/user.h $(OBJDIR)/verify_.c:$(OBJDIR)/verify.h $(OBJDIR)/vfile_.c:$(OBJDIR)/vfile.h $(OBJDIR)/wiki_.c:$(OBJDIR)/wiki.h $(OBJDIR)/wikiformat_.c:$(OBJDIR)/wikiformat.h $(OBJDIR)/winhttp_.c:$(OBJDIR)/winhttp.h $(OBJDIR)/xfer_.c:$(OBJDIR)/xfer.h $(OBJDIR)/zip_.c:$(OBJDIR)/zip.h $(SRCDIR)/sqlite3.h $(SRCDIR)/th.h $(OBJDIR)/VERSION.h |
| 427 | echo Done >$(OBJDIR)/headers |
| 428 | |
| 429 | $(OBJDIR)/headers: Makefile |
| 430 | Makefile: |
| 431 | $(OBJDIR)/add_.c: $(SRCDIR)/add.c $(OBJDIR)/translate |
| @@ -752,10 +755,17 @@ | |
| 755 | |
| 756 | $(OBJDIR)/json_timeline.o: $(OBJDIR)/json_timeline_.c $(OBJDIR)/json_timeline.h $(SRCDIR)/config.h |
| 757 | $(XTCC) -o $(OBJDIR)/json_timeline.o -c $(OBJDIR)/json_timeline_.c |
| 758 | |
| 759 | json_timeline.h: $(OBJDIR)/headers |
| 760 | $(OBJDIR)/json_user_.c: $(SRCDIR)/json_user.c $(OBJDIR)/translate |
| 761 | $(TRANSLATE) $(SRCDIR)/json_user.c >$(OBJDIR)/json_user_.c |
| 762 | |
| 763 | $(OBJDIR)/json_user.o: $(OBJDIR)/json_user_.c $(OBJDIR)/json_user.h $(SRCDIR)/config.h |
| 764 | $(XTCC) -o $(OBJDIR)/json_user.o -c $(OBJDIR)/json_user_.c |
| 765 | |
| 766 | json_user.h: $(OBJDIR)/headers |
| 767 | $(OBJDIR)/json_wiki_.c: $(SRCDIR)/json_wiki.c $(OBJDIR)/translate |
| 768 | $(TRANSLATE) $(SRCDIR)/json_wiki.c >$(OBJDIR)/json_wiki_.c |
| 769 | |
| 770 | $(OBJDIR)/json_wiki.o: $(OBJDIR)/json_wiki_.c $(OBJDIR)/json_wiki.h $(SRCDIR)/config.h |
| 771 | $(XTCC) -o $(OBJDIR)/json_wiki.o -c $(OBJDIR)/json_wiki_.c |
| @@ -1073,15 +1083,15 @@ | |
| 1083 | $(XTCC) -DSQLITE_OMIT_LOAD_EXTENSION=1 -DSQLITE_THREADSAFE=0 -DSQLITE_DEFAULT_FILE_FORMAT=4 -DSQLITE_ENABLE_STAT3 -Dlocaltime=fossil_localtime -DSQLITE_ENABLE_LOCKING_STYLE=0 -c $(SRCDIR)/sqlite3.c -o $(OBJDIR)/sqlite3.o |
| 1084 | |
| 1085 | $(OBJDIR)/cson_amalgamation.o: $(SRCDIR)/cson_amalgamation.c |
| 1086 | $(XTCC) -c $(SRCDIR)/cson_amalgamation.c -o $(OBJDIR)/cson_amalgamation.o -DCSON_FOSSIL_MODE |
| 1087 | |
| 1088 | $(OBJDIR)/json.o $(OBJDIR)/json_artifact.o $(OBJDIR)/json_branch.o $(OBJDIR)/json_diff.o $(OBJDIR)/json_login.o $(OBJDIR)/json_query.o $(OBJDIR)/json_report.o $(OBJDIR)/json_tag.o $(OBJDIR)/json_timeline.o $(OBJDIR)/json_user.o $(OBJDIR)/json_wiki.o : $(SRCDIR)/json_detail.h |
| 1089 | $(OBJDIR)/shell.o: $(SRCDIR)/shell.c $(SRCDIR)/sqlite3.h |
| 1090 | $(XTCC) -Dmain=sqlite3_shell -DSQLITE_OMIT_LOAD_EXTENSION=1 -c $(SRCDIR)/shell.c -o $(OBJDIR)/shell.o |
| 1091 | |
| 1092 | $(OBJDIR)/th.o: $(SRCDIR)/th.c |
| 1093 | $(XTCC) -I$(SRCDIR) -c $(SRCDIR)/th.c -o $(OBJDIR)/th.o |
| 1094 | |
| 1095 | $(OBJDIR)/th_lang.o: $(SRCDIR)/th_lang.c |
| 1096 | $(XTCC) -I$(SRCDIR) -c $(SRCDIR)/th_lang.c -o $(OBJDIR)/th_lang.o |
| 1097 | |
| 1098 |
+11
-3
| --- win/Makefile.msc | ||
| +++ win/Makefile.msc | ||
| @@ -36,13 +36,13 @@ | ||
| 36 | 36 | LIBS = $(ZLIB) ws2_32.lib advapi32.lib $(SSLLIB) |
| 37 | 37 | LIBDIR = -LIBPATH:$(MSCDIR)\extra\lib -LIBPATH:$(ZLIBDIR) |
| 38 | 38 | |
| 39 | 39 | SQLITE_OPTIONS = /DSQLITE_OMIT_LOAD_EXTENSION=1 /DSQLITE_THREADSAFE=0 /DSQLITE_DEFAULT_FILE_FORMAT=4 /DSQLITE_ENABLE_STAT3 /Dlocaltime=fossil_localtime /DSQLITE_ENABLE_LOCKING_STYLE=0 |
| 40 | 40 | |
| 41 | -SRC = add_.c allrepo_.c attach_.c bag_.c bisect_.c blob_.c branch_.c browse_.c captcha_.c cgi_.c checkin_.c checkout_.c clearsign_.c clone_.c comformat_.c configure_.c content_.c db_.c delta_.c deltacmd_.c descendants_.c diff_.c diffcmd_.c doc_.c encode_.c event_.c export_.c file_.c finfo_.c glob_.c graph_.c gzip_.c http_.c http_socket_.c http_ssl_.c http_transport_.c import_.c info_.c json_.c json_artifact_.c json_branch_.c json_diff_.c json_login_.c json_query_.c json_report_.c json_tag_.c json_timeline_.c json_wiki_.c leaf_.c login_.c main_.c manifest_.c md5_.c merge_.c merge3_.c name_.c path_.c pivot_.c popen_.c pqueue_.c printf_.c rebuild_.c report_.c rss_.c schema_.c search_.c setup_.c sha1_.c shun_.c skins_.c sqlcmd_.c stash_.c stat_.c style_.c sync_.c tag_.c tar_.c th_main_.c timeline_.c tkt_.c tktsetup_.c undo_.c update_.c url_.c user_.c verify_.c vfile_.c wiki_.c wikiformat_.c winhttp_.c xfer_.c zip_.c | |
| 41 | +SRC = add_.c allrepo_.c attach_.c bag_.c bisect_.c blob_.c branch_.c browse_.c captcha_.c cgi_.c checkin_.c checkout_.c clearsign_.c clone_.c comformat_.c configure_.c content_.c db_.c delta_.c deltacmd_.c descendants_.c diff_.c diffcmd_.c doc_.c encode_.c event_.c export_.c file_.c finfo_.c glob_.c graph_.c gzip_.c http_.c http_socket_.c http_ssl_.c http_transport_.c import_.c info_.c json_.c json_artifact_.c json_branch_.c json_diff_.c json_login_.c json_query_.c json_report_.c json_tag_.c json_timeline_.c json_user_.c json_wiki_.c leaf_.c login_.c main_.c manifest_.c md5_.c merge_.c merge3_.c name_.c path_.c pivot_.c popen_.c pqueue_.c printf_.c rebuild_.c report_.c rss_.c schema_.c search_.c setup_.c sha1_.c shun_.c skins_.c sqlcmd_.c stash_.c stat_.c style_.c sync_.c tag_.c tar_.c th_main_.c timeline_.c tkt_.c tktsetup_.c undo_.c update_.c url_.c user_.c verify_.c vfile_.c wiki_.c wikiformat_.c winhttp_.c xfer_.c zip_.c | |
| 42 | 42 | |
| 43 | -OBJ = $(OX)\add$O $(OX)\allrepo$O $(OX)\attach$O $(OX)\bag$O $(OX)\bisect$O $(OX)\blob$O $(OX)\branch$O $(OX)\browse$O $(OX)\captcha$O $(OX)\cgi$O $(OX)\checkin$O $(OX)\checkout$O $(OX)\clearsign$O $(OX)\clone$O $(OX)\comformat$O $(OX)\configure$O $(OX)\content$O $(OX)\db$O $(OX)\delta$O $(OX)\deltacmd$O $(OX)\descendants$O $(OX)\diff$O $(OX)\diffcmd$O $(OX)\doc$O $(OX)\encode$O $(OX)\event$O $(OX)\export$O $(OX)\file$O $(OX)\finfo$O $(OX)\glob$O $(OX)\graph$O $(OX)\gzip$O $(OX)\http$O $(OX)\http_socket$O $(OX)\http_ssl$O $(OX)\http_transport$O $(OX)\import$O $(OX)\info$O $(OX)\json$O $(OX)\json_artifact$O $(OX)\json_branch$O $(OX)\json_diff$O $(OX)\json_login$O $(OX)\json_query$O $(OX)\json_report$O $(OX)\json_tag$O $(OX)\json_timeline$O $(OX)\json_wiki$O $(OX)\leaf$O $(OX)\login$O $(OX)\main$O $(OX)\manifest$O $(OX)\md5$O $(OX)\merge$O $(OX)\merge3$O $(OX)\name$O $(OX)\path$O $(OX)\pivot$O $(OX)\popen$O $(OX)\pqueue$O $(OX)\printf$O $(OX)\rebuild$O $(OX)\report$O $(OX)\rss$O $(OX)\schema$O $(OX)\search$O $(OX)\setup$O $(OX)\sha1$O $(OX)\shun$O $(OX)\skins$O $(OX)\sqlcmd$O $(OX)\stash$O $(OX)\stat$O $(OX)\style$O $(OX)\sync$O $(OX)\tag$O $(OX)\tar$O $(OX)\th_main$O $(OX)\timeline$O $(OX)\tkt$O $(OX)\tktsetup$O $(OX)\undo$O $(OX)\update$O $(OX)\url$O $(OX)\user$O $(OX)\verify$O $(OX)\vfile$O $(OX)\wiki$O $(OX)\wikiformat$O $(OX)\winhttp$O $(OX)\xfer$O $(OX)\zip$O $(OX)\shell$O $(OX)\sqlite3$O $(OX)\th$O $(OX)\th_lang$O | |
| 43 | +OBJ = $(OX)\add$O $(OX)\allrepo$O $(OX)\attach$O $(OX)\bag$O $(OX)\bisect$O $(OX)\blob$O $(OX)\branch$O $(OX)\browse$O $(OX)\captcha$O $(OX)\cgi$O $(OX)\checkin$O $(OX)\checkout$O $(OX)\clearsign$O $(OX)\clone$O $(OX)\comformat$O $(OX)\configure$O $(OX)\content$O $(OX)\db$O $(OX)\delta$O $(OX)\deltacmd$O $(OX)\descendants$O $(OX)\diff$O $(OX)\diffcmd$O $(OX)\doc$O $(OX)\encode$O $(OX)\event$O $(OX)\export$O $(OX)\file$O $(OX)\finfo$O $(OX)\glob$O $(OX)\graph$O $(OX)\gzip$O $(OX)\http$O $(OX)\http_socket$O $(OX)\http_ssl$O $(OX)\http_transport$O $(OX)\import$O $(OX)\info$O $(OX)\json$O $(OX)\json_artifact$O $(OX)\json_branch$O $(OX)\json_diff$O $(OX)\json_login$O $(OX)\json_query$O $(OX)\json_report$O $(OX)\json_tag$O $(OX)\json_timeline$O $(OX)\json_user$O $(OX)\json_wiki$O $(OX)\leaf$O $(OX)\login$O $(OX)\main$O $(OX)\manifest$O $(OX)\md5$O $(OX)\merge$O $(OX)\merge3$O $(OX)\name$O $(OX)\path$O $(OX)\pivot$O $(OX)\popen$O $(OX)\pqueue$O $(OX)\printf$O $(OX)\rebuild$O $(OX)\report$O $(OX)\rss$O $(OX)\schema$O $(OX)\search$O $(OX)\setup$O $(OX)\sha1$O $(OX)\shun$O $(OX)\skins$O $(OX)\sqlcmd$O $(OX)\stash$O $(OX)\stat$O $(OX)\style$O $(OX)\sync$O $(OX)\tag$O $(OX)\tar$O $(OX)\th_main$O $(OX)\timeline$O $(OX)\tkt$O $(OX)\tktsetup$O $(OX)\undo$O $(OX)\update$O $(OX)\url$O $(OX)\user$O $(OX)\verify$O $(OX)\vfile$O $(OX)\wiki$O $(OX)\wikiformat$O $(OX)\winhttp$O $(OX)\xfer$O $(OX)\zip$O $(OX)\shell$O $(OX)\sqlite3$O $(OX)\th$O $(OX)\th_lang$O | |
| 44 | 44 | |
| 45 | 45 | |
| 46 | 46 | APPNAME = $(OX)\fossil$(E) |
| 47 | 47 | |
| 48 | 48 | all: $(OX) $(APPNAME) |
| @@ -97,10 +97,11 @@ | ||
| 97 | 97 | echo $(OX)\json_login.obj >> $@ |
| 98 | 98 | echo $(OX)\json_query.obj >> $@ |
| 99 | 99 | echo $(OX)\json_report.obj >> $@ |
| 100 | 100 | echo $(OX)\json_tag.obj >> $@ |
| 101 | 101 | echo $(OX)\json_timeline.obj >> $@ |
| 102 | + echo $(OX)\json_user.obj >> $@ | |
| 102 | 103 | echo $(OX)\json_wiki.obj >> $@ |
| 103 | 104 | echo $(OX)\leaf.obj >> $@ |
| 104 | 105 | echo $(OX)\login.obj >> $@ |
| 105 | 106 | echo $(OX)\main.obj >> $@ |
| 106 | 107 | echo $(OX)\manifest.obj >> $@ |
| @@ -203,10 +204,11 @@ | ||
| 203 | 204 | $(OBJDIR)\json_login$O : $(SRCDIR)\json_detail.h |
| 204 | 205 | $(OBJDIR)\json_query$O : $(SRCDIR)\json_detail.h |
| 205 | 206 | $(OBJDIR)\json_report$O : $(SRCDIR)\json_detail.h |
| 206 | 207 | $(OBJDIR)\json_tag$O : $(SRCDIR)\json_detail.h |
| 207 | 208 | $(OBJDIR)\json_timeline$O : $(SRCDIR)\json_detail.h |
| 209 | +$(OBJDIR)\json_user$O : $(SRCDIR)\json_detail.h | |
| 208 | 210 | $(OBJDIR)\json_wiki$O : $(SRCDIR)\json_detail.h |
| 209 | 211 | |
| 210 | 212 | |
| 211 | 213 | $(OX)\add$O : add_.c add.h |
| 212 | 214 | $(TCC) /Fo$@ -c add_.c |
| @@ -487,10 +489,16 @@ | ||
| 487 | 489 | $(OX)\json_timeline$O : json_timeline_.c json_timeline.h |
| 488 | 490 | $(TCC) /Fo$@ -c json_timeline_.c |
| 489 | 491 | |
| 490 | 492 | json_timeline_.c : $(SRCDIR)\json_timeline.c |
| 491 | 493 | translate$E $** > $@ |
| 494 | + | |
| 495 | +$(OX)\json_user$O : json_user_.c json_user.h | |
| 496 | + $(TCC) /Fo$@ -c json_user_.c | |
| 497 | + | |
| 498 | +json_user_.c : $(SRCDIR)\json_user.c | |
| 499 | + translate$E $** > $@ | |
| 492 | 500 | |
| 493 | 501 | $(OX)\json_wiki$O : json_wiki_.c json_wiki.h |
| 494 | 502 | $(TCC) /Fo$@ -c json_wiki_.c |
| 495 | 503 | |
| 496 | 504 | json_wiki_.c : $(SRCDIR)\json_wiki.c |
| @@ -759,7 +767,7 @@ | ||
| 759 | 767 | |
| 760 | 768 | zip_.c : $(SRCDIR)\zip.c |
| 761 | 769 | translate$E $** > $@ |
| 762 | 770 | |
| 763 | 771 | headers: makeheaders$E page_index.h VERSION.h |
| 764 | - makeheaders$E add_.c:add.h allrepo_.c:allrepo.h attach_.c:attach.h bag_.c:bag.h bisect_.c:bisect.h blob_.c:blob.h branch_.c:branch.h browse_.c:browse.h captcha_.c:captcha.h cgi_.c:cgi.h checkin_.c:checkin.h checkout_.c:checkout.h clearsign_.c:clearsign.h clone_.c:clone.h comformat_.c:comformat.h configure_.c:configure.h content_.c:content.h db_.c:db.h delta_.c:delta.h deltacmd_.c:deltacmd.h descendants_.c:descendants.h diff_.c:diff.h diffcmd_.c:diffcmd.h doc_.c:doc.h encode_.c:encode.h event_.c:event.h export_.c:export.h file_.c:file.h finfo_.c:finfo.h glob_.c:glob.h graph_.c:graph.h gzip_.c:gzip.h http_.c:http.h http_socket_.c:http_socket.h http_ssl_.c:http_ssl.h http_transport_.c:http_transport.h import_.c:import.h info_.c:info.h json_.c:json.h json_artifact_.c:json_artifact.h json_branch_.c:json_branch.h json_diff_.c:json_diff.h json_login_.c:json_login.h json_query_.c:json_query.h json_report_.c:json_report.h json_tag_.c:json_tag.h json_timeline_.c:json_timeline.h json_wiki_.c:json_wiki.h leaf_.c:leaf.h login_.c:login.h main_.c:main.h manifest_.c:manifest.h md5_.c:md5.h merge_.c:merge.h merge3_.c:merge3.h name_.c:name.h path_.c:path.h pivot_.c:pivot.h popen_.c:popen.h pqueue_.c:pqueue.h printf_.c:printf.h rebuild_.c:rebuild.h report_.c:report.h rss_.c:rss.h schema_.c:schema.h search_.c:search.h setup_.c:setup.h sha1_.c:sha1.h shun_.c:shun.h skins_.c:skins.h sqlcmd_.c:sqlcmd.h stash_.c:stash.h stat_.c:stat.h style_.c:style.h sync_.c:sync.h tag_.c:tag.h tar_.c:tar.h th_main_.c:th_main.h timeline_.c:timeline.h tkt_.c:tkt.h tktsetup_.c:tktsetup.h undo_.c:undo.h update_.c:update.h url_.c:url.h user_.c:user.h verify_.c:verify.h vfile_.c:vfile.h wiki_.c:wiki.h wikiformat_.c:wikiformat.h winhttp_.c:winhttp.h xfer_.c:xfer.h zip_.c:zip.h $(SRCDIR)\sqlite3.h $(SRCDIR)\th.h VERSION.h $(SRCDIR)\cson_amalgamation.h | |
| 772 | + makeheaders$E add_.c:add.h allrepo_.c:allrepo.h attach_.c:attach.h bag_.c:bag.h bisect_.c:bisect.h blob_.c:blob.h branch_.c:branch.h browse_.c:browse.h captcha_.c:captcha.h cgi_.c:cgi.h checkin_.c:checkin.h checkout_.c:checkout.h clearsign_.c:clearsign.h clone_.c:clone.h comformat_.c:comformat.h configure_.c:configure.h content_.c:content.h db_.c:db.h delta_.c:delta.h deltacmd_.c:deltacmd.h descendants_.c:descendants.h diff_.c:diff.h diffcmd_.c:diffcmd.h doc_.c:doc.h encode_.c:encode.h event_.c:event.h export_.c:export.h file_.c:file.h finfo_.c:finfo.h glob_.c:glob.h graph_.c:graph.h gzip_.c:gzip.h http_.c:http.h http_socket_.c:http_socket.h http_ssl_.c:http_ssl.h http_transport_.c:http_transport.h import_.c:import.h info_.c:info.h json_.c:json.h json_artifact_.c:json_artifact.h json_branch_.c:json_branch.h json_diff_.c:json_diff.h json_login_.c:json_login.h json_query_.c:json_query.h json_report_.c:json_report.h json_tag_.c:json_tag.h json_timeline_.c:json_timeline.h json_user_.c:json_user.h json_wiki_.c:json_wiki.h leaf_.c:leaf.h login_.c:login.h main_.c:main.h manifest_.c:manifest.h md5_.c:md5.h merge_.c:merge.h merge3_.c:merge3.h name_.c:name.h path_.c:path.h pivot_.c:pivot.h popen_.c:popen.h pqueue_.c:pqueue.h printf_.c:printf.h rebuild_.c:rebuild.h report_.c:report.h rss_.c:rss.h schema_.c:schema.h search_.c:search.h setup_.c:setup.h sha1_.c:sha1.h shun_.c:shun.h skins_.c:skins.h sqlcmd_.c:sqlcmd.h stash_.c:stash.h stat_.c:stat.h style_.c:style.h sync_.c:sync.h tag_.c:tag.h tar_.c:tar.h th_main_.c:th_main.h timeline_.c:timeline.h tkt_.c:tkt.h tktsetup_.c:tktsetup.h undo_.c:undo.h update_.c:update.h url_.c:url.h user_.c:user.h verify_.c:verify.h vfile_.c:vfile.h wiki_.c:wiki.h wikiformat_.c:wikiformat.h winhttp_.c:winhttp.h xfer_.c:xfer.h zip_.c:zip.h $(SRCDIR)\sqlite3.h $(SRCDIR)\th.h VERSION.h $(SRCDIR)\cson_amalgamation.h | |
| 765 | 773 | @copy /Y nul: headers |
| 766 | 774 |
| --- win/Makefile.msc | |
| +++ win/Makefile.msc | |
| @@ -36,13 +36,13 @@ | |
| 36 | LIBS = $(ZLIB) ws2_32.lib advapi32.lib $(SSLLIB) |
| 37 | LIBDIR = -LIBPATH:$(MSCDIR)\extra\lib -LIBPATH:$(ZLIBDIR) |
| 38 | |
| 39 | SQLITE_OPTIONS = /DSQLITE_OMIT_LOAD_EXTENSION=1 /DSQLITE_THREADSAFE=0 /DSQLITE_DEFAULT_FILE_FORMAT=4 /DSQLITE_ENABLE_STAT3 /Dlocaltime=fossil_localtime /DSQLITE_ENABLE_LOCKING_STYLE=0 |
| 40 | |
| 41 | SRC = add_.c allrepo_.c attach_.c bag_.c bisect_.c blob_.c branch_.c browse_.c captcha_.c cgi_.c checkin_.c checkout_.c clearsign_.c clone_.c comformat_.c configure_.c content_.c db_.c delta_.c deltacmd_.c descendants_.c diff_.c diffcmd_.c doc_.c encode_.c event_.c export_.c file_.c finfo_.c glob_.c graph_.c gzip_.c http_.c http_socket_.c http_ssl_.c http_transport_.c import_.c info_.c json_.c json_artifact_.c json_branch_.c json_diff_.c json_login_.c json_query_.c json_report_.c json_tag_.c json_timeline_.c json_wiki_.c leaf_.c login_.c main_.c manifest_.c md5_.c merge_.c merge3_.c name_.c path_.c pivot_.c popen_.c pqueue_.c printf_.c rebuild_.c report_.c rss_.c schema_.c search_.c setup_.c sha1_.c shun_.c skins_.c sqlcmd_.c stash_.c stat_.c style_.c sync_.c tag_.c tar_.c th_main_.c timeline_.c tkt_.c tktsetup_.c undo_.c update_.c url_.c user_.c verify_.c vfile_.c wiki_.c wikiformat_.c winhttp_.c xfer_.c zip_.c |
| 42 | |
| 43 | OBJ = $(OX)\add$O $(OX)\allrepo$O $(OX)\attach$O $(OX)\bag$O $(OX)\bisect$O $(OX)\blob$O $(OX)\branch$O $(OX)\browse$O $(OX)\captcha$O $(OX)\cgi$O $(OX)\checkin$O $(OX)\checkout$O $(OX)\clearsign$O $(OX)\clone$O $(OX)\comformat$O $(OX)\configure$O $(OX)\content$O $(OX)\db$O $(OX)\delta$O $(OX)\deltacmd$O $(OX)\descendants$O $(OX)\diff$O $(OX)\diffcmd$O $(OX)\doc$O $(OX)\encode$O $(OX)\event$O $(OX)\export$O $(OX)\file$O $(OX)\finfo$O $(OX)\glob$O $(OX)\graph$O $(OX)\gzip$O $(OX)\http$O $(OX)\http_socket$O $(OX)\http_ssl$O $(OX)\http_transport$O $(OX)\import$O $(OX)\info$O $(OX)\json$O $(OX)\json_artifact$O $(OX)\json_branch$O $(OX)\json_diff$O $(OX)\json_login$O $(OX)\json_query$O $(OX)\json_report$O $(OX)\json_tag$O $(OX)\json_timeline$O $(OX)\json_wiki$O $(OX)\leaf$O $(OX)\login$O $(OX)\main$O $(OX)\manifest$O $(OX)\md5$O $(OX)\merge$O $(OX)\merge3$O $(OX)\name$O $(OX)\path$O $(OX)\pivot$O $(OX)\popen$O $(OX)\pqueue$O $(OX)\printf$O $(OX)\rebuild$O $(OX)\report$O $(OX)\rss$O $(OX)\schema$O $(OX)\search$O $(OX)\setup$O $(OX)\sha1$O $(OX)\shun$O $(OX)\skins$O $(OX)\sqlcmd$O $(OX)\stash$O $(OX)\stat$O $(OX)\style$O $(OX)\sync$O $(OX)\tag$O $(OX)\tar$O $(OX)\th_main$O $(OX)\timeline$O $(OX)\tkt$O $(OX)\tktsetup$O $(OX)\undo$O $(OX)\update$O $(OX)\url$O $(OX)\user$O $(OX)\verify$O $(OX)\vfile$O $(OX)\wiki$O $(OX)\wikiformat$O $(OX)\winhttp$O $(OX)\xfer$O $(OX)\zip$O $(OX)\shell$O $(OX)\sqlite3$O $(OX)\th$O $(OX)\th_lang$O |
| 44 | |
| 45 | |
| 46 | APPNAME = $(OX)\fossil$(E) |
| 47 | |
| 48 | all: $(OX) $(APPNAME) |
| @@ -97,10 +97,11 @@ | |
| 97 | echo $(OX)\json_login.obj >> $@ |
| 98 | echo $(OX)\json_query.obj >> $@ |
| 99 | echo $(OX)\json_report.obj >> $@ |
| 100 | echo $(OX)\json_tag.obj >> $@ |
| 101 | echo $(OX)\json_timeline.obj >> $@ |
| 102 | echo $(OX)\json_wiki.obj >> $@ |
| 103 | echo $(OX)\leaf.obj >> $@ |
| 104 | echo $(OX)\login.obj >> $@ |
| 105 | echo $(OX)\main.obj >> $@ |
| 106 | echo $(OX)\manifest.obj >> $@ |
| @@ -203,10 +204,11 @@ | |
| 203 | $(OBJDIR)\json_login$O : $(SRCDIR)\json_detail.h |
| 204 | $(OBJDIR)\json_query$O : $(SRCDIR)\json_detail.h |
| 205 | $(OBJDIR)\json_report$O : $(SRCDIR)\json_detail.h |
| 206 | $(OBJDIR)\json_tag$O : $(SRCDIR)\json_detail.h |
| 207 | $(OBJDIR)\json_timeline$O : $(SRCDIR)\json_detail.h |
| 208 | $(OBJDIR)\json_wiki$O : $(SRCDIR)\json_detail.h |
| 209 | |
| 210 | |
| 211 | $(OX)\add$O : add_.c add.h |
| 212 | $(TCC) /Fo$@ -c add_.c |
| @@ -487,10 +489,16 @@ | |
| 487 | $(OX)\json_timeline$O : json_timeline_.c json_timeline.h |
| 488 | $(TCC) /Fo$@ -c json_timeline_.c |
| 489 | |
| 490 | json_timeline_.c : $(SRCDIR)\json_timeline.c |
| 491 | translate$E $** > $@ |
| 492 | |
| 493 | $(OX)\json_wiki$O : json_wiki_.c json_wiki.h |
| 494 | $(TCC) /Fo$@ -c json_wiki_.c |
| 495 | |
| 496 | json_wiki_.c : $(SRCDIR)\json_wiki.c |
| @@ -759,7 +767,7 @@ | |
| 759 | |
| 760 | zip_.c : $(SRCDIR)\zip.c |
| 761 | translate$E $** > $@ |
| 762 | |
| 763 | headers: makeheaders$E page_index.h VERSION.h |
| 764 | makeheaders$E add_.c:add.h allrepo_.c:allrepo.h attach_.c:attach.h bag_.c:bag.h bisect_.c:bisect.h blob_.c:blob.h branch_.c:branch.h browse_.c:browse.h captcha_.c:captcha.h cgi_.c:cgi.h checkin_.c:checkin.h checkout_.c:checkout.h clearsign_.c:clearsign.h clone_.c:clone.h comformat_.c:comformat.h configure_.c:configure.h content_.c:content.h db_.c:db.h delta_.c:delta.h deltacmd_.c:deltacmd.h descendants_.c:descendants.h diff_.c:diff.h diffcmd_.c:diffcmd.h doc_.c:doc.h encode_.c:encode.h event_.c:event.h export_.c:export.h file_.c:file.h finfo_.c:finfo.h glob_.c:glob.h graph_.c:graph.h gzip_.c:gzip.h http_.c:http.h http_socket_.c:http_socket.h http_ssl_.c:http_ssl.h http_transport_.c:http_transport.h import_.c:import.h info_.c:info.h json_.c:json.h json_artifact_.c:json_artifact.h json_branch_.c:json_branch.h json_diff_.c:json_diff.h json_login_.c:json_login.h json_query_.c:json_query.h json_report_.c:json_report.h json_tag_.c:json_tag.h json_timeline_.c:json_timeline.h json_wiki_.c:json_wiki.h leaf_.c:leaf.h login_.c:login.h main_.c:main.h manifest_.c:manifest.h md5_.c:md5.h merge_.c:merge.h merge3_.c:merge3.h name_.c:name.h path_.c:path.h pivot_.c:pivot.h popen_.c:popen.h pqueue_.c:pqueue.h printf_.c:printf.h rebuild_.c:rebuild.h report_.c:report.h rss_.c:rss.h schema_.c:schema.h search_.c:search.h setup_.c:setup.h sha1_.c:sha1.h shun_.c:shun.h skins_.c:skins.h sqlcmd_.c:sqlcmd.h stash_.c:stash.h stat_.c:stat.h style_.c:style.h sync_.c:sync.h tag_.c:tag.h tar_.c:tar.h th_main_.c:th_main.h timeline_.c:timeline.h tkt_.c:tkt.h tktsetup_.c:tktsetup.h undo_.c:undo.h update_.c:update.h url_.c:url.h user_.c:user.h verify_.c:verify.h vfile_.c:vfile.h wiki_.c:wiki.h wikiformat_.c:wikiformat.h winhttp_.c:winhttp.h xfer_.c:xfer.h zip_.c:zip.h $(SRCDIR)\sqlite3.h $(SRCDIR)\th.h VERSION.h $(SRCDIR)\cson_amalgamation.h |
| 765 | @copy /Y nul: headers |
| 766 |
| --- win/Makefile.msc | |
| +++ win/Makefile.msc | |
| @@ -36,13 +36,13 @@ | |
| 36 | LIBS = $(ZLIB) ws2_32.lib advapi32.lib $(SSLLIB) |
| 37 | LIBDIR = -LIBPATH:$(MSCDIR)\extra\lib -LIBPATH:$(ZLIBDIR) |
| 38 | |
| 39 | SQLITE_OPTIONS = /DSQLITE_OMIT_LOAD_EXTENSION=1 /DSQLITE_THREADSAFE=0 /DSQLITE_DEFAULT_FILE_FORMAT=4 /DSQLITE_ENABLE_STAT3 /Dlocaltime=fossil_localtime /DSQLITE_ENABLE_LOCKING_STYLE=0 |
| 40 | |
| 41 | SRC = add_.c allrepo_.c attach_.c bag_.c bisect_.c blob_.c branch_.c browse_.c captcha_.c cgi_.c checkin_.c checkout_.c clearsign_.c clone_.c comformat_.c configure_.c content_.c db_.c delta_.c deltacmd_.c descendants_.c diff_.c diffcmd_.c doc_.c encode_.c event_.c export_.c file_.c finfo_.c glob_.c graph_.c gzip_.c http_.c http_socket_.c http_ssl_.c http_transport_.c import_.c info_.c json_.c json_artifact_.c json_branch_.c json_diff_.c json_login_.c json_query_.c json_report_.c json_tag_.c json_timeline_.c json_user_.c json_wiki_.c leaf_.c login_.c main_.c manifest_.c md5_.c merge_.c merge3_.c name_.c path_.c pivot_.c popen_.c pqueue_.c printf_.c rebuild_.c report_.c rss_.c schema_.c search_.c setup_.c sha1_.c shun_.c skins_.c sqlcmd_.c stash_.c stat_.c style_.c sync_.c tag_.c tar_.c th_main_.c timeline_.c tkt_.c tktsetup_.c undo_.c update_.c url_.c user_.c verify_.c vfile_.c wiki_.c wikiformat_.c winhttp_.c xfer_.c zip_.c |
| 42 | |
| 43 | OBJ = $(OX)\add$O $(OX)\allrepo$O $(OX)\attach$O $(OX)\bag$O $(OX)\bisect$O $(OX)\blob$O $(OX)\branch$O $(OX)\browse$O $(OX)\captcha$O $(OX)\cgi$O $(OX)\checkin$O $(OX)\checkout$O $(OX)\clearsign$O $(OX)\clone$O $(OX)\comformat$O $(OX)\configure$O $(OX)\content$O $(OX)\db$O $(OX)\delta$O $(OX)\deltacmd$O $(OX)\descendants$O $(OX)\diff$O $(OX)\diffcmd$O $(OX)\doc$O $(OX)\encode$O $(OX)\event$O $(OX)\export$O $(OX)\file$O $(OX)\finfo$O $(OX)\glob$O $(OX)\graph$O $(OX)\gzip$O $(OX)\http$O $(OX)\http_socket$O $(OX)\http_ssl$O $(OX)\http_transport$O $(OX)\import$O $(OX)\info$O $(OX)\json$O $(OX)\json_artifact$O $(OX)\json_branch$O $(OX)\json_diff$O $(OX)\json_login$O $(OX)\json_query$O $(OX)\json_report$O $(OX)\json_tag$O $(OX)\json_timeline$O $(OX)\json_user$O $(OX)\json_wiki$O $(OX)\leaf$O $(OX)\login$O $(OX)\main$O $(OX)\manifest$O $(OX)\md5$O $(OX)\merge$O $(OX)\merge3$O $(OX)\name$O $(OX)\path$O $(OX)\pivot$O $(OX)\popen$O $(OX)\pqueue$O $(OX)\printf$O $(OX)\rebuild$O $(OX)\report$O $(OX)\rss$O $(OX)\schema$O $(OX)\search$O $(OX)\setup$O $(OX)\sha1$O $(OX)\shun$O $(OX)\skins$O $(OX)\sqlcmd$O $(OX)\stash$O $(OX)\stat$O $(OX)\style$O $(OX)\sync$O $(OX)\tag$O $(OX)\tar$O $(OX)\th_main$O $(OX)\timeline$O $(OX)\tkt$O $(OX)\tktsetup$O $(OX)\undo$O $(OX)\update$O $(OX)\url$O $(OX)\user$O $(OX)\verify$O $(OX)\vfile$O $(OX)\wiki$O $(OX)\wikiformat$O $(OX)\winhttp$O $(OX)\xfer$O $(OX)\zip$O $(OX)\shell$O $(OX)\sqlite3$O $(OX)\th$O $(OX)\th_lang$O |
| 44 | |
| 45 | |
| 46 | APPNAME = $(OX)\fossil$(E) |
| 47 | |
| 48 | all: $(OX) $(APPNAME) |
| @@ -97,10 +97,11 @@ | |
| 97 | echo $(OX)\json_login.obj >> $@ |
| 98 | echo $(OX)\json_query.obj >> $@ |
| 99 | echo $(OX)\json_report.obj >> $@ |
| 100 | echo $(OX)\json_tag.obj >> $@ |
| 101 | echo $(OX)\json_timeline.obj >> $@ |
| 102 | echo $(OX)\json_user.obj >> $@ |
| 103 | echo $(OX)\json_wiki.obj >> $@ |
| 104 | echo $(OX)\leaf.obj >> $@ |
| 105 | echo $(OX)\login.obj >> $@ |
| 106 | echo $(OX)\main.obj >> $@ |
| 107 | echo $(OX)\manifest.obj >> $@ |
| @@ -203,10 +204,11 @@ | |
| 204 | $(OBJDIR)\json_login$O : $(SRCDIR)\json_detail.h |
| 205 | $(OBJDIR)\json_query$O : $(SRCDIR)\json_detail.h |
| 206 | $(OBJDIR)\json_report$O : $(SRCDIR)\json_detail.h |
| 207 | $(OBJDIR)\json_tag$O : $(SRCDIR)\json_detail.h |
| 208 | $(OBJDIR)\json_timeline$O : $(SRCDIR)\json_detail.h |
| 209 | $(OBJDIR)\json_user$O : $(SRCDIR)\json_detail.h |
| 210 | $(OBJDIR)\json_wiki$O : $(SRCDIR)\json_detail.h |
| 211 | |
| 212 | |
| 213 | $(OX)\add$O : add_.c add.h |
| 214 | $(TCC) /Fo$@ -c add_.c |
| @@ -487,10 +489,16 @@ | |
| 489 | $(OX)\json_timeline$O : json_timeline_.c json_timeline.h |
| 490 | $(TCC) /Fo$@ -c json_timeline_.c |
| 491 | |
| 492 | json_timeline_.c : $(SRCDIR)\json_timeline.c |
| 493 | translate$E $** > $@ |
| 494 | |
| 495 | $(OX)\json_user$O : json_user_.c json_user.h |
| 496 | $(TCC) /Fo$@ -c json_user_.c |
| 497 | |
| 498 | json_user_.c : $(SRCDIR)\json_user.c |
| 499 | translate$E $** > $@ |
| 500 | |
| 501 | $(OX)\json_wiki$O : json_wiki_.c json_wiki.h |
| 502 | $(TCC) /Fo$@ -c json_wiki_.c |
| 503 | |
| 504 | json_wiki_.c : $(SRCDIR)\json_wiki.c |
| @@ -759,7 +767,7 @@ | |
| 767 | |
| 768 | zip_.c : $(SRCDIR)\zip.c |
| 769 | translate$E $** > $@ |
| 770 | |
| 771 | headers: makeheaders$E page_index.h VERSION.h |
| 772 | makeheaders$E add_.c:add.h allrepo_.c:allrepo.h attach_.c:attach.h bag_.c:bag.h bisect_.c:bisect.h blob_.c:blob.h branch_.c:branch.h browse_.c:browse.h captcha_.c:captcha.h cgi_.c:cgi.h checkin_.c:checkin.h checkout_.c:checkout.h clearsign_.c:clearsign.h clone_.c:clone.h comformat_.c:comformat.h configure_.c:configure.h content_.c:content.h db_.c:db.h delta_.c:delta.h deltacmd_.c:deltacmd.h descendants_.c:descendants.h diff_.c:diff.h diffcmd_.c:diffcmd.h doc_.c:doc.h encode_.c:encode.h event_.c:event.h export_.c:export.h file_.c:file.h finfo_.c:finfo.h glob_.c:glob.h graph_.c:graph.h gzip_.c:gzip.h http_.c:http.h http_socket_.c:http_socket.h http_ssl_.c:http_ssl.h http_transport_.c:http_transport.h import_.c:import.h info_.c:info.h json_.c:json.h json_artifact_.c:json_artifact.h json_branch_.c:json_branch.h json_diff_.c:json_diff.h json_login_.c:json_login.h json_query_.c:json_query.h json_report_.c:json_report.h json_tag_.c:json_tag.h json_timeline_.c:json_timeline.h json_user_.c:json_user.h json_wiki_.c:json_wiki.h leaf_.c:leaf.h login_.c:login.h main_.c:main.h manifest_.c:manifest.h md5_.c:md5.h merge_.c:merge.h merge3_.c:merge3.h name_.c:name.h path_.c:path.h pivot_.c:pivot.h popen_.c:popen.h pqueue_.c:pqueue.h printf_.c:printf.h rebuild_.c:rebuild.h report_.c:report.h rss_.c:rss.h schema_.c:schema.h search_.c:search.h setup_.c:setup.h sha1_.c:sha1.h shun_.c:shun.h skins_.c:skins.h sqlcmd_.c:sqlcmd.h stash_.c:stash.h stat_.c:stat.h style_.c:style.h sync_.c:sync.h tag_.c:tag.h tar_.c:tar.h th_main_.c:th_main.h timeline_.c:timeline.h tkt_.c:tkt.h tktsetup_.c:tktsetup.h undo_.c:undo.h update_.c:update.h url_.c:url.h user_.c:user.h verify_.c:verify.h vfile_.c:vfile.h wiki_.c:wiki.h wikiformat_.c:wikiformat.h winhttp_.c:winhttp.h xfer_.c:xfer.h zip_.c:zip.h $(SRCDIR)\sqlite3.h $(SRCDIR)\th.h VERSION.h $(SRCDIR)\cson_amalgamation.h |
| 773 | @copy /Y nul: headers |
| 774 |