Removing vestigial MOTIF references from Makefiles

Martin Buchholz martinrb at google.com
Thu Jun 5 00:05:49 UTC 2008


Kelly or Tim, here's a bug report with patch.
Please file a bug and review my fix.

Compiling jawt, I see an unintended and unlikely-to-succeed CPP flag

-I/include

The culprit appears to be a vestigial reference to the undefined MOTIF_DIR

CPPFLAGS += -I$(OPENWIN_HOME)/include \
	    -I$(MOTIF_DIR)/include \

There are references to MOTIF_DIR and MOTIF_LIB in mawt.gmk as well,
but I completely failed to understand what's going on there.
Oh well.  Perhaps we could motivate someone to expunge the MOTIF gunk
left in there.

Here's the fix:

# HG changeset patch
# User martin
# Date 1212624109 25200
# Node ID 8d4107e89acb62063238f37ae6fa7226c00e9b2e
# Parent  b6601ba7f6dfe0d93e40b2891c581c30fdd92289
[mq]: NukeMotif.patch

diff --git a/make/sun/jawt/Makefile b/make/sun/jawt/Makefile
--- a/make/sun/jawt/Makefile
+++ b/make/sun/jawt/Makefile
@@ -93,7 +93,6 @@
 # Other extra flags needed for compiling.
 #
 CPPFLAGS += -I$(OPENWIN_HOME)/include \
-	    -I$(MOTIF_DIR)/include \
 	    -I$(SHARE_SRC)/native/$(PKGDIR)/debug \
             -I$(SHARE_SRC)/native/$(PKGDIR)/image \
 	    -I$(SHARE_SRC)/native/$(PKGDIR)/image/cvutils \

Here's the shell transcript excerpt

Rebuilding /home/martinrb/ws/build/build/linux-i586/lib/i386/libjawt.so
because of /home/martinrb/ws/build/build/linux-i586/tmp/sun/sun.awt/jawt/obj/.files_compiled
mapfile-vers
/usr/bin/gcc  -O2    -fno-strict-aliasing -fPIC -W -Wall  -Wno-unused
-Wno-parentheses -fno-omit-frame-pointer -D_LITTLE_ENDIAN   -Di586
-DARCH='"i586"' -DLINUX -DRELEASE='"1.7.0-internal"'
-D_LARGEFILE64_SOURCE -D_GNU_SOURCE -D_REENTRANT -I.
-I/home/martinrb/ws/build/build/linux-i586/tmp/sun/sun.awt/jawt/CClassHeaders
-I../../../src/solaris/javavm/export
-I../../../src/share/javavm/export -I../../../src/share/javavm/include
-I../../../src/solaris/javavm/include
-I../../../src/share/native/common
-I../../../src/solaris/native/common
-I../../../src/share/native/sun/awt
-I../../../src/solaris/native/sun/awt   -I/usr/X11R6/include
-I/include -I../../../src/share/native/sun/awt/debug
-I../../../src/share/native/sun/awt/image
-I../../../src/share/native/sun/awt/image/cvutils
-I../../../src/share/native/sun/awt/alphacomposite
-I../../../src/share/native/sun/awt/medialib
-I../../../src/solaris/native/sun/awt/medialib
-I../../../src/share/native/sun/awt/../java2d/loops
-I../../../src/share/native/sun/awt/../java2d/pipe
-I../../../src/share/native/sun/awt/../java2d/opengl
-I../../../src/solaris/native/sun/awt/../java2d/opengl
-I../../../src/solaris/native/sun/awt/../java2d/x11
-I../../../src/share/native/sun/awt/../dc/doe
-I../../../src/share/native/sun/awt/../dc/path
-I../../../src/solaris/native/sun/awt/../jdga  -Xlinker -O1 -Xlinker
-version-script=mapfile-vers  -Xlinker -z -Xlinker origin -Xlinker
-rpath -Xlinker \$ORIGIN  -z defs
-L/home/martinrb/ws/build/build/linux-i586/lib/i386
-Wl,-soname=libjawt.so   -shared -mimpure-text -o
/home/martinrb/ws/build/build/linux-i586/lib/i386/libjawt.so
/home/martinrb/ws/build/build/linux-i586/tmp/sun/sun.awt/jawt/obj/jawt.o
  -L/home/martinrb/ws/build/build/linux-i586/lib/i386 -lawt
-L/home/martinrb/ws/build/build/linux-i586/lib/i386/xawt -lmawt
-ljava -L/home/martinrb/ws/build/build/linux-i586/lib/i386/server
-ljvm -lc



More information about the build-dev mailing list