From cea5f6107c83cd333276a39dc5728b882cd9fb64 Mon Sep 17 00:00:00 2001 From: Doug Torrance Date: Sat, 11 Mar 2017 18:00:23 -0500 Subject: [PATCH] WINGs/wrlib: Remove deprecated get-*-flags scripts. These have been replaced by pkg-config. Christophe left a note in January 2015 to remove them, and this time has now passed. --- WINGs/Makefile.am | 2 -- WINGs/get-wings-flags | 33 --------------------------------- WINGs/get-wutil-flags | 33 --------------------------------- doc/Makefile.am | 3 --- doc/get-wings-flags.1 | 32 -------------------------------- doc/get-wraster-flags.1 | 34 ---------------------------------- doc/get-wutil-flags.1 | 32 -------------------------------- wrlib/Makefile.am | 2 -- wrlib/get-wraster-flags | 33 --------------------------------- 9 files changed, 204 deletions(-) delete mode 100755 WINGs/get-wings-flags delete mode 100755 WINGs/get-wutil-flags delete mode 100644 doc/get-wings-flags.1 delete mode 100644 doc/get-wraster-flags.1 delete mode 100644 doc/get-wutil-flags.1 delete mode 100755 wrlib/get-wraster-flags diff --git a/WINGs/Makefile.am b/WINGs/Makefile.am index 79e6752c..59c2fc49 100644 --- a/WINGs/Makefile.am +++ b/WINGs/Makefile.am @@ -8,8 +8,6 @@ DIST_SUBDIRS = $(SUBDIRS) Tests Examples Extras libWINGs_la_LDFLAGS = -version-info @WINGS_VERSION@ libWUtil_la_LDFLAGS = -version-info @WUTIL_VERSION@ -dist_bin_SCRIPTS = get-wings-flags get-wutil-flags - lib_LTLIBRARIES = libWUtil.la libWINGs.la diff --git a/WINGs/get-wings-flags b/WINGs/get-wings-flags deleted file mode 100755 index c7342a08..00000000 --- a/WINGs/get-wings-flags +++ /dev/null @@ -1,33 +0,0 @@ -#!/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 diff --git a/WINGs/get-wutil-flags b/WINGs/get-wutil-flags deleted file mode 100755 index c913a175..00000000 --- a/WINGs/get-wutil-flags +++ /dev/null @@ -1,33 +0,0 @@ -#!/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 diff --git a/doc/Makefile.am b/doc/Makefile.am index 36ff48d1..cd614063 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -6,9 +6,6 @@ DIST_SUBDIRS = build cs ru sk dist_man_MANS = \ geticonset.1 \ getstyle.1 \ - get-wings-flags.1 \ - get-wraster-flags.1 \ - get-wutil-flags.1 \ seticons.1 \ setstyle.1 \ upgrade-windowmaker-defaults.8 \ diff --git a/doc/get-wings-flags.1 b/doc/get-wings-flags.1 deleted file mode 100644 index 2ddd8b80..00000000 --- a/doc/get-wings-flags.1 +++ /dev/null @@ -1,32 +0,0 @@ -.TH "get-wings-flags" "1" "22 March 2005" -.SH "NAME" -\fBget-wings-flags\fP \- output libWINGs compiler and linker flags (deprecated) -.PP -.SH "SYNOPSIS" -.B pkg-config -WINGs -.I \-\-cflags -.br -.B pkg-config -WINGs -.I \-\-libs -.SH "DESCRIPTION" -\fBget-wings-flags\fP used to provide the compilation and link flags for programs that use -the \fIWINGs\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 -.BR pkg-config " WINGs \fI\-\-cflags\fP" -to get the flags for the compiler -.TP -.BR pkg-config " WINGs \fI\-\-libs\fP" -to get the flags for the linker -.SH "IMPORTANT NOTE" -As with every deprecated stuff, the script \fBget-wings-flags\fR will be removed soon, -so you should update your script quickly while you know about it. -.SH "AUTHOR" -get-wings-flags is part of Window Maker, which was written by -Alfredo K. Kojima and Dan Pascu , -with contributions from many people around the Internet. -.PP -This man page was written by Frederik Schueler for the -Debian GNU/Linux system (but may be used by others). diff --git a/doc/get-wraster-flags.1 b/doc/get-wraster-flags.1 deleted file mode 100644 index 8abc35f5..00000000 --- a/doc/get-wraster-flags.1 +++ /dev/null @@ -1,34 +0,0 @@ -.TH "get-wraster-flags" "1" "22 March 2005" -.SH "NAME" -\fBget-wraster-flags\fP \- output libwraster compiler and linker flags (deprecated) -.PP -.SH "SYNOPSIS" -.B pkg-config -wrlib -.I \-\-cflags -.br -.B pkg-config -wrlib -.I \-\-libs -.SH "DESCRIPTION" -\fBget-wraster-flags\fP used to provide the compilation and link flags for programs that use -the \fIWRaster\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 -.BR pkg-config " wrlib \fI\-\-cflags\fP" -to get the flags for the compiler -.TP -.BR pkg-config " wrlib \fI\-\-libs\fP" -to get the flags for the linker -.SH "IMPORTANT NOTE" -As with every deprecated stuff, the script \fBget-wraster-flags\fR will be removed soon, -so you should update your script quickly while you know about it. -.SH "AUTHOR" -get-wraster-flags is part of Window Maker, which was written by -Alfredo K. Kojima and Dan Pascu , -with contributions from many people around the Internet. -.PP -This man page was written by Frederik Schueler for the -Debian GNU/Linux system (but may be used by others). -.SH "SEE ALSO" -.BR pkg-config (1) diff --git a/doc/get-wutil-flags.1 b/doc/get-wutil-flags.1 deleted file mode 100644 index 635c3228..00000000 --- a/doc/get-wutil-flags.1 +++ /dev/null @@ -1,32 +0,0 @@ -.TH "get-wutil-flags" "1" "22 March 2005" -.SH "NAME" -\fBget-wutil-flags\fP \- output libwutil compiler and linker flags (deprecated) -.PP -.SH "SYNOPSIS" -.B pkg-config -WUtil -.I \-\-cflags -.br -.B pkg-config -WUtil -.I \-\-libs -.SH "DESCRIPTION" -\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 -.BR pkg-config " WUtil \fI\-\-cflags\fP" -to get the flags for the compiler -.TP -.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 part of Window Maker, which was written by -Alfredo K. Kojima and Dan Pascu , -with contributions from many people around the Internet. -.PP -This man page was written by Frederik Schueler for the -Debian GNU/Linux system (but may be used by others). diff --git a/wrlib/Makefile.am b/wrlib/Makefile.am index ee1c04d6..d2d67cf6 100644 --- a/wrlib/Makefile.am +++ b/wrlib/Makefile.am @@ -17,8 +17,6 @@ EXTRA_libwraster_la_DEPENDENCIES = libwraster.map CLEANFILES = libwraster.map endif -dist_bin_SCRIPTS = get-wraster-flags - include_HEADERS = wraster.h libwraster_la_SOURCES = \ diff --git a/wrlib/get-wraster-flags b/wrlib/get-wraster-flags deleted file mode 100755 index ed245b95..00000000 --- a/wrlib/get-wraster-flags +++ /dev/null @@ -1,33 +0,0 @@ -#!/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 -- 2.11.4.GIT