summaryrefslogtreecommitdiff
path: root/resource
diff options
context:
space:
mode:
authorAndrew John Hughes <gnu_andrew@member.fsf.org>2005-01-15 17:01:35 +0000
committerAndrew John Hughes <gnu_andrew@member.fsf.org>2005-01-15 17:01:35 +0000
commit18addaa71c45fbdb60627f349e52027b3281e879 (patch)
treec9766b547b613c519a66d84ad2826876fb07d1b1 /resource
parentc61f399b1d3c471a8e459a4a2be645f95560f088 (diff)
downloadclasspath-18addaa71c45fbdb60627f349e52027b3281e879.tar.gz
2005-01-15 Andrew John Hughes <gnu_andrew@member.fsf.org>
* Merge of October 2004 HEAD patches to generics branch
Diffstat (limited to 'resource')
-rw-r--r--resource/java/util/logging/.cvsignore2
-rw-r--r--resource/java/util/logging/Makefile10
2 files changed, 7 insertions, 5 deletions
diff --git a/resource/java/util/logging/.cvsignore b/resource/java/util/logging/.cvsignore
new file mode 100644
index 000000000..3dda72986
--- /dev/null
+++ b/resource/java/util/logging/.cvsignore
@@ -0,0 +1,2 @@
+Makefile.in
+Makefile
diff --git a/resource/java/util/logging/Makefile b/resource/java/util/logging/Makefile
index 621cbd5e1..6b67fe246 100644
--- a/resource/java/util/logging/Makefile
+++ b/resource/java/util/logging/Makefile
@@ -53,8 +53,6 @@ ACLOCAL = ${SHELL} /home/gandalf/projects/java/classpath/generics/classpath/miss
AMDEP_FALSE = #
AMDEP_TRUE =
AMTAR = ${SHELL} /home/gandalf/projects/java/classpath/generics/classpath/missing --run tar
-AM_CFLAGS = -ansi -pedantic -Wmissing-declarations -Wmissing-prototypes -Wstrict-prototypes -Wall -Wno-long-long -D_BSD_SOURCE
-AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/native/jni/classpath -I$(top_srcdir)/native/target/Linux -I$(top_srcdir)/native/target/generic
AR = ar
AUTOCONF = ${SHELL} /home/gandalf/projects/java/classpath/generics/classpath/missing --run autoconf
AUTOHEADER = ${SHELL} /home/gandalf/projects/java/classpath/generics/classpath/missing --run autoheader
@@ -65,14 +63,13 @@ CAIRO_LIBS = -L/usr/X11R6/lib -lcairo -lm -lfreetype -lz -lfontconfig -lpixman -
CC = gcc
CCDEPMODE = depmode=gcc3
CFLAGS = -g -O2
-CLASSPATH_MODULE = -module -version-info 0:0:0
+CLASSPATH_INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/native/jni/classpath -I$(top_srcdir)/native/target/Linux -I$(top_srcdir)/native/target/generic
+CLASSPATH_MODULE = -module -version-info 0:0:0 -no-undefined
CP = /bin/cp
CPP = gcc -E
CPPFLAGS =
CREATE_API_DOCS_FALSE =
CREATE_API_DOCS_TRUE = #
-CREATE_CNI_LIBRARIES_FALSE =
-CREATE_CNI_LIBRARIES_TRUE = #
CREATE_GTK_PEER_LIBRARIES_FALSE = #
CREATE_GTK_PEER_LIBRARIES_TRUE =
CREATE_JNI_HEADERS_FALSE =
@@ -92,6 +89,7 @@ ECHO_C =
ECHO_N = -n
ECHO_T =
EGREP = grep -E
+ERROR_CFLAGS = -Werror
EXEEXT =
F77 =
FFLAGS =
@@ -148,6 +146,7 @@ REMOVE =
SET_MAKE =
SH = /bin/sh
SHELL = /bin/sh
+STRICT_WARNING_CFLAGS = -Wstrict-prototypes
STRIP = strip
USER_CLASSLIB =
USER_JAVAH =
@@ -156,6 +155,7 @@ USER_SPECIFIED_CLASSLIB_TRUE = #
USER_SPECIFIED_JAVAH_FALSE =
USER_SPECIFIED_JAVAH_TRUE = #
VERSION = 0.11+cvs
+WARNING_CFLAGS = -pedantic -W -Wall -Wmissing-declarations -Wwrite-strings -Wmissing-prototypes -Wno-long-long
XMLCATALOG =
XSLTPROC =
ZIP = /usr/bin/zip