Module Name: src
Committed By: mrg
Date: Wed Jun 29 01:59:26 UTC 2011
Modified Files:
src/gnu/dist/groff/src/libs/libgroff: Makefile.sub
src/gnu/usr.bin/groff/src/libs/libgroff: Makefile
Log Message:
use:
extern "C" { stuff-here; }
instead of just
extern "C" stuff-here;
that GCC 4.5 demands.
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.4 -r1.2 \
src/gnu/dist/groff/src/libs/libgroff/Makefile.sub
cvs rdiff -u -r1.10 -r1.11 src/gnu/usr.bin/groff/src/libs/libgroff/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/gnu/dist/groff/src/libs/libgroff/Makefile.sub
diff -u src/gnu/dist/groff/src/libs/libgroff/Makefile.sub:1.1.1.4 src/gnu/dist/groff/src/libs/libgroff/Makefile.sub:1.2
--- src/gnu/dist/groff/src/libs/libgroff/Makefile.sub:1.1.1.4 Mon Feb 6 18:13:55 2006
+++ src/gnu/dist/groff/src/libs/libgroff/Makefile.sub Wed Jun 29 01:59:26 2011
@@ -117,7 +117,7 @@
@echo Making version.cpp
@echo const char \*version_string = \"$(src_version)\"\; >$@
@echo const char \*revision_string = \"$(src_revision)\"\; >>$@
- @echo extern \"C\" const char \*Version_string = \"$(src_version).$(src_revision)\"\; | \
+ @echo extern \"C\" \{ const char \*Version_string = \"$(src_version).$(src_revision)\"\; \} | \
sed -e 's/\.0\"/\"/' >>$@
# We have to avoid $(COMPILE.c) since we must not use groff's `assert.h'
Index: src/gnu/usr.bin/groff/src/libs/libgroff/Makefile
diff -u src/gnu/usr.bin/groff/src/libs/libgroff/Makefile:1.10 src/gnu/usr.bin/groff/src/libs/libgroff/Makefile:1.11
--- src/gnu/usr.bin/groff/src/libs/libgroff/Makefile:1.10 Sat Oct 25 22:27:35 2008
+++ src/gnu/usr.bin/groff/src/libs/libgroff/Makefile Wed Jun 29 01:59:26 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2008/10/25 22:27:35 apb Exp $
+# $NetBSD: Makefile,v 1.11 2011/06/29 01:59:26 mrg Exp $
# $FreeBSD: src/gnu/usr.bin/groff/src/libs/libgroff/Makefile,v 1.5 2003/05/01 13:22:19 ru Exp $
@@ -24,13 +24,13 @@
.include <bsd.lib.mk>
-version.cpp: ${GROFF_DIST}/VERSION ${GROFF_DIST}/REVISION
+version.cpp: ${GROFF_DIST}/VERSION ${GROFF_DIST}/REVISION Makefile
${_MKTARGET_CREATE}
(\
v=`cat ${GROFF_DIST}/VERSION`;\
r=`cat ${GROFF_DIST}/REVISION`;\
echo 'const char *version_string = "'$$v'";' ;\
echo 'const char *revision_string = "'$$r'";' ;\
- echo 'extern "C" const char *Version_string = "'$$v'.'$$r'";' |\
+ echo 'extern "C" { const char *Version_string = "'$$v'.'$$r'"; }' |\
${TOOL_SED} -e 's/\.0\"/\"/'; \
) > ${.TARGET}
