commit 585a0c9ac81e732b411af01dc99f1caf29b864b1
parent 69c2ad95b0c745a5ff8682f845ef9d7028ee5d66
Author: Hiltjo Posthuma <hiltjo@codemadness.org>
Date: Sun, 15 Jun 2014 19:06:11 +0200
xorg and other: small cleanup
Signed-off-by: Hiltjo Posthuma <hiltjo@codemadness.org>
Diffstat:
9 files changed, 48 insertions(+), 24 deletions(-)
diff --git a/alsalib/depsinc.mk b/alsalib/depsinc.mk
@@ -2,5 +2,9 @@
alsalib_libdir = $alsalib_DEPDIR/alsa-lib-$v/lib/lib
alsalib_includedir = $alsalib_DEPDIR/alsa-lib-$v/lib/include
-DEPS_CFLAGS = $DEPS_CFLAGS -I${alsalib_includedir}
-DEPS_LDFLAGS = $DEPS_LDFLAGS -L${alsalib_libdir} -lasound
+
+alsalib_CFLAGS = -I${alsalib_includedir}
+alsalib_LDFLAGS = -L${alsalib_libdir} -lasound
+
+DEPS_CFLAGS = $DEPS_CFLAGS ${alsalib_CFLAGS}
+DEPS_LDFLAGS = $DEPS_LDFLAGS ${alsalib_LDFLAGS}
diff --git a/freetype/depsinc.mk b/freetype/depsinc.mk
@@ -1,6 +1,10 @@
<$freetype_DEPDIR/v.mk
-freetype_libdir = $freetype_DEPDIR/freetype-$v/lib/lib
-freetype_includedir = $freetype_DEPDIR/freetype-$v/lib/include/freetype2
-DEPS_CFLAGS = $DEPS_CFLAGS -I${freetype_includedir}
-DEPS_LDFLAGS = $DEPS_LDFLAGS -L${freetype_libdir} -lfreetype
+freetype_libdir = ${freetype_DEPDIR}/freetype-$v/lib/lib
+freetype_includedir = ${freetype_DEPDIR}/freetype-$v/lib/include/freetype2
+
+freetype_CFLAGS = -I${freetype_includedir}
+freetype_LDFLAGS = -L${freetype_libdir} -lfreetype
+
+DEPS_CFLAGS = $DEPS_CFLAGS ${freetype_CFLAGS}
+DEPS_LDFLAGS = $DEPS_LDFLAGS ${freetype_LDFLAGS}
diff --git a/openssl/depsinc.mk b/openssl/depsinc.mk
@@ -1,6 +1,10 @@
<$openssl_DEPDIR/v.mk
-openssl_includedir = $openssl_DEPDIR/openssl-$v/include
-openssl_libdir = $openssl_DEPDIR/openssl-$v
-DEPS_CFLAGS = $DEPS_CFLAGS -I$openssl_includedir
-DEPS_LDFLAGS = $DEPS_LDFLAGS -L$openssl_libdir -lssl
+openssl_includedir = ${openssl_DEPDIR}/openssl-$v/include
+openssl_libdir = ${openssl_DEPDIR}/openssl-$v
+
+openssl_CFLAGS = -I${openssl_includedir}
+openssl_LDFLAGS = -L${openssl_libdir} -lssl
+
+DEPS_CFLAGS = $DEPS_CFLAGS ${openssl_CFLAGS}
+DEPS_LDFLAGS = $DEPS_LDFLAGS ${openssl_LDFLAGS}
diff --git a/xorglibx11/depsinc.mk b/xorglibx11/depsinc.mk
@@ -2,5 +2,9 @@
xorglibx11_libdir = $xorglibx11_DEPDIR/libX11-$v/lib/lib
xorglibx11_includedir = $xorglibx11_DEPDIR/libX11-$v/lib/include
-DEPS_CFLAGS = $DEPS_CFLAGS -I${xorglibx11_includedir}
-DEPS_LDFLAGS = $DEPS_LDFLAGS -L${xorglibx11_libdir} -lX11 -lX11-xcb
+
+xorglibx11_CFLAGS = -I${xorglibx11_includedir}
+xorglibx11_LDFLAGS = -L${xorglibx11_libdir} -lX11
+
+DEPS_CFLAGS = $DEPS_CFLAGS ${xorglibx11_CFLAGS}
+DEPS_LDFLAGS = $DEPS_LDFLAGS ${xorglibx11_LDFLAGS}
diff --git a/xorglibx11/xorglibx11.mk b/xorglibx11/xorglibx11.mk
@@ -1,5 +1,6 @@
TARG = xorglibx11
-DEPS = xorgxproto xorglibxcb xorgxcbproto xorgkbproto xorginputproto xorgxf86bigfontproto xorgxtrans
+DEPS = xorgxproto xorglibxcb xorgxcbproto xorgkbproto \
+ xorginputproto xorgxf86bigfontproto xorgxtrans
<$mkbuild/mk.common-noinst
@@ -23,6 +24,6 @@ xorglibx11:QV:
cp ../makekeys_Makefile src/util/Makefile
# make and install.
export HOSTCC_CFLAGS="-I${xorgxproto_includedir}"
- make -j$nprocs install DESTDIR=`pwd`/lib
+ make -j$nprocs install DESTDIR="`pwd`/lib"
# remove .la files for now ?
find `pwd`/lib -iname "*.la" -exec rm {} \;
diff --git a/xorglibxcb/depsinc.mk b/xorglibxcb/depsinc.mk
@@ -3,6 +3,9 @@
xorglibxcb_libdir = ${xorglibxcb_DEPDIR}/libxcb-$v/lib/lib/
xorglibxcb_includedir = ${xorglibxcb_DEPDIR}/libxcb-$v/lib/include/
-DEPS_CFLAGS = $DEPS_CFLAGS -I${xorglibxcb_includedir}
-DEPS_LDFLAGS = $DEPS_LDFLAGS -L${xorglibxcb_libdir} -lxcb
+xorglibxcb_CFLAGS = -I${xorglibxcb_includedir}
+xorglibxcb_LDFLAGS = -L${xorglibxcb_libdir} -lxcb
+
+DEPS_CFLAGS = $DEPS_CFLAGS ${xorglibxcb_CFLAGS}
+DEPS_LDFLAGS = $DEPS_LDFLAGS ${xorglibxcb_LDFLAGS}
# -lxcb-composite -lxcb-damage -lxcb-dpms -lxcb-dri2 -lxcb-dri3 -lxcb-glx -lxcb-present -lxcb-randr -lxcb-record -lxcb-render -lxcb-res -lxcb-screensaver -lxcb-shape -lxcb-shm -lxcb-sync -lxcb-xevie -lxcb-xf86dri -lxcb-xfixes -lxcb-xinerama -lxcb-xkb -lxcb-xprint -lxcb-xtest -lxcb-xv -lxcb-xvmc
diff --git a/xorglibxdmcp/xorglibxdmcp.mk b/xorglibxdmcp/xorglibxdmcp.mk
@@ -12,7 +12,7 @@ xorglibxdmcp:QV:
# set set it.
# CC="$CC" CFLAGS="$CFLAGS -DHAVE__XEATDATAWORDS=1" ./configure
CC="$CC" ./configure \
- --prefix="$PREFIX" \
+ --prefix="$PREFIX" \
--mandir="$ROOT/share/man" \
--disable-shared \
--enable-static
diff --git a/xorgserver/depsinc.mk b/xorgserver/depsinc.mk
@@ -1,6 +1,10 @@
<$xorgserver_DEPDIR/v.mk
-xorgserver_libdir = $xorgserver_DEPDIR/xorg-server-$v/lib/lib
-xorgserver_includedir = $xorgserver_DEPDIR/xorg-server-$v/lib/include/xorg
-DEPS_CFLAGS = $DEPS_CFLAGS -I${xorgserver_includedir}
-DEPS_LDFLAGS = $DEPS_LDFLAGS -L${xorgserver_libdir}
+xorgserver_libdir = ${xorgserver_DEPDIR}/xorg-server-$v/lib/lib
+xorgserver_includedir = ${xorgserver_DEPDIR}/xorg-server-$v/lib/include/xorg
+
+xorgserver_CFLAGS = -I${xorgserver_includedir}
+xorgserver_LDFLAGS = -L${xorgserver_libdir}
+
+DEPS_CFLAGS = $DEPS_CFLAGS ${xorgserver_CFLAGS}
+DEPS_LDFLAGS = $DEPS_LDFLAGS ${xorgserver_LDFLAGS}
diff --git a/xorgserver/xorgserver.mk b/xorgserver/xorgserver.mk
@@ -1,7 +1,7 @@
# openssl is used for --with-sha1=libcrypto
TARG = xorgserver
DEPS = xorglibpixman xorglibx11 openssl xorglibpciaccess \
- xorgprotoall xorglibxau xorglibxkbfile \
+ xorgprotoall xorglibxau xorglibxkbfile \
xorgxtrans xorglibxfont freetype xorglibfontenc libpng zlib
<$mkbuild/mk.common-noinst
@@ -12,8 +12,8 @@ xorgserver:QV:
# fix __uid_t and __gid_t
sed 's@__uid_t@uid_t@g' -i 'hw/kdrive/linux/linux.c'
sed 's@__gid_t@gid_t@g' -i 'hw/kdrive/linux/linux.c'
- # dont build tests.
- printf "all:\n\ttrue\n\ninstall:\n\ttrue\n\n" > test/Makefile.in
+ # don't build tests.
+ printf "all:\n\ttrue\ninstall:\n\ttrue\n" > test/Makefile.in
#
export CFLAGS="$CFLAGS $DEPS_CFLAGS"
export LDFLAGS="$LDFLAGS $DEPS_LDFLAGS"
