Mon Dec 24 04:04:38 2012 UTC ()
fix typo in previous. grr.
(consequence of having separate build and commit machines)


(dholland)
diff -r1.3 -r1.4 pkgsrc/devel/swt/files/make_pkgsrc.mak
cvs diff -r1.3 -r1.4 pkgsrc/devel/swt/files/Attic/make_pkgsrc.mak (expand / switch to unified diff)

--- pkgsrc/devel/swt/files/Attic/make_pkgsrc.mak 2012/12/24 03:58:56 1.3
+++ pkgsrc/devel/swt/files/Attic/make_pkgsrc.mak 2012/12/24 04:04:38 1.4
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: make_pkgsrc.mak,v 1.3 2012/12/24 03:58:56 dholland Exp $ 1# $NetBSD: make_pkgsrc.mak,v 1.4 2012/12/24 04:04:38 dholland Exp $
2#******************************************************************************* 2#*******************************************************************************
3# Copyright (c) 2000, 2009 IBM Corporation and others. 3# Copyright (c) 2000, 2009 IBM Corporation and others.
4# All rights reserved. This program and the accompanying materials 4# All rights reserved. This program and the accompanying materials
5# are made available under the terms of the Eclipse Public License v1.0 5# are made available under the terms of the Eclipse Public License v1.0
6# which accompanies this distribution, and is available at 6# which accompanies this distribution, and is available at
7# http://www.eclipse.org/legal/epl-v10.html 7# http://www.eclipse.org/legal/epl-v10.html
8# 8#
9# Contributors: 9# Contributors:
10# IBM Corporation - initial API and implementation 10# IBM Corporation - initial API and implementation
11#******************************************************************************* 11#*******************************************************************************
12 12
13# Makefile for creating SWT libraries for Linux GTK 13# Makefile for creating SWT libraries for Linux GTK
14 14
@@ -37,27 +37,27 @@ SWTPI_LIB = lib$(SWTPI_PREFIX)-$(WS_PREF @@ -37,27 +37,27 @@ SWTPI_LIB = lib$(SWTPI_PREFIX)-$(WS_PREF
37CAIRO_LIB = lib$(CAIRO_PREFIX)-$(WS_PREFIX)-$(SWT_VERSION).so 37CAIRO_LIB = lib$(CAIRO_PREFIX)-$(WS_PREFIX)-$(SWT_VERSION).so
38ATK_LIB = lib$(ATK_PREFIX)-$(WS_PREFIX)-$(SWT_VERSION).so 38ATK_LIB = lib$(ATK_PREFIX)-$(WS_PREFIX)-$(SWT_VERSION).so
39GNOME_LIB = lib$(GNOME_PREFIX)-$(WS_PREFIX)-$(SWT_VERSION).so 39GNOME_LIB = lib$(GNOME_PREFIX)-$(WS_PREFIX)-$(SWT_VERSION).so
40MOZILLA_LIB = lib$(MOZILLA_PREFIX)-$(WS_PREFIX)-$(SWT_VERSION).so 40MOZILLA_LIB = lib$(MOZILLA_PREFIX)-$(WS_PREFIX)-$(SWT_VERSION).so
41XULRUNNER_LIB = lib$(XULRUNNER_PREFIX)-$(WS_PREFIX)-$(SWT_VERSION).so 41XULRUNNER_LIB = lib$(XULRUNNER_PREFIX)-$(WS_PREFIX)-$(SWT_VERSION).so
42XPCOMINIT_LIB = lib$(XPCOMINIT_PREFIX)-$(WS_PREFIX)-$(SWT_VERSION).so 42XPCOMINIT_LIB = lib$(XPCOMINIT_PREFIX)-$(WS_PREFIX)-$(SWT_VERSION).so
43GLX_LIB = lib$(GLX_PREFIX)-$(WS_PREFIX)-$(SWT_VERSION).so 43GLX_LIB = lib$(GLX_PREFIX)-$(WS_PREFIX)-$(SWT_VERSION).so
44 44
45CAIROCFLAGS = `pkg-config --cflags cairo` 45CAIROCFLAGS = `pkg-config --cflags cairo`
46CAIROLIBS = `pkg-config --libs-only-L cairo` `pkg-config --libs-only-other cairo` -lcairo 46CAIROLIBS = `pkg-config --libs-only-L cairo` `pkg-config --libs-only-other cairo` -lcairo
47 47
48# Do not use pkg-config to get libs because it includes unnecessary dependencies (i.e. pangoxft-1.0) 48# Do not use pkg-config to get libs because it includes unnecessary dependencies (i.e. pangoxft-1.0)
49GTKCFLAGS = `pkg-config --cflags gtk+-2.0` 49GTKCFLAGS = `pkg-config --cflags gtk+-2.0`
50GTKLIBS = `pkg-config --libs-only-L gtk+-2.0 gthread-2.0` `pkg-config --libs-only-other gtk+-2.0 gthread-2.0` -lgtk-x11-2.0 -lgthread-2.0 `pkgconfig --libs xtst` 50GTKLIBS = `pkg-config --libs-only-L gtk+-2.0 gthread-2.0` `pkg-config --libs-only-other gtk+-2.0 gthread-2.0` -lgtk-x11-2.0 -lgthread-2.0 `pkg-config --libs xtst`
51 51
52CDE_LIBS = -L$(CDE_HOME)/lib -R$(CDE_HOME)/lib -lXt -lX11 -lDtSvc 52CDE_LIBS = -L$(CDE_HOME)/lib -R$(CDE_HOME)/lib -lXt -lX11 -lDtSvc
53 53
54AWT_LIBS = -L$(JAVA_HOME)/jre/lib/$(LOWER_ARCH) -R$(JAVA_HOME)/jre/lib/$(LOWER_ARCH) -ljawt -shared 54AWT_LIBS = -L$(JAVA_HOME)/jre/lib/$(LOWER_ARCH) -R$(JAVA_HOME)/jre/lib/$(LOWER_ARCH) -ljawt -shared
55 55
56ATKCFLAGS = `pkg-config --cflags atk gtk+-2.0` 56ATKCFLAGS = `pkg-config --cflags atk gtk+-2.0`
57ATKLIBS = `pkg-config --libs-only-L atk gtk+-2.0` `pkg-config --libs-only-other atk gtk+-2.0` -latk-1.0 -lgtk-x11-2.0 57ATKLIBS = `pkg-config --libs-only-L atk gtk+-2.0` `pkg-config --libs-only-other atk gtk+-2.0` -latk-1.0 -lgtk-x11-2.0
58 58
59GNOMECFLAGS = `pkg-config --cflags gnome-vfs-module-2.0 libgnome-2.0 libgnomeui-2.0` 59GNOMECFLAGS = `pkg-config --cflags gnome-vfs-module-2.0 libgnome-2.0 libgnomeui-2.0`
60GNOMELIBS = `pkg-config --libs-only-L gnome-vfs-module-2.0 libgnome-2.0 libgnomeui-2.0` `pkg-config --libs-only-other gnome-vfs-module-2.0 libgnome-2.0 libgnomeui-2.0` -lgnomevfs-2 -lgnome-2 -lgnomeui-2 60GNOMELIBS = `pkg-config --libs-only-L gnome-vfs-module-2.0 libgnome-2.0 libgnomeui-2.0` `pkg-config --libs-only-other gnome-vfs-module-2.0 libgnome-2.0 libgnomeui-2.0` -lgnomevfs-2 -lgnome-2 -lgnomeui-2
61 61
62GLXCFLAGS = `pkg-config --cflags gl` 62GLXCFLAGS = `pkg-config --cflags gl`
63GLXLIBS = -shared -fPIC `pkg-config --libs gl x11` -lGLU -lm 63GLXLIBS = -shared -fPIC `pkg-config --libs gl x11` -lGLU -lm