JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #87235 from NixOS/staging-next

Browse Source 
Staging next
This commit is contained in:
Frederik Rietdijk 2020-05-11 22:07:40 +02:00 committed by GitHub
commit 82ca249c92
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
28 changed files with 958 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
pkgs/build-support/rust/default.nix
View File

@ -1,4 +1,14 @@
{ stdenv, cacert, git, rust, cargo, rustc, fetchCargoTarball, buildPackages, windows }:
{ stdenv
, buildPackages
, cacert
, cargo
, diffutils
, fetchCargoTarball
, git
, rust
, rustc
, windows
}:
{ name ? "${args.pname}-${args.version}"
, cargoSha256 ? "unset"
@ -58,6 +68,10 @@ let
cxxForHost="${stdenv.cc}/bin/${stdenv.cc.targetPrefix}c++";
releaseDir = "target/${rustTarget}/${buildType}";
# Specify the stdenv's `diff` by abspath to ensure that the user's build
# inputs do not cause us to find the wrong `diff`.
diff = "${diffutils}/bin/diff";
in
stdenv.mkDerivation (args // {
@ -110,7 +124,7 @@ stdenv.mkDerivation (args // {
srcLockfile=$NIX_BUILD_TOP/$sourceRoot/Cargo.lock
echo "Validating consistency between $srcLockfile and $cargoDepsLockfile"
if ! diff $srcLockfile $cargoDepsLockfile; then
if ! ${diff} $srcLockfile $cargoDepsLockfile; then
# If the diff failed, first double-check that the file exists, so we can
# give a friendlier error msg.

4
pkgs/desktops/gnome-3/core/adwaita-icon-theme/default.nix
View File

@ -3,11 +3,11 @@
stdenv.mkDerivation rec {
pname = "adwaita-icon-theme";
version = "3.36.0";
version = "3.36.1";
src = fetchurl {
url = "mirror://gnome/sources/adwaita-icon-theme/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "066m3vd6k6xf3ap1ahrbw5hnx2322wf0qsnywcxjsj6snq9225qs";
sha256 = "0kgiq712lfidd81yzx0yk7qwlj3q8cymp6npnxyzsk844y353674";
};
# For convenience, we can specify adwaita-icon-theme only in packages

4
pkgs/development/libraries/audio/lv2/default.nix
View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "lv2";
version = "1.16.0";
version = "1.18.0";
src = fetchurl {
url = "https://lv2plug.in/spec/${pname}-${version}.tar.bz2";
sha256 = "1ppippbpdpv13ibs06b0bixnazwfhiw0d0ja6hx42jnkgdyp5hyy";
sha256 = "0gs7401xz23q9vajqr31aa2db8dvssgyh5zrvr4ipa6wig7yb8wh";
};
nativeBuildInputs = [ pkgconfig wafHook ];

4
pkgs/development/libraries/glib-networking/default.nix
View File

@ -18,13 +18,13 @@
stdenv.mkDerivation rec {
pname = "glib-networking";
version = "2.64.1";
version = "2.64.2";
outputs = [ "out" "installedTests" ];
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "0wmg5n2h0r1rcdmp4w48akqlsbpjrjrj6p59g5ylc5yqyzg4dhx4";
sha256 = "19wmyv7j355z1wk650fyygadbwwmmhqggr54845rn7smbiqz1pj5";
};
patches = [

4
pkgs/development/libraries/glibmm/default.nix
View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "glibmm";
version = "2.62.0";
version = "2.64.2";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "1ziwx6r7k7wbvg4qq1rgrv8zninapgrmhn1hs6926a3krh9ryr9n";
sha256 = "1v6lp23fr2qh4zshcnm28sn29j3nzgsvcqj2nhmrnvamipjq4lm7";
};
outputs = [ "out" "dev" ];

4
pkgs/development/libraries/gsettings-desktop-schemas/default.nix
View File

@ -7,11 +7,11 @@
stdenv.mkDerivation rec {
pname = "gsettings-desktop-schemas";
version = "3.36.0";
version = "3.36.1";
src = fetchurl {
url = "mirror://gnome/sources/gsettings-desktop-schemas/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "19hfjqzddkmvxg80v23xpbd1my2pzjalx3d56d2k4dk5521vcjkn";
sha256 = "1nf97vq07gadwdla6kws8z510xlmv0a7wlyqwwnhyagq7kjdnjq0";
};
passthru = {

4
pkgs/development/libraries/libdvdread/default.nix
View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "libdvdread";
version = "6.1.0";
version = "6.1.1";
src = fetchurl {
url = "http://get.videolan.org/libdvdread/${version}/${pname}-${version}.tar.bz2";
sha256 = "033mnhq3mx0qz3z85vw01rz5wzmx5ynadl7q1wm2spvx3ryvs6sh";
sha256 = "15hpwbw3nm84y432l0j61w0zmqxplsyymfc52dry6nvwl44p6d9y";
};
buildInputs = [libdvdcss];

4
pkgs/development/libraries/libgdiplus/default.nix
View File

@ -4,13 +4,13 @@
stdenv.mkDerivation rec {
pname = "libgdiplus";
version = "6.0.4";
version = "6.0.5";
src = fetchFromGitHub {
owner = "mono";
repo = "libgdiplus";
rev = version;
sha256 = "1pf3yhwq9qk0w3yv9bb8qlwwqkffg7xb4sgc8yqdnn6pa56i3vmn";
sha256 = "1387lgph5r17viv3rkf5hbksdn435njzmra7s17q0nzk2mkkm68c";
};
NIX_LDFLAGS = "-lgif";

4
pkgs/development/libraries/libgsf/default.nix
View File

@ -3,11 +3,11 @@
stdenv.mkDerivation rec {
pname = "libgsf";
version = "1.14.46";
version = "1.14.47";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "0bddmlzg719sjhlbzqlhb7chwk93qc7g68m2r9r8xz112jdradpa";
sha256 = "0kbpp9ksl7977xiga37sk1gdw1r039v6zviqznl7alvvg39yp26i";
};
nativeBuildInputs = [ pkgconfig intltool libintl ];

3
pkgs/development/libraries/libiberty/default.nix
View File

@ -3,7 +3,8 @@
let inherit (buildPackages.buildPackages) gcc; in
stdenv.mkDerivation {
name = "libiberty-${gcc.cc.version}";
pname = "libiberty";
version = "${gcc.cc.version}";
inherit (gcc.cc) src;

4
pkgs/development/libraries/libinput/default.nix
View File

@ -27,11 +27,11 @@ in
with stdenv.lib;
stdenv.mkDerivation rec {
pname = "libinput";
version = "1.15.4";
version = "1.15.5";
src = fetchurl {
url = "https://www.freedesktop.org/software/libinput/${pname}-${version}.tar.xz";
sha256 = "1ha5qyak1ka5npy5i6hzqfpii8samkj389mkppj4wdsfv536i2ww";
sha256 = "15ww4jl3lcxyi8m8idg8canklbqv729gnwpkz7r98c1w8a7zq3m9";
};
outputs = [ "bin" "out" "dev" ];

4
pkgs/development/libraries/libqmi/default.nix
View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "libqmi";
version = "1.24.6";
version = "1.24.10";
src = fetchurl {
url = "https://www.freedesktop.org/software/libqmi/${pname}-${version}.tar.xz";
sha256 = "1jfq8jdjc9z5c0g7m377svdlniwkr4k9hs7s8fsb5rvdq5xja98k";
sha256 = "1rzxapr6hb18ccvqh5fizx7zk63l47bs0p3gizycz2ysnm1i44n2";
};
outputs = [ "out" "dev" "devdoc" ];

4
pkgs/development/libraries/librsvg/default.nix
View File

@ -4,14 +4,14 @@
let
pname = "librsvg";
version = "2.48.2";
version = "2.48.4";
in
stdenv.mkDerivation rec {
name = "${pname}-${version}";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
sha256 = "1jmxd03fs8vkwycxpmx69kdfmgq52g64bhv82gmj3kjgw2h5h9i7";
sha256 = "0vlmgisf87dz4vcl1ypcw7g211wkyvhydv6ksf1p6mgdbkw3mdi8";
};
outputs = [ "out" "dev" "installedTests" ];

4
pkgs/development/libraries/libsass/default.nix
View File

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "libsass";
version = "3.6.3";
version = "3.6.4";
src = fetchFromGitHub {
owner = "sass";
repo = pname;
rev = version;
sha256 = "1q6lvd8sj5k5an32qir918pa5khhcb8h08dzrg1bcxmw7a23j514";
sha256 = "074kvacdan85h4qrvsk97575ys9xgkc044gplz3m6vn4a8pcl2rn";
# Remove unicode file names which leads to different checksums on HFS+
# vs. other filesystems because of unicode normalisation.
extraPostFetch = ''

4
pkgs/development/libraries/libsecret/default.nix
View File

@ -4,11 +4,11 @@
stdenv.mkDerivation rec {
pname = "libsecret";
version = "0.20.2";
version = "0.20.3";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "1hzz34gmsxxf1jm1b7qin390rkwbg8sx198xdkwxqp3q6cw19sc1";
sha256 = "1r4habxdzmn02id324m0m4mg5isf22q1z436bg3vjjmcz1b3rjsg";
};
postPatch = ''

4
pkgs/development/libraries/libuninameslist/default.nix
View File

@ -5,13 +5,13 @@
stdenv.mkDerivation rec {
pname = "libuninameslist";
version = "20200313";
version = "20200413";
src = fetchFromGitHub {
owner = "fontforge";
repo = pname;
rev = version;
sha256 = "1rs4mrmfcw7864kssnk559ac1sdlpl8yrd10xspxrnfz08ynqxw8";
sha256 = "0jbg94z00f5vwqyjfrbill6cjvzp1zrki6m3d235jjxyw0hm3wr5";
};
nativeBuildInputs = [

4
pkgs/development/libraries/libuv/default.nix
View File

@ -1,14 +1,14 @@
{ stdenv, lib, fetchFromGitHub, autoconf, automake, libtool, pkgconfig, ApplicationServices, CoreServices }:
stdenv.mkDerivation rec {
version = "1.35.0";
version = "1.37.0";
pname = "libuv";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = "v${version}";
sha256 = "0pd94h10ay38r8fwj0qqgw908rrj83n768n8mbbpnd5w2c7wy9fz";
sha256 = "0iy25w4wy9f5y7i7aqidhqz93qi00lv7vhx6s521n0kphvaj8ijz";
};
postPatch = let

4
pkgs/development/libraries/pangomm/default.nix
View File

@ -3,11 +3,11 @@
stdenv.mkDerivation rec {
pname = "pangomm";
version= "2.42.0";
version= "2.42.1";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "0mmzxp3wniaafkxr30sb22mq9x44xckb5d60h1bl99lkzxks0vfa";
sha256 = "03zli5amizhv9bfklwfq7xyf0b5dagchx1lnz9f0v1rhk69h9gql";
};
outputs = [ "out" "dev" ];

4
pkgs/development/libraries/poppler/default.nix
View File

@ -12,11 +12,11 @@ let
in
stdenv.mkDerivation rec {
name = "poppler-${suffix}-${version}";
version = "0.87.0"; # beware: updates often break cups-filters build, check texlive and scribusUnstable too!
version = "0.88.0"; # beware: updates often break cups-filters build, check texlive and scribusUnstable too!
src = fetchurl {
url = "${meta.homepage}/poppler-${version}.tar.xz";
sha256 = "b2ArnCTC0FeAvpPnMGIBAS5BRZ8om4J5onp5QxrUFQ4=";
sha256 = "1isns9s484irq9ir4hbhpyqf6af2xzswh2pfrvk1k9d5x423hidl";
};
outputs = [ "out" "dev" ];

15
pkgs/development/libraries/science/math/mkl/default.nix
View File

@ -20,6 +20,8 @@ let
openmp = if stdenvNoCC.isDarwin then "19.0" else "19.1";
openmp-ver = "${openmp}.${spot}-${rel}-${openmp}.${spot}-${rel}";
shlibExt = stdenvNoCC.hostPlatform.extensions.sharedLibrary;
in stdenvNoCC.mkDerivation {
pname = "mkl";
inherit version;
@ -114,10 +116,15 @@ in stdenvNoCC.mkDerivation {
'') + ''
# Setup symlinks for blas / lapack
ln -s $out/lib/libmkl_rt${stdenvNoCC.hostPlatform.extensions.sharedLibrary} $out/lib/libblas${stdenvNoCC.hostPlatform.extensions.sharedLibrary}${stdenvNoCC.lib.optionalString stdenvNoCC.hostPlatform.isLinux ".3"}
ln -s $out/lib/libmkl_rt${stdenvNoCC.hostPlatform.extensions.sharedLibrary} $out/lib/libcblas${stdenvNoCC.hostPlatform.extensions.sharedLibrary}${stdenvNoCC.lib.optionalString stdenvNoCC.hostPlatform.isLinux ".3"}
ln -s $out/lib/libmkl_rt${stdenvNoCC.hostPlatform.extensions.sharedLibrary} $out/lib/liblapack${stdenvNoCC.hostPlatform.extensions.sharedLibrary}${stdenvNoCC.lib.optionalString stdenvNoCC.hostPlatform.isLinux ".3"}
ln -s $out/lib/libmkl_rt${stdenvNoCC.hostPlatform.extensions.sharedLibrary} $out/lib/liblapacke${stdenvNoCC.hostPlatform.extensions.sharedLibrary}${stdenvNoCC.lib.optionalString stdenvNoCC.hostPlatform.isLinux ".3"}
ln -s $out/lib/libmkl_rt${shlibExt} $out/lib/libblas${shlibExt}
ln -s $out/lib/libmkl_rt${shlibExt} $out/lib/libcblas${shlibExt}
ln -s $out/lib/libmkl_rt${shlibExt} $out/lib/liblapack${shlibExt}
ln -s $out/lib/libmkl_rt${shlibExt} $out/lib/liblapacke${shlibExt}
'' + stdenvNoCC.lib.optionalString stdenvNoCC.hostPlatform.isLinux ''
ln -s $out/lib/libmkl_rt${shlibExt} $out/lib/libblas${shlibExt}".3"
ln -s $out/lib/libmkl_rt${shlibExt} $out/lib/libcblas${shlibExt}".3"
ln -s $out/lib/libmkl_rt${shlibExt} $out/lib/liblapack${shlibExt}".3"
ln -s $out/lib/libmkl_rt${shlibExt} $out/lib/liblapacke${shlibExt}".3"
'';
# fixDarwinDylibName fails for libmkl_cdft_core.dylib because the

16
pkgs/development/libraries/science/math/openblas/default.nix
View File

@ -93,6 +93,9 @@ let
if !builtins.isBool val then toString val
else if val then "1" else "0";
mkMakeFlagsFromConfig = mapAttrsToList (var: val: "${var}=${mkMakeFlagValue val}");
shlibExt = stdenv.hostPlatform.extensions.sharedLibrary;
in
stdenv.mkDerivation rec {
pname = "openblas";
@ -178,10 +181,15 @@ EOF
done
# Setup symlinks for blas / lapack
ln -s $out/lib/libopenblas${stdenv.hostPlatform.extensions.sharedLibrary} $out/lib/libblas${stdenv.hostPlatform.extensions.sharedLibrary}${stdenv.lib.optionalString stdenv.hostPlatform.isLinux ".3"}
ln -s $out/lib/libopenblas${stdenv.hostPlatform.extensions.sharedLibrary} $out/lib/libcblas${stdenv.hostPlatform.extensions.sharedLibrary}${stdenv.lib.optionalString stdenv.hostPlatform.isLinux ".3"}
ln -s $out/lib/libopenblas${stdenv.hostPlatform.extensions.sharedLibrary} $out/lib/liblapack${stdenv.hostPlatform.extensions.sharedLibrary}${stdenv.lib.optionalString stdenv.hostPlatform.isLinux ".3"}
ln -s $out/lib/libopenblas${stdenv.hostPlatform.extensions.sharedLibrary} $out/lib/liblapacke${stdenv.hostPlatform.extensions.sharedLibrary}${stdenv.lib.optionalString stdenv.hostPlatform.isLinux ".3"}
ln -s $out/lib/libopenblas${shlibExt} $out/lib/libblas${shlibExt}
ln -s $out/lib/libopenblas${shlibExt} $out/lib/libcblas${shlibExt}
ln -s $out/lib/libopenblas${shlibExt} $out/lib/liblapack${shlibExt}
ln -s $out/lib/libopenblas${shlibExt} $out/lib/liblapacke${shlibExt}
'' + stdenv.lib.optionalString stdenv.hostPlatform.isLinux ''
ln -s $out/lib/libopenblas${shlibExt} $out/lib/libblas${shlibExt}.3
ln -s $out/lib/libopenblas${shlibExt} $out/lib/libcblas${shlibExt}.3
ln -s $out/lib/libopenblas${shlibExt} $out/lib/liblapack${shlibExt}.3
ln -s $out/lib/libopenblas${shlibExt} $out/lib/liblapacke${shlibExt}.3
'';
meta = with stdenv.lib; {

8
pkgs/development/python-modules/numpy/default.nix
View File

@ -23,6 +23,14 @@ let
library_dirs = "${blas}/lib:${lapack}/lib";
libraries = "lapack,lapacke,blas,cblas";
};
lapack = {
include_dirs = "${lib.getDev lapack}/include";
library_dirs = "${lapack}/lib";
};
blas = {
include_dirs = "${lib.getDev blas}/include";
library_dirs = "${blas}/lib";
};
});
};
in buildPythonPackage rec {

4
pkgs/development/tools/build-managers/cmake/default.nix
View File

@ -19,12 +19,12 @@ stdenv.mkDerivation rec {
+ lib.optionalString useNcurses "-cursesUI"
+ lib.optionalString withQt5 "-qt5UI"
+ lib.optionalString useQt4 "-qt4UI";
version = "3.17.0";
version = "3.17.2";
src = fetchurl {
url = "${meta.homepage}files/v${lib.versions.majorMinor version}/cmake-${version}.tar.gz";
# compare with https://cmake.org/files/v${lib.versions.majorMinor version}/cmake-${version}-SHA-256.txt
sha256 = "0iq8y1rb5dqnzrwy4lssr76hbnnvh54q2ympl97wrshma6shak5p";
sha256 = "199srp8yfai51pcbpmfyc4s8vzrmh2dm91bp582hj2l29x634xzw";
};
patches = [

4
pkgs/development/tools/misc/help2man/default.nix
View File

@ -1,11 +1,11 @@
{ stdenv, fetchurl, perlPackages, gettext }:
stdenv.mkDerivation rec {
name = "help2man-1.47.13";
name = "help2man-1.47.15";
src = fetchurl {
url = "mirror://gnu/help2man/${name}.tar.xz";
sha256 = "08q5arxz4j4pyx5q4712c2rn7p7dw7as9xg38yvmsh1c3ynvpy5p";
sha256 = "076dvc0z0qp73rpmg0c8bkpfh969h4gzzc442hv1bcyf1srkann2";
};
nativeBuildInputs = [ gettext perlPackages.LocaleGettext ];

862
pkgs/misc/ghostscript/0001-Bug-702364-Fix-missing-echogs-dependencies.patch Normal file
View File

@ -0,0 +1,862 @@
From 9f56e78d111d726ca95a59b2d64e5c3298451505 Mon Sep 17 00:00:00 2001
From: Chris Liddell <chris.liddell@artifex.com>
Date: Mon, 27 Apr 2020 11:04:57 +0100
Subject: [PATCH] Bug 702364: Fix missing echogs dependencies
Rebased version of http://git.ghostscript.com/?p=ghostpdl.git;a=patch;h=1b4c3669a20c
to fix parallel build
---
contrib/contrib.mak | 281 ++++++++++++++++++++++----------------------
1 file changed, 143 insertions(+), 138 deletions(-)
diff --git a/contrib/contrib.mak b/contrib/contrib.mak
index 5411ae902..7dd9822a9 100644
--- a/contrib/contrib.mak
+++ b/contrib/contrib.mak
@@ -22,6 +22,10 @@
CONTRIB_MAK=$(CONTRIBDIR)$(D)contrib.mak $(TOP_MAKEFILES)
CONTRIBSRC=$(CONTRIBDIR)$(D)
+# Almost all device drivers depend on the following:
+CONTDEVH=$(gserrors_h) $(gx_h) $(gxdevice_h)
+CONTDEV=$(AK) $(ECHOGS_XE) $(GDEVH)
+
###### --------------------------- Catalog -------------------------- ######
# The following drivers are user-contributed, and maintained (if at all) by
@@ -161,19 +165,19 @@ $(DEVOBJ)gdevbjca.$(OBJ) : $(CONTRIBSRC)gdevbjca.c $(PDEVH) $(bjc_h) \
$(DEVCC) $(DEVO_)gdevbjca.$(OBJ) $(C_) $(CONTRIBSRC)gdevbjca.c
$(DD)bjcmono.dev : $(bjc_) $(DD)page.dev \
- $(CONTRIB_MAK) $(MAKEDIRS)
+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
$(SETPDEV) $(DD)bjcmono $(bjc_)
$(DD)bjcgray.dev : $(bjc_) $(DD)page.dev \
- $(CONTRIB_MAK) $(MAKEDIRS)
+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
$(SETPDEV) $(DD)bjcgray $(bjc_)
$(DD)bjccmyk.dev : $(bjc_) $(DD)page.dev \
- $(CONTRIB_MAK) $(MAKEDIRS)
+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
$(SETPDEV) $(DD)bjccmyk $(bjc_)
$(DD)bjccolor.dev : $(bjc_) $(DD)page.dev \
- $(CONTRIB_MAK) $(MAKEDIRS)
+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
$(SETPDEV) $(DD)bjccolor $(bjc_)
@@ -184,25 +188,25 @@ cdeskjet8_=$(DEVOBJ)gdevcd8.$(OBJ) $(HPPCL)
# Author: Uli Wortmann (uliw@erdw.ethz.ch), Martin Gerbershagen (ger@ulm.temic.de)
# Printer: HP 670
$(DD)cdj670.dev : $(cdeskjet8_) $(DD)page.dev \
- $(CONTRIB_MAK) $(MAKEDIRS)
+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
$(SETPDEV2) $(DD)cdj670 $(cdeskjet8_)
# Author: Uli Wortmann (uliw@erdw.ethz.ch)
# Printer: HP 850
$(DD)cdj850.dev : $(cdeskjet8_) $(DD)page.dev \
- $(CONTRIB_MAK) $(MAKEDIRS)
+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
$(SETPDEV2) $(DD)cdj850 $(cdeskjet8_)
# Author: Uli Wortmann (uliw@erdw.ethz.ch), Martin Gerbershagen (ger@ulm.temic.de)
# Printer: HP 890
$(DD)cdj890.dev : $(cdeskjet8_) $(DD)page.dev \
- $(CONTRIB_MAK) $(MAKEDIRS)
+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
$(SETPDEV2) $(DD)cdj890 $(cdeskjet8_)
# Author: Uli Wortmann (uliw@erdw.ethz.ch), Martin Gerbershagen (ger@ulm.temic.de)
# Printer: HP 1600
$(DD)cdj1600.dev : $(cdeskjet8_) $(DD)page.dev \
- $(CONTRIB_MAK) $(MAKEDIRS)
+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
$(SETPDEV2) $(DD)cdj1600 $(cdeskjet8_)
$(DEVOBJ)gdevcd8.$(OBJ) : $(CONTRIBSRC)gdevcd8.c $(PDEVH) $(math__h)\
@@ -220,7 +224,8 @@ $(DEVOBJ)gdevcd8.$(OBJ) : $(CONTRIBSRC)gdevcd8.c $(PDEVH) $(math__h)\
# Author: Matthew Gelhaus (mgelhaus@proaxis.com)
# Printer: HP 880c
-$(DD)cdj880.dev : $(cdeskjet8_) $(DD)page.dev
+$(DD)cdj880.dev : $(cdeskjet8_) $(DD)page.dev $(CONTDEV) \
+ $(CONTRIB_MAK) $(MAKEDIRS)
$(SETPDEV2) $(DD)cdj880 $(cdeskjet8_)
@@ -231,7 +236,7 @@ cdeskjet9_=$(DEVOBJ)gdevdj9.$(OBJ) $(HPPCL)
# Author: Rene Harsch (rene@harsch.net)
# Printer: HP 970Cxi
$(DD)cdj970.dev : $(cdeskjet9_) $(DD)page.dev \
- $(CONTRIB_MAK) $(MAKEDIRS)
+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
$(SETPDEV2) $(DD)cdj970 $(cdeskjet9_)
$(DEVOBJ)gdevdj9.$(OBJ) : $(CONTRIBSRC)gdevdj9.c $(PDEVH) $(math__h) $(string__h)\
@@ -244,7 +249,7 @@ $(DEVOBJ)gdevdj9.$(OBJ) : $(CONTRIBSRC)gdevdj9.c $(PDEVH) $(math__h) $(string__h
### NOTE: Same as chp2200 (some PJL and CRD changes).
$(DD)cdnj500.dev : $(cdeskjet8_) $(DD)page.dev \
- $(CONTRIB_MAK) $(MAKEDIRS)
+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
$(SETPDEV2) $(DD)cdnj500 $(cdeskjet8_)
@@ -253,7 +258,7 @@ $(DD)cdnj500.dev : $(cdeskjet8_) $(DD)page.dev \
### NOTE: Depends on the presence of the cdj850 section.
$(DD)chp2200.dev : $(cdeskjet8_) $(DD)page.dev \
- $(CONTRIB_MAK) $(MAKEDIRS)
+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
$(SETPDEV2) $(DD)chp2200 $(cdeskjet8_)
@@ -264,11 +269,11 @@ $(DD)chp2200.dev : $(cdeskjet8_) $(DD)page.dev \
GDIMONO=$(DEVOBJ)gdevgdi.$(OBJ) $(HPPCL)
$(DD)gdi.dev : $(GDIMONO) $(DD)page.dev \
- $(CONTRIB_MAK) $(MAKEDIRS)
+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
$(SETPDEV) $(DD)gdi $(GDIMONO)
$(DD)samsunggdi.dev : $(GDIMONO) $(DD)page.dev \
- $(CONTRIB_MAK) $(MAKEDIRS)
+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
$(SETPDEV) $(DD)samsunggdi $(GDIMONO)
$(DEVOBJ)gdevgdi.$(OBJ) : $(CONTRIBSRC)gdevgdi.c $(PDEVH) $(gdevpcl_h) \
@@ -282,17 +287,17 @@ $(DEVOBJ)gdevgdi.$(OBJ) : $(CONTRIBSRC)gdevgdi.c $(PDEVH) $(gdevpcl_h) \
hl1250_=$(DEVOBJ)gdevhl12.$(OBJ) $(HPDLJM)
$(DD)hl1250.dev : $(hl1250_) $(DD)page.dev \
- $(CONTRIB_MAK) $(MAKEDIRS)
+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
$(SETPDEV) $(DD)hl1250 $(hl1250_)
$(DD)hl1240.dev : $(hl1250_) $(DD)page.dev \
- $(CONTRIB_MAK) $(MAKEDIRS)
+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
$(SETPDEV) $(DD)hl1240 $(hl1250_)
# Author: Marek Michalkiewicz <marekm@linux.org.pl>
# Printer: Brother HL-1250 (may work with some other models too)
$(DEVOBJ)gdevhl12.$(OBJ) : $(CONTRIBSRC)gdevhl12.c $(PDEVH) $(gdevdljm_h) \
- $(CONTRIB_MAK) $(MAKEDIRS)
+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
$(DEVCC) $(DEVO_)gdevhl12.$(OBJ) $(C_) $(CONTRIBSRC)gdevhl12.c
@@ -303,37 +308,37 @@ ln03_=$(DEVOBJ)gdevln03.$(OBJ)
# Author: Ulrich Mueller (ulm@vsnhd1.cern.ch)
# Printer: DEC LN03
$(DD)ln03.dev : $(ln03_) $(DD)page.dev \
- $(CONTRIB_MAK) $(MAKEDIRS)
+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
$(SETPDEV) $(DD)ln03 $(ln03_)
# Author: Nick Brown (nick.brown@coe.int)
# Printer: DEClaser 2100
$(DD)dl2100.dev : $(ln03_) $(DD)page.dev \
- $(CONTRIB_MAK) $(MAKEDIRS)
+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
$(SETPDEV) $(DD)dl2100 $(ln03_)
# Author: Ian MacPhedran (macphed@dvinci.USask.CA)
# Printer: DEC LA50
$(DD)la50.dev : $(ln03_) $(DD)page.dev \
- $(CONTRIB_MAK) $(MAKEDIRS)
+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
$(SETPDEV) $(DD)la50 $(ln03_)
# Author: Bruce Lowekamp (lowekamp@csugrad.cs.vt.edu)
# Printer: DEC LA70
$(DD)la70.dev : $(ln03_) $(DD)page.dev \
- $(CONTRIB_MAK) $(MAKEDIRS)
+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
$(SETPDEV) $(DD)la70 $(ln03_)
# Author: Ian MacPhedran (macphed@dvinci.USask.CA)
# Printer: DEC LA75
$(DD)la75.dev : $(ln03_) $(DD)page.dev \
- $(CONTRIB_MAK) $(MAKEDIRS)
+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
$(SETPDEV) $(DD)la75 $(ln03_)
# Author: Andre' Beck (Andre_Beck@IRS.Inf.TU-Dresden.de)
# Printer: DEC LA75plus
$(DD)la75plus.dev : $(ln03_) $(DD)page.dev \
- $(CONTRIB_MAK) $(MAKEDIRS)
+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
$(SETPDEV) $(DD)la75plus $(ln03_)
$(DEVOBJ)gdevln03.$(OBJ) : $(CONTRIBSRC)gdevln03.c $(PDEVH) \
@@ -356,27 +361,27 @@ $(DEVOBJ)gdevescv.$(OBJ) : $(ESCV_SRC)gdevescv.c $(ESCV_SRC)gdevescv.h $(PDEVH)
$(DEVCC) -DA4 $(DEVO_)gdevescv.$(OBJ) $(C_) $(escv_opts) $(ESCV_SRC)gdevescv.c
$(DD)alc1900.dev : $(escv_) $(DD)page.dev \
- $(CONTRIB_MAK) $(MAKEDIRS)
+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
$(SETPDEV) $(DD)alc1900 $(escv_)
$(DD)alc2000.dev : $(escv_) $(DD)page.dev \
- $(CONTRIB_MAK) $(MAKEDIRS)
+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
$(SETPDEV) $(DD)alc2000 $(escv_)
$(DD)alc4000.dev : $(escv_) $(DD)page.dev \
- $(CONTRIB_MAK) $(MAKEDIRS)
+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
$(SETPDEV) $(DD)alc4000 $(escv_)
$(DD)alc4100.dev : $(escv_) $(DD)page.dev \
- $(CONTRIB_MAK) $(MAKEDIRS)
+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
$(SETPDEV) $(DD)alc4100 $(escv_)
$(DD)alc8500.dev : $(escv_) $(DD)page.dev \
- $(CONTRIB_MAK) $(MAKEDIRS)
+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
$(SETPDEV) $(DD)alc8500 $(escv_)
$(DD)alc8600.dev : $(escv_) $(DD)page.dev \
- $(CONTRIB_MAK) $(MAKEDIRS)
+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
$(SETPDEV) $(DD)alc8600 $(escv_)
$(DD)alc9100.dev : $(escv_) $(DD)page.dev \
@@ -384,11 +389,11 @@ $(DD)alc9100.dev : $(escv_) $(DD)page.dev \
$(SETPDEV) $(DD)alc9100 $(escv_)
$(DD)lp3000c.dev : $(escv_) $(DD)page.dev \
- $(CONTRIB_MAK) $(MAKEDIRS)
+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
$(SETPDEV) $(DD)lp3000c $(escv_)
$(DD)lp8000c.dev : $(escv_) $(DD)page.dev \
- $(CONTRIB_MAK) $(MAKEDIRS)
+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
$(SETPDEV) $(DD)lp8000c $(escv_)
$(DD)lp8200c.dev : $(escv_) $(DD)page.dev \
@@ -396,15 +401,15 @@ $(DD)lp8200c.dev : $(escv_) $(DD)page.dev \
$(SETPDEV) $(DD)lp8200c $(escv_)
$(DD)lp8300c.dev : $(escv_) $(DD)page.dev \
- $(CONTRIB_MAK) $(MAKEDIRS)
+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
$(SETPDEV) $(DD)lp8300c $(escv_)
$(DD)lp8500c.dev : $(escv_) $(DD)page.dev \
- $(CONTRIB_MAK) $(MAKEDIRS)
+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
$(SETPDEV) $(DD)lp8500c $(escv_)
$(DD)lp8800c.dev : $(escv_) $(DD)page.dev \
- $(CONTRIB_MAK) $(MAKEDIRS)
+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
$(SETPDEV) $(DD)lp8800c $(escv_)
$(DD)lp9000c.dev : $(escv_) $(DD)page.dev \
@@ -412,177 +417,177 @@ $(DD)lp9000c.dev : $(escv_) $(DD)page.dev \
$(SETPDEV) $(DD)lp9000c $(escv_)
$(DD)lp9200c.dev : $(escv_) $(DD)page.dev \
- $(CONTRIB_MAK) $(MAKEDIRS)
+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
$(SETPDEV) $(DD)lp9200c $(escv_)
$(DD)lp9500c.dev : $(escv_) $(DD)page.dev \
- $(CONTRIB_MAK) $(MAKEDIRS)
+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
$(SETPDEV) $(DD)lp9500c $(escv_)
$(DD)lp9800c.dev : $(escv_) $(DD)page.dev \
- $(CONTRIB_MAK) $(MAKEDIRS)
+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
$(SETPDEV) $(DD)lp9800c $(escv_)
$(DD)lps6500.dev : $(escv_) $(DD)page.dev \
- $(CONTRIB_MAK) $(MAKEDIRS)
+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
$(SETPDEV) $(DD)lps6500 $(escv_)
$(DD)epl2050.dev : $(escv_) $(DD)page.dev \
- $(CONTRIB_MAK) $(MAKEDIRS)
+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
$(SETPDEV) $(DD)epl2050 $(escv_)
$(DD)epl2050p.dev : $(escv_) $(DD)page.dev \
- $(CONTRIB_MAK) $(MAKEDIRS)
+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
$(SETPDEV) $(DD)epl2050p $(escv_)
$(DD)epl2120.dev : $(escv_) $(DD)page.dev \
- $(CONTRIB_MAK) $(MAKEDIRS)
+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
$(SETPDEV) $(DD)epl2120 $(escv_)
$(DD)epl2500.dev : $(escv_) $(DD)page.dev \
- $(CONTRIB_MAK) $(MAKEDIRS)
+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
$(SETPDEV) $(DD)epl2500 $(escv_)
$(DD)epl2750.dev : $(escv_) $(DD)page.dev \
- $(CONTRIB_MAK) $(MAKEDIRS)
+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
$(SETPDEV) $(DD)epl2750 $(escv_)
$(DD)epl5800.dev : $(escv_) $(DD)page.dev \
- $(CONTRIB_MAK) $(MAKEDIRS)
+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
$(SETPDEV) $(DD)epl5800 $(escv_)
$(DD)epl5900.dev : $(escv_) $(DD)page.dev \
- $(CONTRIB_MAK) $(MAKEDIRS)
+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
$(SETPDEV) $(DD)epl5900 $(escv_)
$(DD)epl6100.dev : $(escv_) $(DD)page.dev \
- $(CONTRIB_MAK) $(MAKEDIRS)
+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
$(SETPDEV) $(DD)epl6100 $(escv_)
$(DD)epl6200.dev : $(escv_) $(DD)page.dev \
- $(CONTRIB_MAK) $(MAKEDIRS)
+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
$(SETPDEV) $(DD)epl6200 $(escv_)
$(DD)lp1800.dev : $(escv_) $(DD)page.dev \
- $(CONTRIB_MAK) $(MAKEDIRS)
+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
$(SETPDEV) $(DD)lp1800 $(escv_)
$(DD)lp1900.dev : $(escv_) $(DD)page.dev \
- $(CONTRIB_MAK) $(MAKEDIRS)
+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
$(SETPDEV) $(DD)lp1900 $(escv_)
$(DD)lp2200.dev : $(escv_) $(DD)page.dev \
- $(CONTRIB_MAK) $(MAKEDIRS)
+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
$(SETPDEV) $(DD)lp2200 $(escv_)
$(DD)lp2400.dev : $(escv_) $(DD)page.dev \
- $(CONTRIB_MAK) $(MAKEDIRS)
+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
$(SETPDEV) $(DD)lp2400 $(escv_)
$(DD)lp2500.dev : $(escv_) $(DD)page.dev \
- $(CONTRIB_MAK) $(MAKEDIRS)
+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
$(SETPDEV) $(DD)lp2500 $(escv_)
$(DD)lp7500.dev : $(escv_) $(DD)page.dev \
- $(CONTRIB_MAK) $(MAKEDIRS)
+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
$(SETPDEV) $(DD)lp7500 $(escv_)
$(DD)lp7700.dev : $(escv_) $(DD)page.dev \
- $(CONTRIB_MAK) $(MAKEDIRS)
+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
$(SETPDEV) $(DD)lp7700 $(escv_)
$(DD)lp7900.dev : $(escv_) $(DD)page.dev \
- $(CONTRIB_MAK) $(MAKEDIRS)
+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
$(SETPDEV) $(DD)lp7900 $(escv_)
$(DD)lp8100.dev : $(escv_) $(DD)page.dev \
- $(CONTRIB_MAK) $(MAKEDIRS)
+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
$(SETPDEV) $(DD)lp8100 $(escv_)
$(DD)lp8300f.dev : $(escv_) $(DD)page.dev \
- $(CONTRIB_MAK) $(MAKEDIRS)
+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
$(SETPDEV) $(DD)lp8300f $(escv_)
$(DD)lp8400f.dev : $(escv_) $(DD)page.dev \
- $(CONTRIB_MAK) $(MAKEDIRS)
+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
$(SETPDEV) $(DD)lp8400f $(escv_)
$(DD)lp8600.dev : $(escv_) $(DD)page.dev \
- $(CONTRIB_MAK) $(MAKEDIRS)
+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
$(SETPDEV) $(DD)lp8600 $(escv_)
$(DD)lp8600f.dev : $(escv_) $(DD)page.dev \
- $(CONTRIB_MAK) $(MAKEDIRS)
+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
$(SETPDEV) $(DD)lp8600f $(escv_)
$(DD)lp8700.dev : $(escv_) $(DD)page.dev \
- $(CONTRIB_MAK) $(MAKEDIRS)
+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
$(SETPDEV) $(DD)lp8700 $(escv_)
$(DD)lp8900.dev : $(escv_) $(DD)page.dev \
- $(CONTRIB_MAK) $(MAKEDIRS)
+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
$(SETPDEV) $(DD)lp8900 $(escv_)
$(DD)lp9000b.dev : $(escv_) $(DD)page.dev \
- $(CONTRIB_MAK) $(MAKEDIRS)
+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
$(SETPDEV) $(DD)lp9000b $(escv_)
$(DD)lp9100.dev : $(escv_) $(DD)page.dev \
- $(CONTRIB_MAK) $(MAKEDIRS)
+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
$(SETPDEV) $(DD)lp9100 $(escv_)
$(DD)lp9200b.dev : $(escv_) $(DD)page.dev \
- $(CONTRIB_MAK) $(MAKEDIRS)
+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
$(SETPDEV) $(DD)lp9200b $(escv_)
$(DD)lp9300.dev : $(escv_) $(DD)page.dev \
- $(CONTRIB_MAK) $(MAKEDIRS)
+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
$(SETPDEV) $(DD)lp9300 $(escv_)
$(DD)lp9400.dev : $(escv_) $(DD)page.dev \
- $(CONTRIB_MAK) $(MAKEDIRS)
+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
$(SETPDEV) $(DD)lp9400 $(escv_)
$(DD)lp9600.dev : $(escv_) $(DD)page.dev \
- $(CONTRIB_MAK) $(MAKEDIRS)
+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
$(SETPDEV) $(DD)lp9600 $(escv_)
$(DD)lp9600s.dev : $(escv_) $(DD)page.dev \
- $(CONTRIB_MAK) $(MAKEDIRS)
+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
$(SETPDEV) $(DD)lp9600s $(escv_)
$(DD)lps4500.dev : $(escv_) $(DD)page.dev \
- $(CONTRIB_MAK) $(MAKEDIRS)
+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
$(SETPDEV) $(DD)lps4500 $(escv_)
$(DD)eplcolor.dev: $(escv_) $(DD)page.dev \
- $(CONTRIB_MAK) $(MAKEDIRS)
+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
$(SETPDEV) $(DD)eplcolor $(escv_)
$(DD)eplmono.dev: $(escv_) $(DD)page.dev \
- $(CONTRIB_MAK) $(MAKEDIRS)
+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
$(SETPDEV) $(DD)eplmono $(escv_)
# ------ The Lexmark 5700 and 7000 devices ------ #
lex7000_=$(DEVOBJ)gdevlx7.$(OBJ)
$(DD)lex7000.dev : $(lex7000_) $(DD)page.dev \
- $(CONTRIB_MAK) $(MAKEDIRS)
+ $(CONTDEV) $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
$(SETPDEV) $(DD)lex7000 $(lex7000_)
lex5700_=$(DEVOBJ)gdevlx7.$(OBJ)
$(DD)lex5700.dev : $(lex5700_) $(DD)page.dev \
- $(CONTRIB_MAK) $(MAKEDIRS)
+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
$(SETPDEV) $(DD)lex5700 $(lex5700_)
lex3200_=$(DEVOBJ)gdevlx7.$(OBJ)
$(DD)lex3200.dev : $(lex3200_) $(DD)page.dev \
- $(CONTRIB_MAK) $(MAKEDIRS)
+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
$(SETPDEV) $(DD)lex3200 $(lex3200_)
lex2050_=$(DEVOBJ)gdevlx7.$(OBJ)
$(DD)lex2050.dev : $(lex2050_) $(DD)page.dev \
- $(CONTRIB_MAK) $(MAKEDIRS)
+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
$(SETPDEV) $(DD)lex2050 $(lex2050_)
$(DEVOBJ)gdevlx7.$(OBJ) : $(CONTRIBSRC)gdevlx7.c $(PDEVH) \
@@ -599,7 +604,7 @@ $(DEVOBJ)gdevlx32.$(OBJ) : $(CONTRIBSRC)gdevlx32.c $(PDEVH) $(gsparam_h) \
$(DEVCC) $(DEVO_)gdevlx32.$(OBJ) $(C_) $(CONTRIBSRC)gdevlx32.c
$(DD)lxm3200.dev : $(lxm3200_) $(DD)page.dev \
- $(CONTRIB_MAK) $(MAKEDIRS)
+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
$(SETPDEV) $(DD)lxm3200 $(lxm3200_)
@@ -625,13 +630,13 @@ $(DEVOBJ)gdevlips.$(OBJ) : $(GX) $(LIPS_SRC)gdevlips.c $(std_h) \
$(DEVCC) $(DEVO_)gdevlips.$(OBJ) $(LIPS_OPT) $(C_) $(LIPS_SRC)gdevlips.c
$(DD)lips4.dev : $(lipsr_) $(DD)page.dev \
- $(CONTRIB_MAK) $(MAKEDIRS)
+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
$(SETPDEV) $(DD)lips4 $(lipsr_)
lipsv_=$(DEVOBJ)gdevl4v.$(OBJ) $(DEVOBJ)gdevlips.$(OBJ)
$(DD)lips4v.dev : $(ECHOGS_XE) $(lipsv_) $(DD)vector.dev \
- $(CONTRIB_MAK) $(MAKEDIRS)
+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
$(SETDEV) $(DD)lips4v $(lipsv_)
$(ADDMOD) $(DD)lips4v -include $(GLD)vector
@@ -644,11 +649,11 @@ $(DEVOBJ)gdevl4v.$(OBJ) : $(LIPS_SRC)gdevl4v.c $(LIPS_SRC)gdevlips.h $(GDEV)\
### --------------- Some extra devices: lips2p, bjc880j ---------------- ###
$(DD)lips2p.dev : $(lipsr_) $(DD)page.dev \
- $(CONTRIB_MAK) $(MAKEDIRS)
+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
$(SETPDEV) $(DD)lips2p $(lipsr_)
$(DD)bjc880j.dev : $(lipsr_) $(DD)page.dev \
- $(CONTRIB_MAK) $(MAKEDIRS)
+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
$(SETPDEV) $(DD)bjc880j $(lipsr_)
@@ -657,15 +662,15 @@ $(DD)bjc880j.dev : $(lipsr_) $(DD)page.dev \
md2k_=$(DEVOBJ)gdevmd2k.$(OBJ)
$(DD)md2k.dev : $(md2k_) $(DD)page.dev \
- $(CONTRIB_MAK) $(MAKEDIRS)
+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
$(SETPDEV) $(DD)md2k $(md2k_)
$(DD)md5k.dev : $(md2k_) $(DD)page.dev \
- $(CONTRIB_MAK) $(MAKEDIRS)
+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
$(SETPDEV) $(DD)md5k $(md2k_)
$(DEVOBJ)gdevmd2k.$(OBJ) : $(CONTRIBSRC)gdevmd2k.c $(PDEVH) $(gsparam_h) \
- $(CONTRIB_MAK) $(MAKEDIRS)
+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
$(DEVCC) $(DEVO_)gdevmd2k.$(OBJ) $(C_) $(CONTRIBSRC)gdevmd2k.c
@@ -673,7 +678,7 @@ $(DEVOBJ)gdevmd2k.$(OBJ) : $(CONTRIBSRC)gdevmd2k.c $(PDEVH) $(gsparam_h) \
oki4w_=$(DEVOBJ)gdevop4w.$(OBJ)
$(DD)oki4w.dev : $(oki4w_) $(DD)page.dev \
- $(CONTRIB_MAK) $(MAKEDIRS)
+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
$(SETPDEV) $(DD)oki4w $(oki4w_)
# Author: Ivan Schreter (ivan@shadow.sk)
@@ -696,11 +701,11 @@ $(DEVOBJ)gdevopvp.$(OBJ) : $(OPVP_SRC)gdevopvp.c $(OPVP_SRC)opvp_common.h\
$(DEVCC) $(DEVO_)gdevopvp.$(OBJ) $(OPVP_OPT) $(C_) $(OPVP_SRC)gdevopvp.c
$(DD)opvp.dev : $(opvp_) $(DD)page.dev \
- $(CONTRIB_MAK) $(MAKEDIRS)
+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
$(SETPDEV) $(DD)opvp $(opvp_)
$(DD)oprp.dev : $(opvp_) $(DD)page.dev \
- $(CONTRIB_MAK) $(MAKEDIRS)
+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
$(SETPDEV) $(DD)oprp $(opvp_)
@@ -877,78 +882,78 @@ $(DEVOBJ)pclcomp.$(OBJ) : $(pcl3_src)pclcomp.c $(pcl3_src)pclgen.h \
# The generic pcl3 device with selectable subdevices
$(DD)pcl3.dev : $(pcl3_) $(DD)page.dev \
- $(CONTRIB_MAK) $(MAKEDIRS)
+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
$(SETPDEV) $(DD)pcl3 $(pcl3_)
# Fixed devices for specific printers
$(DD)hpdjplus.dev : $(pcl3_) $(DD)page.dev \
- $(CONTRIB_MAK) $(MAKEDIRS)
+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
$(SETPDEV) $(DD)hpdjplus $(pcl3_)
$(DD)hpdjportable.dev : $(pcl3_) $(DD)page.dev \
- $(CONTRIB_MAK) $(MAKEDIRS)
+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
$(SETPDEV) $(DD)hpdjportable $(pcl3_)
$(DD)hpdj310.dev : $(pcl3_) $(DD)page.dev \
- $(CONTRIB_MAK) $(MAKEDIRS)
+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
$(SETPDEV) $(DD)hpdj310 $(pcl3_)
$(DD)hpdj320.dev : $(pcl3_) $(DD)page.dev \
- $(CONTRIB_MAK) $(MAKEDIRS)
+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
$(SETPDEV) $(DD)hpdj320 $(pcl3_)
$(DD)hpdj340.dev : $(pcl3_) $(DD)page.dev \
- $(CONTRIB_MAK) $(MAKEDIRS)
+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
$(SETPDEV) $(DD)hpdj340 $(pcl3_)
$(DD)hpdj400.dev : $(pcl3_) $(DD)page.dev \
- $(CONTRIB_MAK) $(MAKEDIRS)
+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
$(SETPDEV) $(DD)hpdj400 $(pcl3_)
$(DD)hpdj500.dev : $(pcl3_) $(DD)page.dev \
- $(CONTRIB_MAK) $(MAKEDIRS)
+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
$(SETPDEV) $(DD)hpdj500 $(pcl3_)
$(DD)hpdj500c.dev : $(pcl3_) $(DD)page.dev \
- $(CONTRIB_MAK) $(MAKEDIRS)
+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
$(SETPDEV) $(DD)hpdj500c $(pcl3_)
$(DD)hpdj510.dev : $(pcl3_) $(DD)page.dev \
- $(CONTRIB_MAK) $(MAKEDIRS)
+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
$(SETPDEV) $(DD)hpdj510 $(pcl3_)
$(DD)hpdj520.dev : $(pcl3_) $(DD)page.dev \
- $(CONTRIB_MAK) $(MAKEDIRS)
+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
$(SETPDEV) $(DD)hpdj520 $(pcl3_)
$(DD)hpdj540.dev : $(pcl3_) $(DD)page.dev \
- $(CONTRIB_MAK) $(MAKEDIRS)
+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
$(SETPDEV) $(DD)hpdj540 $(pcl3_)
$(DD)hpdj550c.dev : $(pcl3_) $(DD)page.dev \
- $(CONTRIB_MAK) $(MAKEDIRS)
+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
$(SETPDEV) $(DD)hpdj550c $(pcl3_)
$(DD)hpdj560c.dev : $(pcl3_) $(DD)page.dev \
- $(CONTRIB_MAK) $(MAKEDIRS)
+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
$(SETPDEV) $(DD)hpdj560c $(pcl3_)
$(DD)hpdj600.dev : $(pcl3_) $(DD)page.dev \
- $(CONTRIB_MAK) $(MAKEDIRS)
+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
$(SETPDEV) $(DD)hpdj600 $(pcl3_)
$(DD)hpdj660c.dev : $(pcl3_) $(DD)page.dev \
- $(CONTRIB_MAK) $(MAKEDIRS)
+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
$(SETPDEV) $(DD)hpdj660c $(pcl3_)
$(DD)hpdj670c.dev : $(pcl3_) $(DD)page.dev \
- $(CONTRIB_MAK) $(MAKEDIRS)
+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
$(SETPDEV) $(DD)hpdj670c $(pcl3_)
$(DD)hpdj680c.dev : $(pcl3_) $(DD)page.dev \
- $(CONTRIB_MAK) $(MAKEDIRS)
+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
$(SETPDEV) $(DD)hpdj680c $(pcl3_)
$(DD)hpdj690c.dev : $(pcl3_) $(DD)page.dev \
- $(CONTRIB_MAK) $(MAKEDIRS)
+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
$(SETPDEV) $(DD)hpdj690c $(pcl3_)
$(DD)hpdj850c.dev : $(pcl3_) $(DD)page.dev \
- $(CONTRIB_MAK) $(MAKEDIRS)
+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
$(SETPDEV) $(DD)hpdj850c $(pcl3_)
$(DD)hpdj855c.dev : $(pcl3_) $(DD)page.dev \
- $(CONTRIB_MAK) $(MAKEDIRS)
+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
$(SETPDEV) $(DD)hpdj855c $(pcl3_)
$(DD)hpdj870c.dev : $(pcl3_) $(DD)page.dev \
- $(CONTRIB_MAK) $(MAKEDIRS)
+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
$(SETPDEV) $(DD)hpdj870c $(pcl3_)
$(DD)hpdj890c.dev : $(pcl3_) $(DD)page.dev \
- $(CONTRIB_MAK) $(MAKEDIRS)
+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
$(SETPDEV) $(DD)hpdj890c $(pcl3_)
$(DD)hpdj1120c.dev : $(pcl3_) $(DD)page.dev \
- $(CONTRIB_MAK) $(MAKEDIRS)
+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
$(SETPDEV) $(DD)hpdj1120c $(pcl3_)
#------------------------------------------------------------------------------
@@ -985,7 +990,7 @@ pcl3-install:
xes_=$(DEVOBJ)gdevxes.$(OBJ)
$(DD)xes.dev : $(xes_) $(DD)page.dev \
- $(CONTRIB_MAK) $(MAKEDIRS)
+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
$(SETPDEV) $(DD)xes $(xes_)
# Author: Peter Flass (flass@lbdrscs.bitnet)
@@ -1005,16 +1010,16 @@ JAPSRC=$(JAPDIR)$(D)
pr201_=$(DEVOBJ)gdevp201.$(OBJ) $(DEVOBJ)gdevprn.$(OBJ)
-$(DD)pr201.dev : $(pr201_) $(CONTRIB_MAK) $(MAKEDIRS)
+$(DD)pr201.dev : $(pr201_) $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
$(SETPDEV) $(DD)pr201 $(pr201_)
-$(DD)pr150.dev : $(pr201_) $(CONTRIB_MAK) $(MAKEDIRS)
+$(DD)pr150.dev : $(pr201_) $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
$(SETPDEV) $(DD)pr150 $(pr201_)
-$(DD)pr1000.dev : $(pr201_) $(CONTRIB_MAK) $(MAKEDIRS)
+$(DD)pr1000.dev : $(pr201_) $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
$(SETPDEV) $(DD)pr1000 $(pr201_)
-$(DD)pr1000_4.dev : $(pr201_) $(CONTRIB_MAK) $(MAKEDIRS)
+$(DD)pr1000_4.dev : $(pr201_) $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
$(SETPDEV) $(DD)pr1000_4 $(pr201_)
$(DEVOBJ)gdevp201.$(OBJ) : $(JAPSRC)gdevp201.c $(PDEVH) \
@@ -1025,7 +1030,7 @@ $(DEVOBJ)gdevp201.$(OBJ) : $(JAPSRC)gdevp201.c $(PDEVH) \
jj100_=$(DEVOBJ)gdevj100.$(OBJ) $(DEVOBJ)gdevprn.$(OBJ)
-$(DD)jj100.dev : $(jj100_) $(CONTRIB_MAK) $(MAKEDIRS)
+$(DD)jj100.dev : $(jj100_) $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
$(SETPDEV) $(DD)jj100 $(jj100_)
$(DEVOBJ)gdevj100.$(OBJ) : $(JAPSRC)gdevj100.c $(PDEVH) \
@@ -1037,11 +1042,11 @@ $(DEVOBJ)gdevj100.$(OBJ) : $(JAPSRC)gdevj100.c $(PDEVH) \
bj10v_=$(DEVOBJ)gdev10v.$(OBJ) $(DEVOBJ)gdevprn.$(OBJ)
$(DD)bj10v.dev : $(bj10v_) \
- $(CONTRIB_MAK) $(MAKEDIRS)
+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
$(SETPDEV) $(DD)bj10v $(bj10v_)
$(DD)bj10vh.dev : $(bj10v_) \
- $(CONTRIB_MAK) $(MAKEDIRS)
+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
$(SETPDEV) $(DD)bj10vh $(bj10v_)
# Uncomment the following line if you are using MS-DOS on PC9801 series.
@@ -1056,7 +1061,7 @@ $(DEVOBJ)gdev10v.$(OBJ) : $(JAPSRC)gdev10v.c $(PDEVH) \
dmprt_=$(DEVOBJ)gdevdmpr.$(OBJ) $(DEVOBJ)dviprlib.$(OBJ) $(DEVOBJ)gdevprn.$(OBJ)
$(DD)dmprt.dev : $(dmprt_) $(DD)page.dev \
- $(CONTRIB_MAK) $(MAKEDIRS)
+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
$(SETDEV) $(DD)dmprt $(dmprt_)
$(ADDMOD) $(DD)dmprt -ps dmp_init
@@ -1086,19 +1091,19 @@ $(DEVOBJ)gdevmjc.$(OBJ) : $(JAPSRC)gdevmjc.c $(JAPSRC)gdevmjc.h $(PDEVH) $(gdevp
$(DEVCC) -DA4 $(DEVO_)gdevmjc.$(OBJ) $(C_) $(JAPSRC)gdevmjc.c
$(DD)mj700v2c.dev : $(mj700v2c_) $(DD)page.dev \
- $(CONTRIB_MAK) $(MAKEDIRS)
+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
$(SETPDEV) $(DD)mj700v2c $(mj700v2c_)
$(DD)mj500c.dev : $(mj700v2c_) $(DD)page.dev \
- $(CONTRIB_MAK) $(MAKEDIRS)
+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
$(SETPDEV) $(DD)mj500c $(mj700v2c_)
$(DD)mj6000c.dev : $(mj700v2c_) $(DD)page.dev \
- $(CONTRIB_MAK) $(MAKEDIRS)
+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
$(SETPDEV) $(DD)mj6000c $(mj700v2c_)
$(DD)mj8000c.dev : $(mj700v2c_) $(DD)page.dev \
- $(CONTRIB_MAK) $(MAKEDIRS)
+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
$(SETPDEV) $(DD)mj8000c $(mj700v2c_)
### ----------------- The Fujitsu FMPR printer device ----------------- ###
@@ -1106,7 +1111,7 @@ $(DD)mj8000c.dev : $(mj700v2c_) $(DD)page.dev \
fmpr_=$(DEVOBJ)gdevfmpr.$(OBJ) $(DEVOBJ)gdevprn.$(OBJ)
$(DD)fmpr.dev : $(fmpr_) $(DD)page.dev \
- $(CONTRIB_MAK) $(MAKEDIRS)
+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
$(SETPDEV) $(DD)fmpr $(fmpr_)
$(DEVOBJ)gdevfmpr.$(OBJ) : $(JAPSRC)gdevfmpr.c $(PDEVH) \
@@ -1118,7 +1123,7 @@ $(DEVOBJ)gdevfmpr.$(OBJ) : $(JAPSRC)gdevfmpr.c $(PDEVH) \
fmlbp_=$(DEVOBJ)gdevfmlbp.$(OBJ) $(DEVOBJ)gdevprn.$(OBJ)
$(DD)fmlbp.dev : $(fmlbp_) $(DD)page.dev \
- $(CONTRIB_MAK) $(MAKEDIRS)
+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
$(SETPDEV) $(DD)fmlbp $(fmlbp_)
$(DEVOBJ)gdevfmlbp.$(OBJ) : $(JAPSRC)gdevfmlbp.c $(PDEVH) \
@@ -1135,7 +1140,7 @@ $(DEVOBJ)gdevfmlbp.$(OBJ) : $(JAPSRC)gdevfmlbp.c $(PDEVH) \
ml6_=$(DEVOBJ)gdevml6.$(OBJ) $(DEVOBJ)gdevprn.$(OBJ)
$(DD)ml600.dev : $(ml6_) $(DD)page.dev \
- $(CONTRIB_MAK) $(MAKEDIRS)
+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
$(SETPDEV) $(DD)ml600 $(ml6_)
$(DEVOBJ)gdevml6.$(OBJ) : $(JAPSRC)gdevml6.c $(PDEVH) \
@@ -1148,11 +1153,11 @@ $(DEVOBJ)gdevml6.$(OBJ) : $(JAPSRC)gdevml6.c $(PDEVH) \
lbp3x0_=$(DEVOBJ)gdevlbp3.$(OBJ)
$(DD)lbp310.dev :$(lbp3x0_) $(DD)page.dev \
- $(CONTRIB_MAK) $(MAKEDIRS)
+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
$(SETPDEV) $(DD)lbp310 $(lbp3x0_)
$(DD)lbp320.dev :$(lbp3x0_) $(DD)page.dev \
- $(CONTRIB_MAK) $(MAKEDIRS)
+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
$(SETPDEV) $(DD)lbp320 $(lbp3x0_)
$(DEVOBJ)gdevlbp3.$(OBJ) : $(JAPSRC)gdevlbp3.c $(PDEVH)
@@ -1167,7 +1172,7 @@ $(DEVOBJ)gdevnpdl.$(OBJ) : $(JAPSRC)gdevnpdl.c $(LIPS_SRC)gdevlprn.h $(PDEVH) \
$(DEVCC) -DA4 $(DEVO_)gdevnpdl.$(OBJ) $(LIPS_OPT) $(C_) $(JAPSRC)gdevnpdl.c
$(DD)npdl.dev : $(npdl_) $(DD)page.dev \
- $(CONTRIB_MAK) $(MAKEDIRS)
+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
$(SETPDEV) $(DD)npdl $(npdl_)
### ------- EPSON ESC/Page printer device ----------------- ###
@@ -1179,11 +1184,11 @@ $(DEVOBJ)gdevespg.$(OBJ) : $(JAPSRC)gdevespg.c $(LIPS_SRC)gdevlprn.h $(PDEVH) \
$(DEVCC) -DA4 $(DEVO_)gdevespg.$(OBJ) $(LIPS_OPT) $(C_) $(JAPSRC)gdevespg.c
$(DD)escpage.dev : $(escpage_) $(DD)page.dev \
- $(CONTRIB_MAK) $(MAKEDIRS)
+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
$(SETPDEV) $(DD)escpage $(escpage_)
$(DD)lp2000.dev : $(escpage_) $(DD)page.dev \
- $(CONTRIB_MAK) $(MAKEDIRS)
+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
$(SETPDEV) $(DD)lp2000 $(escpage_)
### --- The RICOH RPDL language printer device ------ ###
@@ -1194,7 +1199,7 @@ $(DEVOBJ)gdevrpdl.$(OBJ) : $(JAPSRC)gdevrpdl.c $(LIPS_SRC)gdevlprn.h $(PDEVH) \
$(DEVCC) $(DEVO_)gdevrpdl.$(OBJ) $(LIPS_OPT) $(C_) $(JAPSRC)gdevrpdl.c
$(DD)rpdl.dev : $(rpdl_) $(DD)page.dev \
- $(CONTRIB_MAK) $(MAKEDIRS)
+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
$(SETPDEV) $(DD)rpdl $(rpdl_)
### ---------- RICOH RPDL IV(600dpi) printer devices ---------- ###
@@ -1204,11 +1209,11 @@ $(DD)rpdl.dev : $(rpdl_) $(DD)page.dev \
# $(DEVCC) $(DEVO_)gdevrpdl.$(OBJ) $(C_) $(JAPSRC)gdevrpdl.c
#
#$(DD)nx100f.dev : $(rpdl_) $(DD)page.dev \
- $(CONTRIB_MAK) $(MAKEDIRS)
+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
# $(SETPDEV2) $(DD)nx100f $(rpdl_)
#
#$(DD)nx100v.dev : $(rpdl_) $(DD)page.dev \
- $(CONTRIB_MAK) $(MAKEDIRS)
+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
# $(SETPDEV2) $(DD)nx100v $(rpdl_)
### ------------ The ALPS Micro Dry printer devices ------------ ###
@@ -1216,15 +1221,15 @@ $(DD)rpdl.dev : $(rpdl_) $(DD)page.dev \
alps_=$(DEVOBJ)gdevalps.$(OBJ)
$(DD)md50Mono.dev : $(alps_) $(DD)page.dev \
- $(CONTRIB_MAK) $(MAKEDIRS)
+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
$(SETPDEV) $(DD)md50Mono $(alps_)
$(DD)md50Eco.dev : $(alps_) $(DD)page.dev \
- $(CONTRIB_MAK) $(MAKEDIRS)
+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
$(SETPDEV) $(DD)md50Eco $(alps_)
$(DD)md1xMono.dev : $(alps_) $(DD)page.dev \
- $(CONTRIB_MAK) $(MAKEDIRS)
+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS)
$(SETPDEV) $(DD)md1xMono $(alps_)
$(DEVOBJ)gdevalps.$(OBJ) : $(JAPSRC)gdevalps.c $(PDEVH) \
--
2.26.2

3
pkgs/misc/ghostscript/default.nix
View File

@ -52,6 +52,9 @@ stdenv.mkDerivation rec {
url = "https://git.ghostscript.com/?p=ghostpdl.git;a=patch;h=485904772c5f0aa1140032746e5a0abfc40f4cef";
sha256 = "0z5gnvgpp0dlzgvpw9a1yan7qyycv3mf88l93fvb1kyay893rshp";
})
# rebased version of upstream http://git.ghostscript.com/?p=ghostpdl.git;a=patch;h=1b4c3669a20c,
# Remove on update to version > 9.52
./0001-Bug-702364-Fix-missing-echogs-dependencies.patch
];
outputs = [ "out" "man" "doc" ];

6
pkgs/shells/bash/bash-completion/default.nix
View File

@ -30,6 +30,10 @@ stdenv.mkDerivation rec {
python3Packages.pexpect
python3Packages.pytest
bashInteractive
# use xdist to speed up the test run, just like upstream:
# https://github.com/scop/bash-completion/blob/009bf2228c68894629eb6fd17b3dc0f1f6d67615/test/requirements.txt#L4
python3Packages.pytest_xdist
];
# - ignore test_gcc on ARM because it assumes -march=native
@ -40,7 +44,7 @@ stdenv.mkDerivation rec {
# - ignore test_ls because impure logic
# - ignore test_screen because it assumes vt terminals exist
checkPhase = ''
pytest . \
pytest -n $NIX_BUILD_CORES . \
${stdenv.lib.optionalString (stdenv.hostPlatform.isAarch64 || stdenv.hostPlatform.isAarch32) "--ignore=test/t/test_gcc.py"} \
--ignore=test/t/test_chsh.py \
--ignore=test/t/test_ether_wake.py \

2
pkgs/top-level/all-packages.nix
View File

@ -14048,7 +14048,7 @@ in
python = python37;
};
protobuf = protobuf3_7;
protobuf = protobuf3_8;
protobuf3_11 = callPackage ../development/libraries/protobuf/3.11.nix { };
protobuf3_10 = callPackage ../development/libraries/protobuf/3.10.nix { };