* mdocml: Put VERSION into config.h.
@ 2013-10-06 23:17 schwarze
0 siblings, 0 replies; 3+ messages in thread
From: schwarze @ 2013-10-06 23:17 UTC (permalink / raw)
To: source
Log Message:
-----------
Put VERSION into config.h.
This makes life easier for downstream maintainers having more than one
Makefile, for example DragonFly and FreeBSD.
Suggested by Franco Fichtner <franco at lastsummer dot de>.
Tags:
----
VERSION_1_12
Modified Files:
--------------
mdocml:
Makefile
Revision Data
-------------
Index: Makefile
===================================================================
RCS file: /usr/vhosts/mdocml.bsd.lv/cvs/mdocml/Makefile,v
retrieving revision 1.395.2.7
retrieving revision 1.395.2.8
diff -LMakefile -LMakefile -u -p -r1.395.2.7 -r1.395.2.8
--- Makefile
+++ Makefile
@@ -31,7 +31,7 @@ STATIC = -static
# Linux requires -pthread to statically link with libdb.
#STATIC += -pthread
-CFLAGS += -g -DHAVE_CONFIG_H -DVERSION="\"$(VERSION)\""
+CFLAGS += -g -DHAVE_CONFIG_H
CFLAGS += -W -Wall -Wstrict-prototypes -Wno-unused-parameter -Wwrite-strings
PREFIX = /usr/local
WWWPREFIX = /var/www
@@ -390,6 +390,7 @@ config.h: config.h.pre config.h.post
rm -f config.log
( cat config.h.pre; \
echo; \
+ echo '#define VERSION "$(VERSION)"'; \
if $(CC) $(CFLAGS) -Werror -Wno-unused -o test-fgetln test-fgetln.c >> config.log 2>&1; then \
echo '#define HAVE_FGETLN'; \
rm test-fgetln; \
--
To unsubscribe send an email to source+unsubscribe@mdocml.bsd.lv
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: mdocml: Put VERSION into config.h.
2013-10-06 23:20 schwarze
@ 2013-10-07 16:26 ` Joerg Sonnenberger
0 siblings, 0 replies; 3+ messages in thread
From: Joerg Sonnenberger @ 2013-10-07 16:26 UTC (permalink / raw)
To: source
On Sun, Oct 06, 2013 at 07:20:39PM -0400, schwarze@mdocml.bsd.lv wrote:
> Log Message:
> -----------
> Put VERSION into config.h.
> This makes life easier for downstream maintainers having more than one
> Makefile, for example DragonFly and FreeBSD.
This is a regression in my opinion. If the version is to go anywhere
outside the plain CFLAGS, it should be a separate version.h header.
Using more than one Makefile is not an issue, NetBSD certainly does so.
Joerg
--
To unsubscribe send an email to source+unsubscribe@mdocml.bsd.lv
^ permalink raw reply [flat|nested] 3+ messages in thread
* mdocml: Put VERSION into config.h.
@ 2013-10-06 23:20 schwarze
2013-10-07 16:26 ` Joerg Sonnenberger
0 siblings, 1 reply; 3+ messages in thread
From: schwarze @ 2013-10-06 23:20 UTC (permalink / raw)
To: source
Log Message:
-----------
Put VERSION into config.h.
This makes life easier for downstream maintainers having more than one
Makefile, for example DragonFly and FreeBSD.
Suggested by Franco Fichtner <franco at lastsummer dot de>.
Modified Files:
--------------
mdocml:
Makefile
Revision Data
-------------
Index: Makefile
===================================================================
RCS file: /usr/vhosts/mdocml.bsd.lv/cvs/mdocml/Makefile,v
retrieving revision 1.403
retrieving revision 1.404
diff -LMakefile -LMakefile -u -p -r1.403 -r1.404
--- Makefile
+++ Makefile
@@ -30,7 +30,7 @@ STATIC = -static
# Linux requires -pthread to statically link with libdb.
#STATIC += -pthread
-CFLAGS += -I/usr/local/include -g -DHAVE_CONFIG_H -DVERSION="\"$(VERSION)\""
+CFLAGS += -I/usr/local/include -g -DHAVE_CONFIG_H
CFLAGS += -W -Wall -Wstrict-prototypes -Wno-unused-parameter -Wwrite-strings
PREFIX = /usr/local
WWWPREFIX = /var/www
@@ -357,6 +357,7 @@ config.h: config.h.pre config.h.post
rm -f config.log
( cat config.h.pre; \
echo; \
+ echo '#define VERSION "$(VERSION)"'; \
if $(CC) $(CFLAGS) -Werror -Wno-unused -o test-ohash test-ohash.c >> config.log 2>&1; then \
echo '#define HAVE_OHASH'; \
rm test-ohash; \
--
To unsubscribe send an email to source+unsubscribe@mdocml.bsd.lv
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2013-10-07 16:26 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2013-10-06 23:17 mdocml: Put VERSION into config.h schwarze
2013-10-06 23:20 schwarze
2013-10-07 16:26 ` Joerg Sonnenberger
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).