Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
D
dcs_classifier
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
uplex-varnish
dcs_classifier
Commits
06569444
Commit
06569444
authored
Jun 11, 2015
by
Nils Goroll
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
revert to dcs_config.h and use a symlink for vmodtool-generated sources
parent
e45da560
Changes
11
Hide whitespace changes
Inline
Side-by-side
Showing
11 changed files
with
20 additions
and
16 deletions
+20
-16
.gitignore
.gitignore
+2
-2
Makefile.am
Makefile.am
+1
-1
configure.ac
configure.ac
+1
-5
Makefile.am
src/Makefile.am
+9
-1
dcs.c
src/dcs.c
+1
-1
dcs_match.c
src/dcs_match.c
+1
-1
dcs_test.c
src/dcs_test.c
+1
-1
dcs_varnish2.c
src/dcs_varnish2.c
+1
-1
gen_dcs_classifier.pl
src/gen/gen_dcs_classifier.pl
+1
-1
gen_dcs_match_mem.c
src/gen/gen_dcs_match_mem.c
+1
-1
vmod_dcs.c
src/vmod_dcs.c
+1
-1
No files found.
.gitignore
View file @
06569444
...
@@ -22,8 +22,8 @@ benchmark_results
...
@@ -22,8 +22,8 @@ benchmark_results
/autom4te.cache/
/autom4te.cache/
/compile
/compile
/config.guess
/config.guess
/config.h
/
dcs_
config.h
/config.h.in
/
dcs_
config.h.in
/config.log
/config.log
/config.status
/config.status
/config.sub
/config.sub
...
...
Makefile.am
View file @
06569444
...
@@ -36,4 +36,4 @@ else
...
@@ -36,4 +36,4 @@ else
@false
@false
endif
endif
dist_data_DATA
=
config.h
dist_data_DATA
=
dcs_
config.h
configure.ac
View file @
06569444
...
@@ -3,11 +3,7 @@ AC_COPYRIGHT([Copyright 2015 UPLEX - Nils Goroll Systemoptimierung])
...
@@ -3,11 +3,7 @@ AC_COPYRIGHT([Copyright 2015 UPLEX - Nils Goroll Systemoptimierung])
AC_INIT([dcs_classifier], [trunk])
AC_INIT([dcs_classifier], [trunk])
AC_CONFIG_MACRO_DIR([m4])
AC_CONFIG_MACRO_DIR([m4])
AC_CONFIG_SRCDIR(src/gen/gen_dcs_classifier.pl)
AC_CONFIG_SRCDIR(src/gen/gen_dcs_classifier.pl)
AM_CONFIG_HEADER(dcs_config.h)
# vmodtool generates vcc_if.c which includes config.h, so though we
# would like to use a different name like dcs_config.h, we can't
# because this would further complicate vmodtool
AM_CONFIG_HEADER(config.h)
AC_CANONICAL_SYSTEM
AC_CANONICAL_SYSTEM
AC_LANG(C)
AC_LANG(C)
...
...
src/Makefile.am
View file @
06569444
...
@@ -96,7 +96,15 @@ libvmod_dcs.lo: dcs_varnish.c vcc_if.c vcc_if.h
...
@@ -96,7 +96,15 @@ libvmod_dcs.lo: dcs_varnish.c vcc_if.c vcc_if.h
vcc_if_INCLUDES
=
@VMOD_INCLUDES@
vcc_if_INCLUDES
=
@VMOD_INCLUDES@
vmod_dcs.rst vmod_dcs.man.rst vcc_if.c
:
vcc_if.h
# vcc_if.c includes config.h, but we use dcs_config.h to avoid
# conflicts in the varnish2 setup (VCL inlince-C includes
# dcs_varnish2.c)
config.h
:
../dcs_config.h
-
rm
$@
ln
-s
$<
$@
vmod_dcs.rst vmod_dcs.man.rst vcc_if.c
:
vcc_if.h config.h
vcc_if.h
:
@VMODTOOL@ $(srcdir)/@VCCFILE@
vcc_if.h
:
@VMODTOOL@ $(srcdir)/@VCCFILE@
@
PYTHON@ @VMODTOOL@
$(srcdir)
/@VCCFILE@
@
PYTHON@ @VMODTOOL@
$(srcdir)
/@VCCFILE@
...
...
src/dcs.c
View file @
06569444
...
@@ -28,7 +28,7 @@
...
@@ -28,7 +28,7 @@
*
*
*/
*/
#include "config.h"
#include "
dcs_
config.h"
#include <stdio.h>
#include <stdio.h>
#include <ctype.h>
#include <ctype.h>
#include "dcs_match.h"
#include "dcs_match.h"
...
...
src/dcs_match.c
View file @
06569444
...
@@ -28,7 +28,7 @@
...
@@ -28,7 +28,7 @@
*
*
*/
*/
#include "config.h"
#include "
dcs_
config.h"
#ifdef DEBUG_K_MATCH
#ifdef DEBUG_K_MATCH
#include <stdlib.h>
#include <stdlib.h>
...
...
src/dcs_test.c
View file @
06569444
...
@@ -28,7 +28,7 @@
...
@@ -28,7 +28,7 @@
*
*
*/
*/
#include "config.h"
#include "
dcs_
config.h"
#include <stdio.h>
#include <stdio.h>
#include <stdlib.h>
#include <stdlib.h>
...
...
src/dcs_varnish2.c
View file @
06569444
...
@@ -28,7 +28,7 @@
...
@@ -28,7 +28,7 @@
*
*
*/
*/
#include "config.h"
#include "
dcs_
config.h"
#include "dcs_varnish.c"
#include "dcs_varnish.c"
...
...
src/gen/gen_dcs_classifier.pl
View file @
06569444
...
@@ -1393,7 +1393,7 @@ dcs_register_subkey_match(struct dcs_matchstate *state, dcs_subkey_id_t subkey_i
...
@@ -1393,7 +1393,7 @@ dcs_register_subkey_match(struct dcs_matchstate *state, dcs_subkey_id_t subkey_i
EOF
EOF
_VCL (F_TYPE_C, VCL_TOP, <<'
EOF
');
_VCL (F_TYPE_C, VCL_TOP, <<'
EOF
');
#include "config.h"
#include "
dcs_
config.h"
#include <errno.h>
#include <errno.h>
...
...
src/gen/gen_dcs_match_mem.c
View file @
06569444
...
@@ -28,7 +28,7 @@
...
@@ -28,7 +28,7 @@
*
*
*/
*/
#include "config.h"
#include "
dcs_
config.h"
#include <stdio.h>
#include <stdio.h>
...
...
src/vmod_dcs.c
View file @
06569444
...
@@ -28,7 +28,7 @@
...
@@ -28,7 +28,7 @@
*
*
*/
*/
#include "config.h"
#include "
dcs_
config.h"
#include "vrt.h"
#include "vrt.h"
#include "vcc_if.h"
#include "vcc_if.h"
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment