-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Hi
Attached the patch for the version I intend to upload. Please respond if
you don't want this NMU to happen, if you are working yourself on a
patch or if you think that the attached patch won't work.
Cheers
Luk
- --
Luk Claes - http://people.debian.org/~luk - GPG key 1024D/9B7C328D
Fingerprint: D5AF 25FB 316B 53BB 08E7 F999 E544 DE07 9B7C 328D
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.2 (GNU/Linux)
iD8DBQFDYRCU5UTeB5t8Mo0RAnMhAJ94SKAU5gZ/xH+maPTxSdeKaZRLswCfRtyJ
y5tL6mbDbtKSmlSXq7Z1SEc=
=8+r+
-----END PGP SIGNATURE-----
diff -u xnecview-1.34/Imakefile xnecview-1.34/Imakefile
--- xnecview-1.34/Imakefile
+++ xnecview-1.34/Imakefile
@@ -1,6 +1,6 @@
-SYS_LIBRARIES = `gtk-config --libs` -lm -lpng10
+SYS_LIBRARIES = `gtk-config --libs` -lm -lpng12
DEFINES = -DHAVE_LIBPNG
-INCLUDES = `gtk-config --cflags` -I/usr/include/libpng10
+INCLUDES = `gtk-config --cflags` -I/usr/include/libpng12
SRCS = xnecview.h config.h xnecview.c xwin.c parse_input.c parse_output.c
draw.c draw_opaque.c freqplot.c postscript.c
OBJS = xnecview.o xwin.o parse_input.o parse_output.o draw.o draw_opaque.o
freqplot.o postscript.o
ComplexProgramTarget(xnecview)
diff -u xnecview-1.34/Makefile xnecview-1.34/Makefile
--- xnecview-1.34/Makefile
+++ xnecview-1.34/Makefile
@@ -1,56 +1,60 @@
# Makefile generated by imake - do not edit!
-# $Xorg: imake.c,v 1.5 2000/08/18 04:03:59 coskrey Exp $
+# $Xorg: imake.c,v 1.6 2001/02/09 02:03:15 xorgcvs Exp $
# ----------------------------------------------------------------------
# Makefile generated from "Imake.tmpl" and <Imakefile>
# $Xorg: Imake.tmpl,v 1.4 2000/08/17 19:41:46 cpqbld Exp $
+# $XdotOrg: xc/config/cf/Imake.tmpl,v 1.6 2004/07/28 03:24:29 gisburn Exp $
#
#
#
#
-# $XFree86: xc/config/cf/Imake.tmpl,v 3.102 2001/04/26 21:09:38 dawes Exp $
+# $XFree86: xc/config/cf/Imake.tmpl,v 3.155 2003/12/24 18:58:41 dickey Exp $
# ----------------------------------------------------------------------
all::
.SUFFIXES: .i
+# $XdotOrg: xc/config/cf/Imake.cf,v 1.4 2004/08/11 21:14:01 kem Exp $
# $Xorg: Imake.cf,v 1.4 2000/08/17 19:41:45 cpqbld Exp $
-# $XFree86: xc/config/cf/Imake.cf,v 3.66 2001/04/18 16:13:17 dawes Exp $
+# $XFree86: xc/config/cf/Imake.cf,v 3.88 2003/12/16 21:30:21 herrb Exp $
# Keep cpp from replacing path elements containing i486/i586/i686
-# for compatibility with 3.3.x
-
# -----------------------------------------------------------------------
# site-specific configuration parameters that need to come before
# the platform-specific parameters - edit site.def to change
# site: $TOG: site.sample /main/r64_final/1 1998/02/05 16:28:49 kaleb $
-# site: $XFree86: xc/config/cf/site.def,v 3.23 2000/03/31 22:55:15 dawes Exp $
+# site: $XFree86: xc/config/cf/site.def,v 3.24 2000/06/25 20:17:29 dawes Exp $
-# $XFree86: xc/config/cf/xf86site.def,v 3.172 2001/02/26 18:27:56 dawes Exp $
+# $XFree86: xc/config/cf/xf86site.def,v 3.186 2003/06/25 18:06:22 eich Exp $
# ----------------------------------------------------------------------
# platform-specific configuration parameters - edit linux.cf to change
+# $XdotOrg: xc/config/cf/linux.cf,v 1.13 2004/08/11 21:14:01 kem Exp $
# platform: $Xorg: linux.cf,v 1.3 2000/08/17 19:41:47 cpqbld Exp $
-# platform: $XFree86: xc/config/cf/linux.cf,v 3.165 2001/04/19 19:54:43 dawes
Exp $
+# platform: $XFree86: xc/config/cf/linux.cf,v 3.220 2003/12/30 22:38:33 tsi
Exp $
-# operating system: Linux 2.4.18-686 i686 [ELF] (2.4.18)
-# libc: (6.3.2)
-# binutils: (34)
+# operating system: Linux 2.6.12-1-k7 i686 [ELF] (2.6.12)
+# libc: (6.3.5)
+# binutils: (216)
# $Xorg: lnxLib.rules,v 1.3 2000/08/17 19:41:47 cpqbld Exp $
-# $XFree86: xc/config/cf/lnxLib.rules,v 3.40 2001/02/16 01:26:08 dawes Exp $
+# $XFree86: xc/config/cf/lnxLib.rules,v 3.52 2003/10/31 20:49:03 herrb Exp $
-# $XFree86: xc/config/cf/xfree86.cf,v 3.360 2001/05/19 00:26:41 dawes Exp $
+# $XdotOrg: xc/config/cf/xorg.cf,v 1.27.2.6 2005/01/24 03:11:42 gisburn Exp $
# $Xorg: xfree86.cf,v 1.4 2000/08/17 19:41:49 cpqbld Exp $
+XORG_VERSION_CURRENT = (((6) * 10000000) + ((8) * 100000) + ((2) * 1000) + 0)
+RELEASE_VERSION = RELEASE-1
+
AFB_DEFS = -DUSE_AFB
DRIVERSDKDIR = $(USRLIBDIR)/Server
@@ -66,12 +70,21 @@
XFREE86DOCDIR = $(DOCDIR)
XFREE86PSDOCDIR = $(DOCPSDIR)
+ XFREE86PDFDOCDIR = $(DOCPDFDIR)
XFREE86HTMLDOCDIR = $(DOCHTMLDIR)
XFREE86JAPANESEDOCDIR = $(DOCDIR)/Japanese
# $Xorg: xf86.rules,v 1.3 2000/08/17 19:41:48 cpqbld Exp $
-# $XFree86: xc/config/cf/xf86.rules,v 3.32 2000/10/30 23:02:06 tsi Exp $
+# $XFree86: xc/config/cf/xf86.rules,v 3.34tsi Exp $
+
+ SELINUX_LDFLAGS =
+
+ SELINUX_INCLUDES = -I/usr/include/selinux
+
+ SELINUX_CFLAGS = -DHAVE_SELINUX
+
+ SELINUX_LIBS = -lselinux
# ----------------------------------------------------------------------
# site-specific configuration parameters that go after
@@ -79,30 +92,35 @@
# site: $TOG: site.sample /main/r64_final/1 1998/02/05 16:28:49 kaleb $
-# site: $XFree86: xc/config/cf/site.def,v 3.23 2000/03/31 22:55:15 dawes Exp $
+# site: $XFree86: xc/config/cf/site.def,v 3.24 2000/06/25 20:17:29 dawes Exp $
# ---------------------------------------------------------------------
# Imake rules for building libraries, programs, scripts, and data files
# rules: $Xorg: Imake.rules,v 1.3 2000/08/17 19:41:46 cpqbld Exp $
+# rules: $XdotOrg: xc/config/cf/Imake.rules,v 1.6 2004/08/13 17:21:43 krh Exp
$
#
#
#
#
-# rules: $XFree86: xc/config/cf/Imake.rules,v 3.94.2.1 2001/07/28 15:06:39
dawes Exp $
+# rules: $XFree86: xc/config/cf/Imake.rules,v 3.128 2003/11/15 03:25:17 dawes
Exp $
+
+.PHONY: all interfaces install install.man install.lib install.sdk depend
includes cleandir
_NULLCMD_ = @ echo -n
+X_BYTE_ORDER = X_LITTLE_ENDIAN
+
GLIDE2INCDIR = /usr/include/glide
GLIDE3INCDIR = /usr/include/glide3
GLIDE3LIBNAME = glide3
-TKLIBNAME = tk8.3
+TKLIBNAME = tk8.4
TKLIBDIR = /usr/lib
-TCLLIBNAME = tcl8.3
+TCLLIBNAME = tcl8.4
TCLIBDIR = /usr/lib
@@ -117,8 +135,9 @@
MKDIRHIER = mkdir -p
REVPATH = revpath
EXPORTLISTGEN =
- RMAN = RmanCmd
- RMANOPTIONS = RmanOptions
+ RMAN = /usr/bin/rman
+ RMANBASENAME = rman
+ RMANOPTIONS =
CONFIGSRC = $(TOP)/config
IMAKESRC = $(CONFIGSRC)/imake
DEPENDSRC = $(CONFIGSRC)/util
@@ -133,11 +152,17 @@
LINTLIBDIR = $(USRLIBDIR)/lint
MANPATH = /usr/X11R6/man
MANSOURCEPATH = $(MANPATH)/man
- MANDIR = $(MANSOURCEPATH)1
- LIBMANDIR = $(MANSOURCEPATH)3
- FILEMANDIR = $(MANSOURCEPATH)5
- MISCMANDIR = $(MANSOURCEPATH)$(MISCMANSUFFIX)
- DRIVERMANDIR = $(MANSOURCEPATH)$(DRIVERMANSUFFIX)
+ MANDIR = $(MANSOURCEPATH)$(MANSECT)
+ SYSCALLMANDIR = $(MANSOURCEPATH)$(SYSCALLMANSECT)
+ LIBMANDIR = $(MANSOURCEPATH)$(LIBMANSECT)
+ DRIVERMANDIR = $(MANSOURCEPATH)4
+ FILEMANDIR = $(MANSOURCEPATH)$(FILEMANSECT)
+ GAMEMANDIR = $(MANSOURCEPATH)$(GAMEMANSECT)
+ MISCMANDIR = $(MANSOURCEPATH)7
+ ADMMANDIR = $(MANSOURCEPATH)$(ADMMANSECT)
+ ICONDIR = /usr/X11R6/lib/X11/icons
+ XCURSORPATH =
~/.icons:/usr/share/icons:/usr/share/pixmaps:/usr/X11R6/lib/X11/icons
+ DRIVERMANDIR = $(MANSOURCEPATH)4
LOGDIRECTORY = $(VARDIR)/log
VARRUNDIR = $(VARDIR)/run
@@ -145,20 +170,27 @@
VARDBDIR = $(VARDIR)/lib
AR = ar clq
+
+# Nice try but useless: make will inherit BOOTSTRAPCFLAGS
+# from top Makefile
BOOTSTRAPCFLAGS =
- CC = gcc
- AS = as
+
+ CC = gcc -m32
+ AS = gcc -m32 -c -x assembler
.SUFFIXES: .cc
- CXX = c++
+ CXX = c++ -m32
+
CXXFILT = c++filt
- CXXLIB =
- CXXDEBUGFLAGS = -O2 -fno-strength-reduce
+
+ CXXLIB = -lstdc++
+
+ CXXDEBUGFLAGS = -g -O2 -fno-strict-aliasing
CXXDEPENDINCLUDES =
CXXEXTRA_DEFINES =
CXXEXTRA_INCLUDES =
- CXXSTD_DEFINES = -Dlinux -D__i386__ -D_POSIX_C_SOURCE=199309L
-D_POSIX_SOURCE -D_XOPEN_SOURCE -D_BSD_SOURCE -D_SVID_SOURCE
$(CXXPROJECT_DEFINES)
+ CXXSTD_DEFINES = -Dlinux -D__i386__ -D_POSIX_C_SOURCE=199309L
-D_POSIX_SOURCE -D_XOPEN_SOURCE
-D_BSD_SOURCE -D_SVID_SOURCE
$(CXXPROJECT_DEFINES)
CXXOPTIONS =
CXXINCLUDES = $(INCLUDES) $(TOP_INCLUDES) $(CXXEXTRA_INCLUDES)
CXXDEFINES = $(CXXINCLUDES) $(CXXSTD_DEFINES) $(THREADS_CXXDEFINES)
$(DEFINES) $(CXXEXTRA_DEFINES)
@@ -166,19 +198,25 @@
COMPRESS = compress
GZIPCMD = gzip
- CPP = /lib/cpp $(STD_CPP_DEFINES)
- RAWCPP = /lib/cpp -undef $(STD_CPP_OPTIONS)
- PREPROCESSCMD = gcc -E $(STD_CPP_DEFINES)
+
+ CPP = cpp $(STD_CPP_DEFINES)
+ RAWCPP = cpp -undef $(STD_CPP_OPTIONS)
+ PREPROCESSCMD = gcc -m32 -E $(STD_CPP_DEFINES)
+
INSTALL = install
INSTALLFLAGS = -c
- LD = ld
+
+ LD = gcc -m32 -nostdlib
+
LEX = flex -l
M4 = m4
M4FLAGS =
LEXLIB = -lfl
YACC = bison -y
CCYACC = bison -y
+
LINT = lint
+
LINTLIBFLAG = -C
LINTOPTS = -axz
LN = ln -s
@@ -187,24 +225,45 @@
CP = cp
RANLIB = ranlib
+
RANLIBINSTFLAGS =
RM = rm -f
PERL = perl
PERLOPTS =
- MANSUFFIX = 1x
- LIBMANSUFFIX = 3x
- FILEMANSUFFIX = 5x
- MISCMANSUFFIX = 7
- DRIVERMANSUFFIX = 4
+ PERLENVSETUP = env LC_ALL=C
+
+ MANSECT = 1
+ SYSCALLMANSECT = 2
+ LIBMANSECT = 3
+ DRIVERMANSECT = 4
+ FILEMANSECT = 5
+ GAMEMANSECT = 6
+ MISCMANSECT = 7
+ ADMMANSECT = 8
+ MANSRCSECT = s
+ MANNEWSECT = n
+ PROJECTMANSUFFIX = x
+ MANSUFFIX = $(MANSECT)$(PROJECTMANSUFFIX)
+ SYSCALLMANSUFFIX = $(SYSCALLMANSECT)$(PROJECTMANSUFFIX)
+ LIBMANSUFFIX = $(LIBMANSECT)$(PROJECTMANSUFFIX)
+ DRIVERMANSUFFIX = 4x
+ FILEMANSUFFIX = $(FILEMANSECT)$(PROJECTMANSUFFIX)
+ GAMEMANSUFFIX = $(GAMEMANSECT)$(PROJECTMANSUFFIX)
+ MISCMANSUFFIX = 7x
+ ADMMANSUFFIX = $(ADMMANSECT)$(PROJECTMANSUFFIX)
+ ADMINMANSUFFIX = 8
MANSRCSUFFIX = man
MANNEWSUFFIX = _man
- MANDEFS = -D__apploaddir__=$(XAPPLOADDIR)
-D__filemansuffix__=$(FILEMANSUFFIX) -D__miscmansuffix__=$(MISCMANSUFFIX)
-D__drivermansuffix__=$(DRIVERMANSUFFIX) -D__projectroot__=$(PROJECTROOT)
$(XORGMANDEFS) $(VENDORMANDEFS)
+ MANDEFS = -D__apploaddir__=$(XAPPLOADDIR)
-D__filemansuffix__=$(FILEMANSECT)$(PROJECTMANSUFFIX)
-D__osfilemansuffix__=$(FILEMANSECT)
-D__libmansuffix__=$(LIBMANSECT)$(PROJECTMANSUFFIX)
-D__oslibmansuffix__=$(LIBMANSECT)
-D__mansuffix__=$(MANSECT)$(PROJECTMANSUFFIX) -D__osmansuffix__=$(MANSECT)
-D__syscallmansuffix__=$(SYSCALLMANSECT)$(PROJECTMANSUFFIX)
-D__ossysmansuffix__=$(SYSCALLMANSECT)
-D__gamemansuffix__=$(GAMEMANSECT)$(PROJECTMANSUFFIX)
-D__osgamemansuffix__=$(GAMEMANSECT)
-D__miscmansuffix__=$(MISCMANSECT)$(PROJECTMANSUFFIX)
-D__osmiscmansuffix__=$(MISCMANSECT)
-D__admmansuffix__=$(ADMMANSECT)$(PROJECTMANSUFFIX)
-D__osadmmansuffix__=$(ADMMANSECT)
-D__miscmansuffix__=$(MISCMANSECT)$(PROJECTMANSUFFIX)
-D__osmiscmansuffix__=$(MISCMANSECT)
-D__drivermansuffix__=$(DRIVERMANSECT)$(PROJECTMANSUFFIX)
-D__osdrivermansuffix__=$(DRIVERMANSECT) -D__adminmansuffix__=$(ADMINMANSUFFIX)
-D__projectroot__=$(PROJECTROOT) -D__xconfigfile__=$(XCONFIGFILE)
-D__xconfigdir__=$(XCONFIGDIR) -D__xlogfile__=$(XLOGFILE)
-D__xservername__=$(XSERVERNAME)
-D__appmansuffix__=$(MANSECT)$(PROJECTMANSUFFIX) $(XORGMANDEFS) $(VENDORMANDEFS)
COMPRESSMANCMD = gzip -n
TROFF = groff -Tps
NROFF = nroff
+
+ HTMLROFF = groff -Thtml
+
MSMACROS = -ms
MANMACROS = -man
TBL = tbl
@@ -212,15 +271,20 @@
NEQN = neqn
COL = col
COLFLAGS = -b
- MODCC = gcc
- MODCPP = /lib/cpp
+
+ MODCC = gcc -m32
+
+ MODCPP = cpp
MODCFLAGS = $(CFLAGS)
- MODAS = as
+ MODAS = gcc -m32 -c -x assembler
MODASFLAGS =
- MODLD = ld
+
+ MODLD = gcc -m32 -nostdlib
+
MODLDFLAGS =
MODLDCOMBINEFLAGS = -r
MODAR = ar clq
+
MODRANLIB = ranlib
DVIPS = dvips
@@ -228,8 +292,8 @@
STD_INCLUDES =
STD_CPP_OPTIONS = -traditional
- STD_CPP_DEFINES = -traditional -Dlinux -D__i386__ -D_POSIX_C_SOURCE=199309L
-D_POSIX_SOURCE -D_XOPEN_SOURCE -D_BSD_SOURCE -D_SVID_SOURCE
$(PROJECT_DEFINES)
- STD_DEFINES = -Dlinux -D__i386__ -D_POSIX_C_SOURCE=199309L
-D_POSIX_SOURCE -D_XOPEN_SOURCE -D_BSD_SOURCE -D_SVID_SOURCE
$(PROJECT_DEFINES)
+ STD_CPP_DEFINES = -traditional -Dlinux -D__i386__ -D_POSIX_C_SOURCE=199309L
-D_POSIX_SOURCE -D_XOPEN_SOURCE
-D_BSD_SOURCE -D_SVID_SOURCE
$(PROJECT_DEFINES)
+ STD_DEFINES = -Dlinux -D__i386__ -D_POSIX_C_SOURCE=199309L
-D_POSIX_SOURCE -D_XOPEN_SOURCE
-D_BSD_SOURCE -D_SVID_SOURCE
$(PROJECT_DEFINES)
EXTRA_LOAD_FLAGS =
EXTRA_LDOPTIONS =
EXTRA_LIBRARIES =
@@ -240,7 +304,7 @@
SHAREDCODEDEF =
SHLIBDEF =
- SHLIBLDFLAGS = -shared
+ SHLIBLDFLAGS = -shared $(SHLIBGLOBALSFLAGS)
PICFLAGS = -fPIC
@@ -260,14 +324,14 @@
PROJECTROOT = /usr/X11R6
- CDEBUGFLAGS = -O2 -fno-strength-reduce
+ CDEBUGFLAGS = -g -O2 -fno-strict-aliasing
CCOPTIONS =
- ALLINCLUDES = $(INCLUDES) $(EXTRA_INCLUDES) $(TOP_INCLUDES)
$(STD_INCLUDES)
+ ALLINCLUDES = $(INCLUDES) $(EXTRA_INCLUDES) $(TOP_INCLUDES)
$(INSTALLED_INCLUDES) $(STD_INCLUDES)
ALLDEFINES = $(ALLINCLUDES) $(STD_DEFINES) $(PROTO_DEFINES)
$(THREADS_DEFINES) $(MODULE_DEFINES) $(DEFINES) $(EXTRA_DEFINES)
CFLAGS = $(CDEBUGFLAGS) $(CCOPTIONS) $(THREADS_CFLAGS)
$(MODULE_CFLAGS) $(ALLDEFINES)
LINTFLAGS = $(LINTOPTS) -DLINT $(ALLDEFINES) $(DEPEND_DEFINES)
- LDPRELIB = -L$(USRLIBDIR)
+ LDPRELIB = -L$(USRLIBDIR) $(INSTALLED_LIBS)
LDPOSTLIB =
LDOPTIONS = $(CDEBUGFLAGS) $(CCOPTIONS) $(EXTRA_LDOPTIONS)
$(THREADS_LDFLAGS) $(LOCAL_LDFLAGS) $(LDPRELIBS)
CXXLDOPTIONS = $(CXXDEBUGFLAGS) $(CXXOPTIONS) $(EXTRA_LDOPTIONS)
$(THREADS_CXXLDFLAGS) $(LOCAL_LDFLAGS) $(LDPRELIBS)
@@ -281,46 +345,45 @@
LDSTRIPFLAGS = -x
LDCOMBINEFLAGS = -r
DEPENDFLAGS =
- DEPEND_DEFINES = -DUSE_MAKEDEPEND
+ DEPEND_DEFINES =
# Not sure this belongs here
TKLIBDIR = /usr/lib
TKINCDIR = /usr/include
- TKLIBNAME = tk8.3
+ TKLIBNAME = tk8.4
TKLIBRARY = -L$(TKLIBDIR) -l$(TKLIBNAME)
TCLLIBDIR = /usr/lib
TCLINCDIR = /usr/include
- TCLLIBNAME = tcl8.3
+ TCLLIBNAME = tcl8.4
TCLLIBRARY = -L$(TCLLIBDIR) -l$(TCLLIBNAME)
MACROFILE = linux.cf
RM_CMD = $(RM)
IMAKE_DEFINES =
+ IMAKE_WARNINGS = -Wundef
IRULESRC = $(CONFIGDIR)
- IMAKE_CMD = $(IMAKE) -DUseInstalled -I$(IRULESRC) $(IMAKE_DEFINES)
+ IMAKE_CMD = $(IMAKE) -DUseInstalled -I$(IRULESRC) $(IMAKE_DEFINES)
$(IMAKE_WARNINGS)
- ICONFIGFILES = $(IRULESRC)/Imake.tmpl $(IRULESRC)/X11.tmpl
$(IRULESRC)/site.def $(IRULESRC)/$(MACROFILE)
$(IRULESRC)/xfree86.cf $(IRULESRC)/xf86.rules $(IRULESRC)/xf86site.def
$(IRULESRC)/host.def $(EXTRA_ICONFIGFILES)
+ ICONFIGFILES = $(IRULESRC)/Imake.tmpl $(IRULESRC)/X11.tmpl
$(IRULESRC)/site.def $(IRULESRC)/$(MACROFILE)
$(IRULESRC)/xfree86.cf $(IRULESRC)/xf86.rules $(IRULESRC)/xorgsite.def
$(IRULESRC)/host.def $(EXTRA_ICONFIGFILES)
# $Xorg: X11.rules,v 1.4 2000/08/17 19:41:46 cpqbld Exp $
-# $XFree86: xc/config/cf/X11.rules,v 1.5 2000/11/06 19:24:00 dawes Exp $
+# $XFree86: xc/config/cf/X11.rules,v 1.6 2001/01/17 16:22:31 dawes Exp $
# ----------------------------------------------------------------------
# X Window System Build Parameters and Rules
+# $XdotOrg: xc/config/cf/X11.tmpl,v 1.35.2.3 2005/02/01 04:07:39 gisburn Exp $
# $Xorg: X11.tmpl,v 1.6 2000/08/17 19:41:46 cpqbld Exp $
#
#
#
#
-# $XFree86: xc/config/cf/X11.tmpl,v 1.115.2.2 2001/05/29 18:21:57 dawes Exp $
+# $XFree86: xc/config/cf/X11.tmpl,v 1.248 2004/02/16 04:07:37 dawes Exp $
-XORGRELSTRING = Release 6.5
-XORGMANNAME = X Version 11
-
-VENDORMANNAME = XFree86
-VENDORMANVERSION = Version 4.1.0.1
+XORGRELSTRING = `echo 6 8 2 | sed 's/ /./g'`
+ XORGMANNAME = X Version 11
STICKY_DEFINES = -DHAS_STICKY_DIR_BIT
@@ -339,6 +402,7 @@
BUILDBINDIR = $(TOP)/exports/bin
BUILDBINTOP = ../..
BUILDMODULEDIR = $(BUILDLIBDIR)/modules
+ BUILDI18NDIR = $(BUILDLIBDIR)/locale
BUILDMODULETOP = $(BUILDLIBTOP)/..
XBUILDINCROOT = $(XTOP)/exports
XBUILDINCDIR = $(XBUILDINCROOT)/include/X11
@@ -346,10 +410,13 @@
XBUILDBINDIR = $(XBUILDINCROOT)/bin
INCDIR = $(INCROOT)
ADMDIR = /usr/adm
- LIBDIR = $(USRLIBDIR)/X11
+ LIBDIR = /usr/X11R6/lib/X11
LIBEXECDIR = /usr/X11R6/libexec
MODULEDIR = $(USRLIBDIR)/modules
TOP_X_INCLUDES =
+ XBINDIR = $(PROJECTROOT)/bin
+
+ INSTSRCDIR = /usr/X11R6/src
ETCX11DIR = /etc/X11
@@ -358,6 +425,7 @@
DOCDIR = $(LIBDIR)/doc
DOCHTMLDIR = $(DOCDIR)/html
DOCPSDIR = $(DOCDIR)/PostScript
+ DOCPDFDIR = $(DOCDIR)/PDF
FONTDIR = $(LIBDIR)/fonts
ENCODINGSDIR = $(FONTDIR)/encodings
XINITDIR = $(LIBDIR)/xinit
@@ -367,7 +435,6 @@
XSMDIR = $(LIBDIR)/xsm
NLSDIR = $(LIBDIR)/nls
XLOCALEDIR = $(LIBDIR)/locale
- PEXAPIDIR = $(LIBDIR)/PEX
LBXPROXYDIR = $(LIBDIR)/lbxproxy
PROXYMANAGERDIR = $(LIBDIR)/proxymngr
XPRINTDIR = $(LIBDIR)/xserver
@@ -376,14 +443,15 @@
INSTAPPFLAGS = $(INSTDATFLAGS)
- RGB = $(BINDIR)/rgb
- FONTC = $(BINDIR)/bdftopcf
- MKFONTDIR = $(BINDIR)/mkfontdir
- XFTCACHE = $(BINDIR)/xftcache
- MKHTMLINDEX = $(BINDIR)/mkhtmlindex
- UCS2ANY = $(BINDIR)/ucs2any.pl
- BDFTRUNCATE = $(BINDIR)/bdftruncate.pl
+ RGB = $(XBINDIR)/rgb
+ FONTC = $(XBINDIR)/bdftopcf
+ MKFONTSCALE = $(XBINDIR)/mkfontscale
+ MKFONTDIR = $(XBINDIR)/mkfontdir
+ MKHTMLINDEX = $(XBINDIR)/mkhtmlindex
+ UCS2ANY = $(XBINDIR)/ucs2any
+ BDFTRUNCATE = $(XBINDIR)/bdftruncate
UCSMAPPREFIX = $(FONTDIR)/util/map-
+ XCURSORGEN = $(XBINDIR)/xcursorgen
HTMLINDEXCMD = HtmlIndexCmd
@@ -408,23 +476,40 @@
FONTSERVERSRC = $(PROGRAMSRC)/xfs
FONTINCSRC = $(XTOP)/include/fonts
EXTINCSRC = $(XTOP)/include/extensions
- FTSOURCEDIR = $(TOP)/extras/FreeType
- XTTSOURCEDIR = $(TOP)/extras/X-TrueType
+ FTSOURCEDIR = FreeTypeSrcDir
+ DRMSRCDIR = $(TOP)/extras/drm
MESASRCDIR = $(TOP)/extras/Mesa
OGLSAMPLESRCDIR = $(TOP)/extras/ogl-sample
PSWRAPSRC = $(XTOP)/config/pswrap
TRANSCOMMSRC = $(LIBSRC)/xtrans
TRANS_INCLUDES = -I$(TRANSCOMMSRC)
- CONNECTION_FLAGS = -DUNIXCONN -DTCPCONN $(STICKY_DEFINES) $(FCHOWN_DEFINES)
+ CONNECTION_FLAGS = -DUNIXCONN -DTCPCONN $(STICKY_DEFINES) $(FCHOWN_DEFINES)
-DIPv6
+XTRANS_FAILDEFINES = -DFAIL_HARD
- XORGMANDEFS = -D__xorgversion__='"$(XORGRELSTRING)" "$(XORGMANNAME)"'
- VENDORMANDEFS = -D__vendorversion__='"$(VENDORMANVERSION)"
"$(VENDORMANNAME)"'
+ VENDORMANNAME = X.Org
+ VENDORMANVERSION = `echo 6 8 2 | sed -e 's/ /./g' -e 's/^/Version\\\ /'`
+ XORGMANDEFS = -D__xorgversion__="$(XORGRELSTRING) Release"'
"$(XORGMANNAME)"'
+ VENDORMANDEFS = -D__vendorversion__="$(VENDORMANVERSION) $(VENDORMANNAME)"
+ VENDORNAME = The X.Org Foundation
+ VENDORNAMESHORT = X.Org
+
+ VENDORWEBSUPPORT = http://wiki.X.Org
+
+VENDORSUPPORTDEFS = -D__VENDORDWEBSUPPORT__='"$(VENDORWEBSUPPORT)"'
+
+ XKBDEFRULES = xorg
+ XKBDEFRULESDEFS = -D__XKBDEFRULES__='"$(XKBDEFRULES)"'
+
+ XCONFIGFILE = xorg.conf
+ XCONFIGDIR = $(LIBDIR)
+ XLOGFILE = Xorg
+ XSERVERNAME = Xorg
XENVLIBDIR = $(USRLIBDIR)
- CLIENTENVSETUP = LD_LIBRARY_PATH=$(XENVLIBDIR)
+ CLIENTENVSETUP = LD_LIBRARY_PATH=$(XENVLIBDIR)
XLOCALEDIR=$(BUILDLIBDIR)/locale
# $Xorg: lnxLib.tmpl,v 1.3 2000/08/17 19:41:47 cpqbld Exp $
-# $XFree86: xc/config/cf/lnxLib.tmpl,v 3.13 2001/01/17 16:22:32 dawes Exp $
+# $XFree86: xc/config/cf/lnxLib.tmpl,v 3.19 2003/10/15 22:47:48 herrb Exp $
XLIBSRC = $(LIBSRC)/X11
@@ -434,7 +519,9 @@
LINTXONLY = $(LINTLIBDIR)/llib-lX11.ln
+ DEPXLIBONLY = $(DEPXONLYLIB)
XLIBONLY = $(XONLYLIB)
+ LINTXONLYLIB = $(LINTXONLY)
XEXTLIBSRC = $(LIBSRC)/Xext
@@ -451,53 +538,84 @@
XSSLIBSRC = $(LIBSRC)/Xss
-DEPXSSLIB = $(USRLIBDIR)/libXss.a
+SOXSSREV = 1.0
+DEPXSSLIB =
XSSLIB = -lXss
LINTXSS = $(LINTLIBDIR)/llib-lXss.ln
XXF86MISCLIBSRC = $(LIBSRC)/Xxf86misc
-DEPXXF86MISCLIB = $(USRLIBDIR)/libXxf86misc.a
+SOXXF86MISCREV = 1.1
+DEPXXF86MISCLIB =
XXF86MISCLIB = -lXxf86misc
LINTXXF86MISC = $(LINTLIBDIR)/llib-lXxf86misc.ln
XXF86VMLIBSRC = $(LIBSRC)/Xxf86vm
-DEPXXF86VMLIB = $(USRLIBDIR)/libXxf86vm.a
+SOXXF86VMREV = 1.0
+DEPXXF86VMLIB =
XXF86VMLIB = -lXxf86vm
LINTXXF86VM = $(LINTLIBDIR)/llib-lXxf86vm.ln
XXF86DGALIBSRC = $(LIBSRC)/Xxf86dga
-DEPXXF86DGALIB = $(USRLIBDIR)/libXxf86dga.a
+SOXXF86DGAREV = 1.0
+DEPXXF86DGALIB =
XXF86DGALIB = -lXxf86dga
LINTXXF86DGA = $(LINTLIBDIR)/llib-lXxf86dga.ln
XXF86RUSHLIBSRC = $(LIBSRC)/Xxf86rush
-DEPXXF86RUSHLIB = $(USRLIBDIR)/libXxf86rush.a
+SOXXF86RUSHREV = 1.0
+DEPXXF86RUSHLIB =
XXF86RUSHLIB = -lXxf86rush
LINTXXF86RUSH = $(LINTLIBDIR)/llib-lXxf86rush.ln
XVLIBSRC = $(LIBSRC)/Xv
-DEPXVLIB = $(USRLIBDIR)/libXv.a
+SOXVREV = 1.0
+DEPXVLIB =
XVLIB = -lXv
LINTXV = $(LINTLIBDIR)/llib-lXv.ln
+ XVMCLIBSRC = $(LIBSRC)/XvMC
+
+SOXVMCREV = 1.0
+DEPXVMCLIB =
+XVMCLIB = -lXvMC
+
+LINTXVMC = $(LINTLIBDIR)/llib-lXvMC.ln
+
XINERAMALIBSRC = $(LIBSRC)/Xinerama
-DEPXINERAMALIB = $(USRLIBDIR)/libXinerama.a
+SOXINERAMAREV = 1.0
+DEPXINERAMALIB =
XINERAMALIB = -lXinerama
LINTXINERAMA = $(LINTLIBDIR)/llib-lXinerama.ln
+ XRESLIBSRC = $(LIBSRC)/XRes
+
+SOXRESREV = 1.0
+DEPXRESLIB =
+XRESLIB = -lXRes
+
+LINTXRES = $(LINTLIBDIR)/llib-lXRes.ln
+
+ DMXLIBSRC = $(LIBSRC)/dmx
+
+SODMXREV = 1.0
+DEPDMXLIB =
+DMXLIB = -ldmx
+
+LINTDMX = $(LINTLIBDIR)/llib-ldmx.ln
+
DPSLIBSRC = $(LIBSRC)/dps
SODPSREV = 1.0
@@ -545,13 +663,74 @@
LINTGLW = $(LINTLIBDIR)/llib-lGLw.ln
- XRENDERLIBSRC = $(LIBSRC)/Xrender
-
-SOXRENDERREV = 1.0
+XRENDERDIR = /usr
+XRENDERLIBDIR = /usr/lib
+XRENDERINCDIR = /usr/include
+XRENDERLIB = -L$(XRENDERLIBDIR) -lXrender
DEPXRENDERLIB =
-XRENDERLIB = -lXrender
-LINTXRENDER = $(LINTLIBDIR)/llib-lXrender.ln
+XRENDERINCLUDES = -I$(XRENDERINCDIR)
+
+ XRANDRLIBSRC = $(LIBSRC)/Xrandr
+
+SOXRANDRREV = 2.0
+DEPXRANDRLIB =
+XRANDRLIB = -lXrandr
+
+LINTXRANDR = $(LINTLIBDIR)/llib-lXrandr.ln
+
+ XFIXESLIBSRC = $(LIBSRC)/Xfixes
+
+SOXFIXESREV = 3.0
+DEPXFIXESLIB =
+XFIXESLIB = -lXfixes
+
+LINTXFIXES = $(LINTLIBDIR)/llib-lXfixes.ln
+
+ XDAMAGELIBSRC = $(LIBSRC)/Xdamage
+
+SOXDAMAGEREV = 1.0
+DEPXDAMAGELIB =
+XDAMAGELIB = -lXdamage
+
+LINTXDAMAGE = $(LINTLIBDIR)/llib-lXdamage.ln
+
+XCOMPOSITELIBSRC = $(LIBSRC)/Xcomposite
+
+SOXCOMPOSITEREV = 1.0
+DEPXCOMPOSITELIB =
+XCOMPOSITELIB = -lXcomposite
+
+LINTXCOMPOSITE = $(LINTLIBDIR)/llib-lXcomposite.ln
+
+XEVIELIBSRC = $(LIBSRC)/Xevie
+
+SOXEVIEREV = 1.0
+DEPXEVIELIB =
+XEVIELIB = -lXevie
+
+LINTXEVIE = $(LINTLIBDIR)/llib-lXevie.ln
+
+XCURSORDIR = /usr
+XCURSORLIBDIR = /usr/lib
+XCURSORINCDIR = /usr/include
+XCURSORLIB = -L$(XCURSORLIBDIR) -lXcursor
+
+XCURSORINCLUDES=-I$(XCURSORINCDIR) $(XRENDERINCLUDES)
+
+ APPLEWMLIBSRC = $(LIBSRC)/apple
+
+DEPAPPLEWMLIB = $(USRLIBDIR)/libAppleWM.a
+APPLEWMLIB = -lAppleWM
+
+LINTAPPLEWM = $(LINTLIBDIR)/llib-lAppleWM.ln
+
+ WINDOWSWMLIBSRC = $(LIBSRC)/windows
+
+DEPWINDOWSWMLIB = $(USRLIBDIR)/libWindowsWM.a
+WINDOWSWMLIB = -lWindowsWM
+
+LINTWINDOWSWM = $(LINTLIBDIR)/llib-lWindowsWM.ln
XFONTCACHELIBSRC = $(LIBSRC)/Xfontcache
@@ -562,14 +741,16 @@
XAUTHSRC = $(LIBSRC)/Xau
-DEPXAUTHLIB = $(USRLIBDIR)/libXau.a
+SOXAUTHREV = 6.0
+DEPXAUTHLIB =
XAUTHLIB = -lXau
LINTXAUTH = $(LINTLIBDIR)/llib-lXau.ln
XDMCPLIBSRC = $(LIBSRC)/Xdmcp
-DEPXDMCPLIB = $(USRLIBDIR)/libXdmcp.a
+SOXDMCPREV = 6.0
+DEPXDMCPLIB =
XDMCPLIB = -lXdmcp
LINTXDMCP = $(LINTLIBDIR)/llib-lXdmcp.ln
@@ -627,12 +808,20 @@
AWIDGETSRC = $(LIBSRC)/Xaw
-SOXAWREV = 7.0
+SOXAWREV = 8.0
DEPXAWLIB =
XAWLIB = -lXaw
LINTXAW = $(LINTLIBDIR)/llib-lXaw.ln
+ AWIDGET7SRC = $(LIBSRC)/Xaw7
+
+SOXAW7REV = 7.0
+DEPXAW7LIB =
+XAW7LIB = -lXaw
+
+LINTXAW7 = $(LINTLIBDIR)/llib-lXaw.ln
+
AWIDGET6SRC = $(LIBSRC)/Xaw6
SOXAW6REV = 6.1
@@ -657,29 +846,6 @@
LINTXTEST = $(LINTLIBDIR)/llib-lXtst.ln
- PEXLIBSRC = $(LIBSRC)/PEX5
-
-SOPEXREV = 6.0
-DEPPEXLIB =
-PEXLIB = -lPEX5
-
-LINTPEX = $(LINTLIBDIR)/llib-lPEX5.ln
-
- XIELIBSRC = $(LIBSRC)/XIE
-
-SOXIEREV = 6.0
-DEPXIELIB =
-XIELIB = -lXIE
-
-LINTXIE = $(LINTLIBDIR)/llib-lXIE.ln
-
- PHIGSLIBSRC = $(LIBSRC)/PHIGS
-
-DEPPHIGSLIB = $(USRLIBDIR)/libphigs.a
-PHIGSLIB = -lphigs
-
-LINTPHIGS = $(LINTLIBDIR)/llib-lphigs.ln
-
DEPXBSDLIB = $(USRLIBDIR)/libXbsd.a
XBSDLIB = -lXbsd
@@ -711,7 +877,8 @@
FSLIBSRC = $(LIBSRC)/FS
-DEPFSLIB = $(USRLIBDIR)/libFS.a
+SOFSREV = 6.0
+DEPFSLIB =
FSLIB = -lFS
LINTFS = $(LINTLIBDIR)/llib-lFS.ln
@@ -735,7 +902,14 @@
LINTFONTSTUB = $(LINTLIBDIR)/llib-lfntstubs.ln
DEPFONTLIB = $(DEPXFONTLIB) $(DEPFONTSTUBLIB)
- FONTLIB = $(XFONTLIB) $(FONTSTUBLIB)
+ FONTLIB = $(XFONTLIB) $(FONTSTUBLIB) $(FREETYPE2LIB)
+
+ FONTENCLIBSRC = $(LIBSRC)/fontenc
+
+DEPXFONTENCLIB = $(USRLIBDIR)/libfontenc.a
+XFONTENCLIB = -lfontenc
+
+LINTXFONTENC = $(LINTLIBDIR)/llib-lfontenc.ln
XPMLIBSRC = $(LIBSRC)/Xpm
@@ -745,45 +919,96 @@
LINTXPM = $(LINTLIBDIR)/llib-lXpm.ln
- FREETYPE2LIBSRC = $(LIBSRC)/freetype2
+FREETYPE2DIR = /usr
+FREETYPE2LIBDIR = /usr/lib
+FREETYPE2INCDIR = /usr/include
-SOFREETYPE2REV = 6.0
-DEPFREETYPE2LIB =
-FREETYPE2LIB = -lfreetype
+FREETYPE2LIB = -lfreetype
-LINTFREETYPE2 = $(LINTLIBDIR)/llib-lfreetype.ln
+FREETYPE2INCLUDES = -I$(FREETYPE2INCDIR)/freetype2
-I$(FREETYPE2INCDIR)/freetype2/config
-FREETYPE2DIR = /usr
-FREETYPE2LIBDIR = /usr/lib
-FREETYPE2INCDIR = /usr/include/freetype2
-FREETYPE2INCLUDES = -I$(FREETYPE2INCDIR)
-FREETYPE2LIB = -L$(FREETYPE2LIBDIR) -lfreetype
FREETYPE2DEFINES = -DFREETYPE2
- XFTLIBSRC = $(LIBSRC)/Xft
+ EXPATLIBSRC = $(LIBSRC)/expat
+
+SOEXPATREV = 0.4
+DEPEXPATLIB =
+EXPATLIB = -lexpat
+
+LINTEXPAT = $(LINTLIBDIR)/llib-lexpat.ln
-SOXFTREV = 1.1
-DEPXFTLIB =
-XFTLIB = -lXft
+EXPATDIR = /usr
+EXPATLIBDIR = /usr/lib
+EXPATINCDIR = /usr/include
-LINTXFT = $(LINTLIBDIR)/llib-lXft.ln
+EXPATINCLUDES =
+
+EXPATLIB = -lexpat
+
+EXPATDEFINES = -DEXPAT
+
+XFTDIR = /usr
+XFTLIBDIR = /usr/lib
+XFTINCDIR = /usr/include
+XFTLIB = -L$(XFTLIBDIR) -lXft
+
+XFTINCLUDES= -I$(XFTINCDIR) $(FONTCONFIGINCLUDES) $(FREETYPE2INCLUDES)
$(XRENDERINCLUDES)
+
+FONTCONFIGDIR = /usr
+FONTCONFIGLIBDIR = /usr/lib
+FONTCONFIGINCDIR = /usr/include
+FONTCONFIGBINDIR = /usr/bin
+
+FONTCONFIGLIB = -lfontconfig
+
+FONTCONFIGINCLUDES =
+
+FCCACHE = $(FONTCONFIGBINDIR)/fc-cache
+
+FONTCONFIGDEFINES = -DFONTCONFIG
+
+LIBPNGINCDIR = /usr/include
+
+LIBPNGINC=
+
+LIBPNGDIR = /usr
+LIBPNGLIBDIR = /usr/lib
+LIBPNGINCDIR = /usr/include
+
+LIBPNGLIB = -lpng
XKBFILELIBSRC = $(LIBSRC)/xkbfile
-DEPXKBFILELIB = $(USRLIBDIR)/libxkbfile.a
+SOXKBFILEREV = 1.0
+DEPXKBFILELIB =
XKBFILELIB = -lxkbfile
LINTXKBFILE = $(LINTLIBDIR)/llib-lxkbfile.ln
- XKBCOMPCMD = $(BINDIR)/xkbcomp
+ XKBCOMPCMD = $(XBINDIR)/xkbcomp
XKBUILIBSRC = $(LIBSRC)/xkbui
-DEPXKBUILIB = $(USRLIBDIR)/libxkbui.a
+SOXKBUIREV = 1.0
+DEPXKBUILIB =
XKBUILIB = -lxkbui
LINTXKBUI = $(LINTLIBDIR)/llib-lxkbui.ln
+EXTRAXAWREQS = $(XPLIB)
+
+EXTRAXAWCLIENTDEPLIBS = $(DEPXPLIB)
+
+EXTRAXAWCLIENTLIBS = $(XPLIB)
+
+ XTRAPLIBSRC = $(LIBSRC)/XTrap
+
+SOXTRAPREV = 6.4
+DEPXTRAPLIB =
+XTRAPLIB = -lXTrap
+
+LINTXTRAP = $(LINTLIBDIR)/llib-lXTrap.ln
+
DEPLIBS = $(DEPXAWLIB) $(DEPXMULIB) $(DEPXTOOLLIB) $(DEPXLIB)
DEPLIBS1 = $(DEPLIBS)
@@ -797,29 +1022,34 @@
DEPLIBS9 = $(DEPLIBS)
DEPLIBS10 = $(DEPLIBS)
+ XFTPRELOADPATTERN = libXft.so.?
+ XRENDERPRELOADPATTERN = libXrender.so.?
+ XFONTPRELOADPATTERN = libXfont*.so.?
+
XMULIBONLY = -lXmu
XMULIB = $(XMULIBONLY) $(XTOOLLIB) $(XLIB)
CONFIGDIR = $(LIBDIR)/config
USRLIBDIRPATH = $(USRLIBDIR)
- LDPRELIBS = -L$(USRLIBDIR)
+ LDPRELIBS = -L$(USRLIBDIR) $(INSTALLED_LIBS)
LDPOSTLIBS =
TOP_INCLUDES = -I$(INCROOT) $(TOP_X_INCLUDES)
PROJECT_DEFINES =
+ VENDOR_DEFINES = -DXVENDORNAME='"$(VENDORNAME)"'
-DXVENDORNAMESHORT='"$(VENDORNAMESHORT)"'
CXXPROJECT_DEFINES =
# ----------------------------------------------------------------------
# start of Imakefile
-SYS_LIBRARIES = `gtk-config --libs` -lm -lpng10
+SYS_LIBRARIES = `gtk-config --libs` -lm -lpng12
DEFINES = -DHAVE_LIBPNG
-INCLUDES = `gtk-config --cflags` -I/usr/include/libpng10
+INCLUDES = `gtk-config --cflags` -I/usr/include/libpng12
SRCS = xnecview.h config.h xnecview.c xwin.c parse_input.c parse_output.c
draw.c draw_opaque.c freqplot.c postscript.c
OBJS = xnecview.o xwin.o parse_input.o parse_output.o draw.o draw_opaque.o
freqplot.o postscript.o
- PROGRAM = xnecview
+ PROGRAM = xnecview
all:: xnecview
@@ -829,12 +1059,12 @@
install:: xnecview
@if [ -d $(DESTDIR)$(BINDIR) ]; then \
- set +x; \
+ set +x; \
else \
- if [ -h $(DESTDIR)$(BINDIR) ]; then \
- (set -x; rm -f $(DESTDIR)$(BINDIR)); \
- fi; \
- (set -x; $(MKDIRHIER) $(DESTDIR)$(BINDIR)); \
+ if [ -h $(DESTDIR)$(BINDIR) ]; then \
+ (set -x; rm -f $(DESTDIR)$(BINDIR)); \
+ fi; \
+ (set -x; $(MKDIRHIER) $(DESTDIR)$(BINDIR)); \
fi
$(INSTALL) $(INSTALLFLAGS) $(INSTPGMFLAGS) xnecview
$(DESTDIR)$(BINDIR)/xnecview
@@ -842,19 +1072,25 @@
xnecview.$(MANNEWSUFFIX): xnecview.$(MANSRCSUFFIX)
$(RM) $@
- $(LN) xnecview.$(MANSRCSUFFIX) $@
+ if test -z "$(PREPROCESSMANPAGES)" ; then \
+ cd `dirname xnecview` && \
+ $(LN) `basename xnecview.$(MANSRCSUFFIX)` `basename [EMAIL
PROTECTED]; \
+ else \
+ $(RAWCPP) $(MANDEFS) $(EXTRAMANDEFS) \
+ < xnecview.$(MANSRCSUFFIX) | sed -e '/^# *[0-9][0-9]* *.*$$/d'
-e '/^#line *[0-9][0-9]* *.*$$/d' -e '/^[
]*XCOMM$$/s/XCOMM/#/' -e '/^[
]*XCOMM[^a-zA-Z0-9_]/s/XCOMM/#/' -e '/^[
]*XHASH/s/XHASH/#/' -e '/[EMAIL PROTECTED]@$$/s/[EMAIL
PROTECTED]@$$/\\/' >$@; \
+ fi
cleandir::
$(RM) xnecview.$(MANNEWSUFFIX)
install.man:: xnecview.$(MANNEWSUFFIX)
@if [ -d $(DESTDIR)$(MANDIR) ]; then \
- set +x; \
+ set +x; \
else \
- if [ -h $(DESTDIR)$(MANDIR) ]; then \
- (set -x; rm -f $(DESTDIR)$(MANDIR)); \
- fi; \
- (set -x; $(MKDIRHIER) $(DESTDIR)$(MANDIR)); \
+ if [ -h $(DESTDIR)$(MANDIR) ]; then \
+ (set -x; rm -f $(DESTDIR)$(MANDIR)); \
+ fi; \
+ (set -x; $(MKDIRHIER) $(DESTDIR)$(MANDIR)); \
fi
$(INSTALL) $(INSTALLFLAGS) $(INSTMANFLAGS) xnecview.$(MANNEWSUFFIX)
$(DESTDIR)$(MANDIR)/xnecview.$(MANSUFFIX)
@@ -874,18 +1110,28 @@
.c.i:
$(RM) $@
- $(CC) -E $(CFLAGS) $(_NOOP_) $*.c > $@
+ $(CC) -E $(CFLAGS) $(_NOOP_) $*.c > $@
+
+.SUFFIXES: .ii
+
+.cc.ii:
+ $(RM) $@
+ $(CC) -E $(CFLAGS) $(_NOOP_) $*.cc > $@
.SUFFIXES: .s
.c.s:
$(RM) $@
- $(CC) -S $(CFLAGS) $(_NOOP_) $*.c
+ $(CC) -S $(CFLAGS) $(_NOOP_) $*.c
+
+.cc.s:
+ $(RM) $@
+ $(CC) -S $(CFLAGS) $(_NOOP_) $*.cc
emptyrule::
cleandir::
- $(RM) *.CKP *.ln *.BAK *.bak *.o core errs ,* *~ *.a .emacs_* tags TAGS
make.log MakeOut "#"*
+ $(RM) *.CKP *.ln *.BAK *.bak *.o core errs ,* *~ *.a .emacs_* tags TAGS
make.log MakeOut grohtml*.png *-auto-*.png "#"*
Makefile::
[EMAIL PROTECTED] [ -f Makefile ]; then set -x; \
@@ -905,6 +1151,8 @@
distclean:: cleandir
+ PREPROCESSMANPAGES = true
+
# ----------------------------------------------------------------------
# empty rules for directories that do not have SUBDIRS - do not edit
@@ -924,7 +1172,7 @@
depend::
distclean::
- $(RM) Makefile
+ $(RM) Makefile Makefile.dep
# ----------------------------------------------------------------------
# dependencies generated by makedepend
diff -u xnecview-1.34/debian/changelog xnecview-1.34/debian/changelog
--- xnecview-1.34/debian/changelog
+++ xnecview-1.34/debian/changelog
@@ -1,3 +1,10 @@
+xnecview (1.34-7.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * libpng transition (Closes: #328334).
+
+ -- Luk Claes <[EMAIL PROTECTED]> Thu, 27 Oct 2005 19:19:04 +0200
+
xnecview (1.34-7) unstable; urgency=low
* fixed libpng10 png.h include path (closes: bug#324393)
-- Alan Bain <[EMAIL PROTECTED]> Wed, 24 Aug 2005 23:04:56 +0100
diff -u xnecview-1.34/debian/control xnecview-1.34/debian/control
--- xnecview-1.34/debian/control
+++ xnecview-1.34/debian/control
@@ -3,7 +3,7 @@
Priority: extra
Maintainer: Alan Bain <[EMAIL PROTECTED]>
Standards-Version: 3.6.2.1
-Build-Depends: libpng10-dev,libgtk1.2-dev,xlibs-dev,xutils,libxaw7-dev
+Build-Depends: libpng12-dev,libgtk1.2-dev,xlibs-dev,xutils,libxaw7-dev
Package: xnecview
Architecture: any
