Commit 1b49d568 authored by Dridi Boukelmoune's avatar Dridi Boukelmoune

build: Prefix all VMOD sources with vmod_<name>

parent 4160eec6
...@@ -20,12 +20,12 @@ AM_CPPFLAGS = \ ...@@ -20,12 +20,12 @@ AM_CPPFLAGS = \
libvmod_blob_la_SOURCES = \ libvmod_blob_la_SOURCES = \
vmod_blob.c \ vmod_blob.c \
vmod_blob.h \ vmod_blob.h \
id.c \ vmod_blob_id.c \
base64.c \ vmod_blob_base64.c \
hex.c \ vmod_blob_hex.c \
url.c \ vmod_blob_url.c \
tbl_encodings.h \ vmod_blob_tbl_encodings.h \
tbl_case.h vmod_blob_tbl_case.h
libvmod_cookie_la_SOURCES = \ libvmod_cookie_la_SOURCES = \
vmod_cookie.c vmod_cookie.c
...@@ -38,15 +38,15 @@ libvmod_debug_la_SOURCES = \ ...@@ -38,15 +38,15 @@ libvmod_debug_la_SOURCES = \
libvmod_directors_la_SOURCES = \ libvmod_directors_la_SOURCES = \
vmod_directors.c \ vmod_directors.c \
vmod_directors.h \ vmod_directors.h \
fall_back.c \ vmod_directors_fall_back.c \
hash.c \ vmod_directors_hash.c \
random.c \ vmod_directors_random.c \
round_robin.c \ vmod_directors_round_robin.c \
vmod_shard.c \ vmod_directors_shard.c \
shard_cfg.c \ vmod_directors_shard_cfg.c \
shard_cfg.h \ vmod_directors_vmod_directors_shard_cfg.h \
shard_dir.c \ vmod_directors_shard_dir.c \
shard_dir.h vmod_directors_shard_dir.h
libvmod_proxy_la_SOURCES = \ libvmod_proxy_la_SOURCES = \
vmod_proxy.c vmod_proxy.c
...@@ -62,7 +62,7 @@ libvmod_std_la_SOURCES = \ ...@@ -62,7 +62,7 @@ libvmod_std_la_SOURCES = \
libvmod_unix_la_SOURCES = \ libvmod_unix_la_SOURCES = \
vmod_unix.c \ vmod_unix.c \
cred_compat.h vmod_unix_cred_compat.h
libvmod_vtc_la_SOURCES = \ libvmod_vtc_la_SOURCES = \
vmod_vtc.c vmod_vtc.c
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* vmod_{blob,directors} * vmod_{blob,directors}
*/ */
-efile(451, "tbl_*.h") // No include guard -efile(451, "vmod_*_tbl_*.h") // No include guard
/* /*
* vmod_blob * vmod_blob
......
...@@ -121,7 +121,7 @@ static enum encoding ...@@ -121,7 +121,7 @@ static enum encoding
parse_encoding(VCL_ENUM e) parse_encoding(VCL_ENUM e)
{ {
#define VMODENUM(n) if (e == VENUM(n)) return (n); #define VMODENUM(n) if (e == VENUM(n)) return (n);
#include "tbl_encodings.h" #include "vmod_blob_tbl_encodings.h"
WRONG("illegal encoding enum"); WRONG("illegal encoding enum");
} }
...@@ -129,7 +129,7 @@ static enum case_e ...@@ -129,7 +129,7 @@ static enum case_e
parse_case(VCL_ENUM e) parse_case(VCL_ENUM e)
{ {
#define VMODENUM(n) if (e == VENUM(n)) return (n); #define VMODENUM(n) if (e == VENUM(n)) return (n);
#include "tbl_case.h" #include "vmod_blob_tbl_case.h"
WRONG("illegal case enum"); WRONG("illegal case enum");
} }
......
...@@ -36,7 +36,7 @@ ...@@ -36,7 +36,7 @@
enum encoding { enum encoding {
__INVALID_ENCODING = 0, __INVALID_ENCODING = 0,
#define VMODENUM(x) x, #define VMODENUM(x) x,
#include "tbl_encodings.h" #include "vmod_blob_tbl_encodings.h"
__MAX_ENCODING __MAX_ENCODING
}; };
...@@ -48,7 +48,7 @@ enum encoding { ...@@ -48,7 +48,7 @@ enum encoding {
*/ */
enum case_e { enum case_e {
#define VMODENUM(x) x, #define VMODENUM(x) x,
#include "tbl_case.h" #include "vmod_blob_tbl_case.h"
}; };
typedef const size_t blob_len_t; typedef const size_t blob_len_t;
......
...@@ -40,8 +40,8 @@ ...@@ -40,8 +40,8 @@
#include "vend.h" #include "vend.h"
#include "vcc_directors_if.h" #include "vcc_directors_if.h"
#include "shard_dir.h" #include "vmod_directors_shard_dir.h"
#include "shard_cfg.h" #include "vmod_directors_shard_cfg.h"
#include "vsb.h" #include "vsb.h"
/* ------------------------------------------------------------------------- /* -------------------------------------------------------------------------
......
...@@ -38,8 +38,8 @@ ...@@ -38,8 +38,8 @@
#include "cache/cache.h" #include "cache/cache.h"
#include "shard_dir.h" #include "vmod_directors_shard_dir.h"
#include "shard_cfg.h" #include "vmod_directors_shard_cfg.h"
/*lint -esym(749, shard_change_task_e::*) */ /*lint -esym(749, shard_change_task_e::*) */
enum shard_change_task_e { enum shard_change_task_e {
......
...@@ -45,7 +45,7 @@ ...@@ -45,7 +45,7 @@
#include "vrnd.h" #include "vrnd.h"
#include "vcc_directors_if.h" #include "vcc_directors_if.h"
#include "shard_dir.h" #include "vmod_directors_shard_dir.h"
struct shard_be_info { struct shard_be_info {
unsigned hostid; unsigned hostid;
......
...@@ -37,7 +37,7 @@ ...@@ -37,7 +37,7 @@
#include "vcl.h" #include "vcl.h"
#include "common/heritage.h" #include "common/heritage.h"
#include "cred_compat.h" #include "vmod_unix_cred_compat.h"
#include "vcc_unix_if.h" #include "vcc_unix_if.h"
#define FAIL(ctx, msg) \ #define FAIL(ctx, msg) \
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment