This is the mail archive of the
java-patches@gcc.gnu.org
mailing list for the Java project.
[libjava] Cleanup automake conditionals (part 3)
- From: Kelley Cook <kcook34 at ford dot com>
- To: GCC Patches <gcc-patches at gcc dot gnu dot org>, GCJ-patches <java-patches at gcc dot gnu dot org>
- Date: Mon, 20 Jun 2005 14:31:39 -0400
- Subject: [libjava] Cleanup automake conditionals (part 3)
- Hop-count: 1
- Reply-to: Kelley Cook <kcook at gcc dot gnu dot org>
The final part of the libjava Automake conditional cleanups.
Bootstrapped and regtested i686-pc-gnu-linux.
OK to install?
2005-06-20 Kelley Cook <kcook@gcc.gnu.org>
* Makefile.am (SUBDIRS): Use append for conditional.
(toolexeclib_LTLIBRARIES): Likewise.
(lib_gnu_java_awt_peer_gtk_la_SOURCES): Directly define with
a conditional append.
* Makefile.in: Regenerate.
*** /home/kcook34/gcc-orig/libjava/Makefile.am Thu Jun 16 08:13:31 2005
--- ./Makefile.am Mon Jun 20 14:18:59 2005
***************
*** 7,17 ****
# May be used by various substitution variables.
gcc_version := $(shell cat $(top_srcdir)/../gcc/BASE-VER)
- ## Testsuite conditional.
- if TESTSUBDIR
- SUBDIRS = $(DIRLTDL) testsuite gcj include external
- else
SUBDIRS = $(DIRLTDL) gcj include external
endif
# write_entries_to_file - writes each entry in a list
--- 7,15 ----
# May be used by various substitution variables.
gcc_version := $(shell cat $(top_srcdir)/../gcc/BASE-VER)
SUBDIRS = $(DIRLTDL) gcj include external
+ if TESTSUBDIR
+ SUBDIRS += testsuite
endif
# write_entries_to_file - writes each entry in a list
***************
*** 32,55 ****
## What gets installed, and where.
##
if XLIB_AWT
! cond_xlib_ltlibrary = lib-gnu-awt-xlib.la
! else
! cond_xlib_ltlibrary =
endif
if GTK_AWT
! cond_gtk_ltlibrary = lib-gnu-java-awt-peer-gtk.la
! cond_gtk_gcjawt_ltlibrary = libgcjawt.la
! else
! cond_gtk_ltlibrary =
! cond_gtk_gcjawt_ltlibrary =
endif
- toolexeclib_LTLIBRARIES = libgcj.la libgij.la \
- $(cond_gtk_ltlibrary) $(cond_gtk_gcjawt_ltlibrary) $(cond_xlib_ltlibrary)
- toolexecmainlib_DATA = libgcj.spec
-
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = libgcj.pc
--- 30,46 ----
## What gets installed, and where.
##
+ toolexeclib_LTLIBRARIES = libgcj.la libgij.la
+ toolexecmainlib_DATA = libgcj.spec
+
if XLIB_AWT
! toolexeclib_LTLIBRARIES += lib-gnu-awt-xlib.la
endif
if GTK_AWT
! toolexeclib_LTLIBRARIES += lib-gnu-java-awt-peer-gtk.la libgcjawt.la
endif
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = libgcj.pc
***************
*** 141,150 ****
--encoding=UTF-8 \
-Wno-deprecated -fbootstrap-classes
- if USING_GCC
- AM_CFLAGS = @LIBGCJ_CFLAGS@ $(WARNINGS)
- else
AM_CFLAGS = @LIBGCJ_CFLAGS@
endif
## Extra CFLAGS used for JNI C sources shared with GNU Classpath.
--- 132,140 ----
--encoding=UTF-8 \
-Wno-deprecated -fbootstrap-classes
AM_CFLAGS = @LIBGCJ_CFLAGS@
+ if USING_GCC
+ AM_CFLAGS += $(WARNINGS)
endif
## Extra CFLAGS used for JNI C sources shared with GNU Classpath.
***************
*** 314,330 ****
## not available.
./gcj-dbtool -n $(db_name) || touch $(db_name)
- # Gtk/Cairo JNI sources.
- if GTK_CAIRO
- gtk_cairo_c_source_files = \
- jni/gtk-peer/gnu_java_awt_peer_gtk_GdkGraphics2D.c
- else
- gtk_cairo_c_source_files =
- endif
-
## Gtk JNI sources.
! gtk_c_source_files = \
! $(gtk_cairo_c_source_files) \
jni/gtk-peer/gnu_java_awt_peer_gtk_GdkTextLayout.c \
jni/gtk-peer/gnu_java_awt_peer_gtk_GdkFontPeer.c \
jni/gtk-peer/gnu_java_awt_peer_gtk_GdkGraphics.c \
--- 304,311 ----
## not available.
./gcj-dbtool -n $(db_name) || touch $(db_name)
## Gtk JNI sources.
! lib_gnu_java_awt_peer_gtk_la_SOURCES = \
jni/gtk-peer/gnu_java_awt_peer_gtk_GdkTextLayout.c \
jni/gtk-peer/gnu_java_awt_peer_gtk_GdkFontPeer.c \
jni/gtk-peer/gnu_java_awt_peer_gtk_GdkGraphics.c \
***************
*** 363,369 ****
jni/gtk-peer/gnu_java_awt_peer_gtk_GThreadNativeMethodRunner.c \
jni/gtk-peer/gthread-jni.c \
jni/gtk-peer/gtk_jawt.c \
! jni/classpath/native_state.c
## Java sources for Gtk peers.
gtk_awt_peer_source_files = \
--- 344,358 ----
jni/gtk-peer/gnu_java_awt_peer_gtk_GThreadNativeMethodRunner.c \
jni/gtk-peer/gthread-jni.c \
jni/gtk-peer/gtk_jawt.c \
! jni/classpath/native_state.c \
! jni/gtk-peer/gthread-jni.h \
! jni/gtk-peer/gtkpeer.h \
! jni/classpath/native_state.h
!
! # Gtk/Cairo JNI sources.
! if GTK_CAIRO
! lib_gnu_java_awt_peer_gtk_la_SOURCES += jni/gtk-peer/gnu_java_awt_peer_gtk_GdkGraphics2D.c
! endif
## Java sources for Gtk peers.
gtk_awt_peer_source_files = \
***************
*** 505,516 ****
## that JNI headers are built before JNI C files.
$(lib_gnu_java_awt_peer_gtk_la_OBJECTS): $(lib_gnu_java_awt_peer_gtk_la_DEPENDENCIES)
- lib_gnu_java_awt_peer_gtk_la_SOURCES = \
- $(gtk_c_source_files) \
- jni/gtk-peer/gthread-jni.h \
- jni/gtk-peer/gtkpeer.h \
- jni/classpath/native_state.h
-
lib_gnu_java_awt_peer_gtk_la_CFLAGS = \
-Ijniinclude -I$(srcdir)/jni/classpath \
-I$(srcdir)/jni/gtk-peer $(PEDANTIC_CFLAGS) $(GTK_CFLAGS) $(LIBART_CFLAGS) \
--- 494,499 ----