Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
U
unique-xids
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
unique-xids
Commits
f435e460
Commit
f435e460
authored
Jun 06, 2011
by
Tollef Fog Heen
Committed by
Tollef Fog Heen
Jun 06, 2011
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Rename vcs_version.c to vcs_version.h
Adjust build system accordingly.
parent
25ef2496
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
12 additions
and
13 deletions
+12
-13
.gitignore
.gitignore
+1
-1
Makefile.am
lib/libvarnish/Makefile.am
+8
-10
version.c
lib/libvarnish/version.c
+2
-1
Makefile.am
lib/libvarnishapi/Makefile.am
+1
-1
No files found.
.gitignore
View file @
f435e460
...
...
@@ -45,7 +45,7 @@ TAGS
/include/vcl_returns.h
/include/vrt_obj.h
/include/vrt_stv_var.h
/lib/libvarnish/vcs_version.
c
/lib/libvarnish/vcs_version.
h
/lib/libvcl/vcc_fixed_token.c
/lib/libvcl/vcc_obj.c
/lib/libvcl/vcc_token_defs.h
...
...
lib/libvarnish/Makefile.am
View file @
f435e460
...
...
@@ -14,7 +14,7 @@ libvarnish_la_SOURCES = \
cli_serve.c
\
flopen.c
\
num.c
\
vcs_version.
c
\
vcs_version.
h
\
time.c
\
tcp.c
\
vct.c
\
...
...
@@ -33,11 +33,13 @@ libvarnish_la_SOURCES = \
libvarnish_la_CFLAGS
=
-DVARNISH_STATE_DIR
=
'"${VARNISH_STATE_DIR}"'
libvarnish_la_LIBADD
=
${
RT_LIBS
}
${
NET_LIBS
}
${
LIBM
}
@PCRE_LIBS@
DISTCLEANFILES
=
vcs_version.c
vcs_version.c
:
FORCE
version.o
:
vcs_version.h
DISTCLEANFILES
=
vcs_version.h
vcs_version.h
:
FORCE
if
[
-d
"
$(top_srcdir)
/.git"
]
;
then
\
V
=
"
$$
(git describe --always)"
\
H
=
"
$$
(head -n 1 vcs_version.
c
2>/dev/null || true)"
;
\
H
=
"
$$
(head -n 1 vcs_version.
h
2>/dev/null || true)"
;
\
if
[
"/*
$$
V */"
!=
"
$$
H"
]
;
then
\
(
\
echo
"/*
$$
V */"
;
\
...
...
@@ -48,12 +50,8 @@ vcs_version.c: FORCE
echo
' *'
;
\
echo
' */'
;
\
echo
''
;
\
echo
"#include <libvarnish.h>"
;
\
echo
"const char* VCS_Version(void)"
;
\
echo
"{"
;
\
echo
" return (
\"
$$
V
\"
);"
;
\
echo
"}"
;
\
)
>
vcs_version.c
;
\
echo
"#define VCS_Version
\"
$$
V
\"
"
\
)
>
vcs_version.h
;
\
fi
\
fi
FORCE
:
...
...
lib/libvarnish/version.c
View file @
f435e460
...
...
@@ -34,12 +34,13 @@
#include <stdio.h>
#include "libvarnish.h"
#include "vcs_version.h"
void
VCS_Message
(
const
char
*
progname
)
{
fprintf
(
stderr
,
"%s (%s-%s revision %s)
\n
"
,
progname
,
PACKAGE_TARNAME
,
PACKAGE_VERSION
,
VCS_Version
()
);
PACKAGE_TARNAME
,
PACKAGE_VERSION
,
VCS_Version
);
fprintf
(
stderr
,
"Copyright (c) 2006 Verdens Gang AS
\n
"
);
fprintf
(
stderr
,
"Copyright (c) 2006-2011 Varnish Software AS
\n
"
);
}
lib/libvarnishapi/Makefile.am
View file @
f435e460
...
...
@@ -12,7 +12,7 @@ libvarnishapi_la_SOURCES = \
\
../libvarnish/assert.c
\
../libvarnish/argv.c
\
../libvarnish/vcs_version.
c
\
../libvarnish/vcs_version.
h
\
../libvarnish/version.c
\
../libvarnish/cli_common.c
\
../libvarnish/cli_auth.c
\
...
...
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