1
0
mirror of https://github.com/gryf/wmaker.git synced 2026-02-03 14:55:46 +01:00

wrlib: mark the script 'get-wraster-flags' as deprecated

This script should have been removed a long time ago, in favour of
pkg-config which has to be present anyway to compile Window Maker.

This patch makes the script print a warning about it, and now calls itself
pkg-config, instead of being generated; the man page was also updated
accordingly (and spell-checked).

Signed-off-by: Christophe CURIS <christophe.curis@free.fr>
This commit is contained in:
Christophe CURIS
2015-04-06 17:57:50 +02:00
committed by Carlos R. Mafra
parent 0277a99d08
commit efdb29762d
5 changed files with 58 additions and 62 deletions

View File

@@ -5,7 +5,7 @@ DIST_SUBDIRS = $(SUBDIRS) tests
AUTOMAKE_OPTIONS =
EXTRA_DIST = tests get-wraster-flags.in
EXTRA_DIST = tests
lib_LTLIBRARIES = libwraster.la
@@ -17,7 +17,7 @@ EXTRA_libwraster_la_DEPENDENCIES = libwraster.map
CLEANFILES = libwraster.map
endif
bin_SCRIPTS = get-wraster-flags
dist_bin_SCRIPTS = get-wraster-flags
include_HEADERS = wraster.h
@@ -84,7 +84,7 @@ libwraster_la_LIBADD = @LIBRARY_SEARCH_PATH@ @GFXLIBS@ @MAGICKLIBS@ @XLIBS@ @LIB
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = wrlib.pc
DISTCLEANFILES = $(pkgconfig_DATA) get-wraster-flags
DISTCLEANFILES = $(pkgconfig_DATA)
wrlib.pc: Makefile
@echo "Generating $@"
@@ -95,13 +95,6 @@ wrlib.pc: Makefile
@echo 'Libs.private: $(GFXLIBS) $(MAGICKLIBS) $(XLIBS) -lm' >> $@
@echo 'Cflags: $(inc_search_path)' >> $@
get-wraster-flags: get-wraster-flags.in Makefile
@echo "Generating $@"
@$(SED) -e 's#$${inc_search_path}#$(inc_search_path)#;' \
-e 's#$${lib_search_path}#$(lib_search_path)#;' \
-e 's#$${GFXLIBS}#$(GFXLIBS)#;' \
-e 's#$${XLIBS}#$(XLIBS)#;' < $(abs_srcdir)/get-wraster-flags.in > $@
@chmod 755 $@
if HAVE_LD_VERSION_SCRIPT
libwraster.map: $(include_HEADERS) $(top_srcdir)/script/generate-mapfile-from-header.sh

33
wrlib/get-wraster-flags Executable file
View File

@@ -0,0 +1,33 @@
#!/bin/sh
# [Christophe CURIS, 2015/01/31]
# This script is now reporting itself as deprecated (this should have been done
# a long time ago), so it should be kept for at least 2 years from now in order
# to allow users to update their scripts, and then removed.
if test $# -eq 0; then
echo "Error: $0 is deprecated, please use 'pkg-config wrlib ...'" >&2
exit 1
fi
while test $# -gt 0; do
case $1 in
--cflags)
echo "Warning: $0 is deprecated, please use 'pkg-config wrlib --cflags'" >&2
pkg-config wrlib --cflags
;;
--ldflags|--lflags)
echo "Warning: $0 is deprecated, please use 'pkg-config wrlib --libs'" >&2
pkg-config wrlib --libs-only-L
;;
--libs)
echo "Warning: $0 is deprecated, please use 'pkg-config wrlib --libs'" >&2
pkg-config wrlib --libs
;;
*)
echo "Error: $0 is deprecated, please use 'pkg-config wrlib ...'" >&2
exit 1
;;
esac
shift
done

View File

@@ -1,31 +0,0 @@
#!/bin/sh
WCFLAGS="${inc_search_path}"
WLFLAGS="${lib_search_path}"
WLIBS="-lwraster ${GFXLIBS} ${XLIBS} -lm"
usage="Usage: get-wraster-flags [--cflags] [--ldflags] [--libs]"
if test $# -eq 0; then
echo "${usage}" 1>&2
exit 1
fi
while test $# -gt 0; do
case $1 in
--cflags)
echo $WCFLAGS
;;
--ldflags|--lflags)
echo $WLFLAGS
;;
--libs)
echo $WLIBS
;;
*)
echo "${usage}" 1>&2
exit 1
;;
esac
shift
done