1
0
mirror of https://github.com/gryf/wmaker.git synced 2026-01-04 04:44:16 +01:00

WUtil: mark the script 'get-wutil-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:51 +02:00
committed by Carlos R. Mafra
parent efdb29762d
commit 324e338087
5 changed files with 55 additions and 62 deletions

1
.gitignore vendored
View File

@@ -77,7 +77,6 @@ WINGs/Tests/wmfile
WINGs/Tests/wmquery
WINGs/Tests/wtest
WINGs/get-wings-flags
WINGs/get-wutil-flags
WPrefs.app/WPrefs

View File

@@ -17,7 +17,7 @@ LDADD= libWUtil.la libWINGs.la $(top_builddir)/wrlib/libwraster.la @INTLIBS@
libWINGs_la_LIBADD = libWUtil.la $(top_builddir)/wrlib/libwraster.la @XLIBS@ @XFTLIBS@ @FCLIBS@ @LIBM@ @PANGOLIBS@
libWUtil_la_LIBADD = @LIBBSD@
EXTRA_DIST = BUGS make-rgb Examples Extras Tests get-wings-flags.in get-wutil-flags.in
EXTRA_DIST = BUGS make-rgb Examples Extras Tests get-wings-flags.in get-wutil-flags
# wbutton.c
@@ -98,7 +98,7 @@ AM_CPPFLAGS = -DRESOURCE_PATH=\"$(datadir)/WINGs\" \
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = WINGs.pc WUtil.pc
DISTCLEANFILES = $(pkgconfig_DATA) get-wings-flags get-wutil-flags
DISTCLEANFILES = $(pkgconfig_DATA) get-wings-flags
WINGs.pc: Makefile
@echo "Generating $@"
@@ -129,11 +129,3 @@ WUtil.pc: Makefile
@echo 'Libs: -L$(libdir) -lWUtil' >> $@
@echo 'Libs.private: $(INTLIBS)' >> $@
@echo 'Cflags: -I$(includedir)' >> $@
get-wutil-flags: get-wutil-flags.in Makefile
@echo "Generating $@"
@$(SED) -e 's#$${includedir}#$(includedir)#;' \
-e 's#$${libdir}#$(libdir)#;' \
-e 's#$${INTLIBS}#$(INTLIBS)#;' < $(abs_srcdir)/get-wutil-flags.in > $@
@chmod 755 $@

33
WINGs/get-wutil-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 WUtil ...'" >&2
exit 1
fi
while test $# -gt 0; do
case $1 in
--cflags)
echo "Warning: $0 is deprecated, please use 'pkg-config WUtil --cflags'" >&2
pkg-config WUtil --cflags
;;
--ldflags|--lflags)
echo "Warning: $0 is deprecated, please use 'pkg-config WUtil --libs'" >&2
pkg-config WUtil --libs-only-L
;;
--libs)
echo "Warning: $0 is deprecated, please use 'pkg-config WUtil --libs'" >&2
pkg-config WUtil --libs
;;
*)
echo "Error: $0 is deprecated, please use 'pkg-config WUtil ...'" >&2
exit 1
;;
esac
shift
done

View File

@@ -1,31 +0,0 @@
#!/bin/sh
WCFLAGS="-I${includedir}"
WLFLAGS="-L${libdir}"
WLIBS="-lWUtil ${INTLIBS}"
usage="Usage: get-wutil-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

View File

@@ -1,32 +1,32 @@
.TH "get-wutil-flags" "1" "22 March 2005"
.SH "NAME"
\fBget-wutil-flags\fR \- output libwutil compile and linker flags
\fBget-wutil-flags\fP \- output libwutil compiler and linker flags (deprecated)
.PP
.SH "SYNOPSIS"
.B get-wutil-flags \fR[ \fI\-\-cflags \fR] [ \fI\-\-ldflags \fR]
[ \fI\-\-libs \fR]
.PP
.B pkg-config
WUtil
.I \-\-cflags
.br
.B pkg-config
WUtil
.I \-\-libs
.SH "DESCRIPTION"
\fBget-wutil-flags \fR\- output include path, library search path or
library archive names needed to compile and link with libWUtil.
.PP
.SH "OPTIONS"
\fBget-wutil-flags\fP used to provide the compilation and link flags for programs that use
the \fIWutil\fP library, before \fBpkg-config\fP became the universal way to handle these
developer configurations. The script is now deprecated and you should use instead:
.TP
.B \-\-cflags
\fRoutput include file search path to find all header files needed to compile
source code using libWUtil functions.
.BR pkg-config " WUtil \fI\-\-cflags\fP"
to get the flags for the compiler
.TP
.B \-\-ldflags
\fRoutput library search path required to find all library archives needed to
link object files with libWUtil.
.TP
.B \-\-libs
\fRoutput library archive names required to link object filed with libWUtil.
.PP
.BR pkg-config " WUtil \fI\-\-libs\fP"
to get the flags for the linker
.SH "IMPORTANT NOTE"
As with every deprecated stuff, the script \fBget-wutil-flags\fR will be removed soon,
so you should update your script quickly while you know about it.
.SH "AUTHOR"
get-wutil-flags is a part of Window Maker, wich was written by
get-wutil-flags is part of Window Maker, which was written by
Alfredo K. Kojima <kojima@windowmaker.info> and Dan Pascu <dan@windowmaker.info>,
with contributions from many people around the Internet.
.PP
This manpage was written by Frederik Schueler <fschueler@gmx.net> for the
This man page was written by Frederik Schueler <fschueler@gmx.net> for the
Debian GNU/Linux system (but may be used by others).