mirror of
https://github.com/gryf/wmaker.git
synced 2026-02-07 00:35:53 +01:00
WINGs: mark the script 'get-wings-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:
committed by
Carlos R. Mafra
parent
324e338087
commit
794a8f408a
@@ -8,7 +8,7 @@ DIST_SUBDIRS = $(SUBDIRS) Tests Examples Extras
|
||||
libWINGs_la_LDFLAGS = -version-info @WINGS_VERSION@
|
||||
libWUtil_la_LDFLAGS = -version-info @WUTIL_VERSION@
|
||||
|
||||
bin_SCRIPTS = get-wings-flags get-wutil-flags
|
||||
dist_bin_SCRIPTS = get-wings-flags get-wutil-flags
|
||||
|
||||
lib_LTLIBRARIES = libWUtil.la libWINGs.la
|
||||
|
||||
@@ -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
|
||||
EXTRA_DIST = BUGS make-rgb Examples Extras Tests
|
||||
|
||||
|
||||
# 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
|
||||
DISTCLEANFILES = $(pkgconfig_DATA)
|
||||
|
||||
WINGs.pc: Makefile
|
||||
@echo "Generating $@"
|
||||
@@ -110,17 +110,6 @@ WINGs.pc: Makefile
|
||||
@echo 'Libs.private: $(XFTLIBS) $(PANGOLIBS) $(XLIBS) -lm $(INTLIBS)' >> $@
|
||||
@echo 'Cflags: $(inc_search_path)' >> $@
|
||||
|
||||
get-wings-flags: get-wings-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#$${XFTLIBS}#$(XFTLIBS)#;' \
|
||||
-e 's#$${PANGOLIBS}#$(PANGOLIBS)#;' \
|
||||
-e 's#$${INTLIBS}#$(INTLIBS)#;' \
|
||||
-e 's#$${XLIBS}#$(XLIBS)#;' < $(abs_srcdir)/get-wings-flags.in > $@
|
||||
@chmod 755 $@
|
||||
|
||||
WUtil.pc: Makefile
|
||||
@echo "Generating $@"
|
||||
@echo 'Name: WUtil' > $@
|
||||
|
||||
33
WINGs/get-wings-flags
Executable file
33
WINGs/get-wings-flags
Executable 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 WINGs ...'" >&2
|
||||
exit 1
|
||||
fi
|
||||
|
||||
while test $# -gt 0; do
|
||||
case $1 in
|
||||
--cflags)
|
||||
echo "Warning: $0 is deprecated, please use 'pkg-config WINGs --cflags'" >&2
|
||||
pkg-config WINGs --cflags
|
||||
;;
|
||||
--ldflags|--lflags)
|
||||
echo "Warning: $0 is deprecated, please use 'pkg-config WINGs --libs'" >&2
|
||||
pkg-config WINGs --libs-only-L
|
||||
;;
|
||||
--libs)
|
||||
echo "Warning: $0 is deprecated, please use 'pkg-config WINGs --libs'" >&2
|
||||
pkg-config WINGs --libs
|
||||
;;
|
||||
*)
|
||||
echo "Error: $0 is deprecated, please use 'pkg-config WINGs ...'" >&2
|
||||
exit 1
|
||||
;;
|
||||
esac
|
||||
shift
|
||||
done
|
||||
@@ -1,31 +0,0 @@
|
||||
#!/bin/sh
|
||||
|
||||
WCFLAGS="${inc_search_path}"
|
||||
WLFLAGS="${lib_search_path}"
|
||||
WLIBS="-lWINGs -lWUtil -lwraster ${GFXLIBS} ${XFTLIBS} ${XLIBS} -lm ${INTLIBS} ${PANGOLIBS}"
|
||||
|
||||
usage="Usage: get-wings-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
|
||||
Reference in New Issue
Block a user