- Made all changes for moving WINGs headers in the WINGs subdirectory.

- Updated get-{wings|wutil}-flags accordingly
2025-12-19 12:28:22 +01:00 · 2001-01-18 19:21:56 +00:00
parent 6a3b06e609
commit a20aebdef2
37 changed files with 59 additions and 57 deletions
--- a/WINGs/ChangeLog
+++ b/WINGs/ChangeLog
@@ -3,6 +3,10 @@ changes since wmaker 0.63.1:
 - added WMRunModalLoop() and WMBreakModalLoop()
 - added WMSetBoxExpandsToParent()
 - added WMRemoveBoxSubview()
+- moved WINGs headers in a WINGs subdirectory when installed.
+  use #include <WINGs/header_file_name> in your application from now on.
+  Also updated get-{wings|wutil}-flags.
+

 changes since wmaker 0.62.1:
 ............................
--- a/WINGs/Examples/connect.c
+++ b/WINGs/Examples/connect.c
@@ -23,7 +23,7 @@
 #include <unistd.h>
 #include <string.h>

-#include "WINGs.h"
+#include <WINGs/WINGs.h>



--- a/WINGs/Examples/fontl.c
+++ b/WINGs/Examples/fontl.c
@@ -24,8 +24,8 @@

 #include <stdlib.h>
 #include <stdio.h>
-#include "WINGs.h"
-#include "WUtil.h"
+#include <WINGs/WINGs.h>
+#include <WINGs/WUtil.h>

 void
 wAbort()
--- a/WINGs/Examples/puzzle.c
+++ b/WINGs/Examples/puzzle.c
@@ -3,7 +3,7 @@

 #include <stdlib.h>
 #include <stdio.h>
-#include <WINGs.h>
+#include <WINGs/WINGs.h>



--- a/WINGs/Extras/test.c
+++ b/WINGs/Extras/test.c
@@ -1,6 +1,6 @@


-#include <WINGs.h>
+#include <WINGs/WINGs.h>
 #include "wtableview.h"
 #include "wtabledelegates.h"

--- a/WINGs/Extras/wtabledelegates.c
+++ b/WINGs/Extras/wtabledelegates.c
@@ -1,6 +1,6 @@


-#include <WINGs.h>
+#include <WINGs/WINGs.h>

 #include "wtableview.h"

--- a/WINGs/Extras/wtableview.c
+++ b/WINGs/Extras/wtableview.c
@@ -1,6 +1,6 @@


-#include <WINGsP.h>
+#include <WINGs/WINGsP.h>
 #include <X11/cursorfont.h>

 #include "wtableview.h"
--- a/WINGs/Makefile.am
+++ b/WINGs/Makefile.am
@@ -2,17 +2,12 @@

 AUTOMAKE_OPTIONS = no-dependencies

-SUBDIRS = . Documentation Resources Examples Extras Tests
+SUBDIRS = WINGs . Documentation Resources Examples Extras Tests



 #libWINGs_la_LDFLAGS = -version-info 1:1:0

-# is this a kluge? if so, how should i do it?
-includedir = @includedir@/WINGs
-
-include_HEADERS = WINGs.h WUtil.h WINGsP.h
-
 bin_SCRIPTS = get-wings-flags get-wutil-flags

 lib_LIBRARIES = libWINGs.a libWUtil.a
@@ -21,12 +16,10 @@ lib_LIBRARIES = libWINGs.a libWUtil.a
 LDADD= libWINGs.a $(top_builddir)/wrlib/libwraster.la @LIBPL@


-EXTRA_DIST = BUGS WINGs
+EXTRA_DIST = BUGS

 # wbutton.c 
 libWINGs_a_SOURCES = 	\
-	WINGs.h \
-	WINGsP.h \
 	array.c \
 	bagtree.c \
 	configuration.c \
@@ -82,8 +75,6 @@ libWINGs_a_SOURCES = 	\


 libWUtil_a_SOURCES = 	\
-	WINGs.h \
-	WINGsP.h \
 	array.c \
 	bagtree.c \
 	connection.c \
@@ -103,7 +94,7 @@ libWUtil_a_SOURCES = 	\
 	wutil.c


-INCLUDES = -I$(top_srcdir)/wrlib -I$(top_srcdir)/src \
+INCLUDES = -I$(top_srcdir)/WINGs/WINGs -I$(top_srcdir)/wrlib -I$(top_srcdir)/src \
 	-DRESOURCE_PATH=\"$(datadir)/WINGs\" @HEADER_SEARCH_PATH@ -DDEBUG


--- a/WINGs/Tests/mywidget.c
+++ b/WINGs/Tests/mywidget.c
@@ -14,7 +14,7 @@
 *
 * 
 */
-#include "WINGsP.h"
+#include <WINGs/WINGsP.h>

 /*
 * Our public header.
--- a/WINGs/Tests/testcolorpanel.c
+++ b/WINGs/Tests/testcolorpanel.c
@@ -3,7 +3,7 @@
 */


-#include "WINGs.h"
+#include <WINGs/WINGs.h>

 #include <unistd.h>
 #include <stdio.h>
--- a/WINGs/Tests/testmywidget.c
+++ b/WINGs/Tests/testmywidget.c
@@ -1,7 +1,6 @@


-#include <WINGs.h>
-#include <WUtil.h>
+#include <WINGs/WINGs.h>

 #include "mywidget.h"

--- a/WINGs/Tests/wmfile.c
+++ b/WINGs/Tests/wmfile.c
@@ -13,7 +13,7 @@



-#include "WINGs.h"
+#include <WINGs/WINGs.h>

 #include <unistd.h>
 #include <stdio.h>
--- a/WINGs/Tests/wmquery.c
+++ b/WINGs/Tests/wmquery.c
@@ -4,7 +4,7 @@
 */


-#include "WINGs.h"
+#include <WINGs/WINGs.h>

 #include <unistd.h>
 #include <stdio.h>
--- a/WINGs/Tests/wtest.c
+++ b/WINGs/Tests/wtest.c
@@ -2,7 +2,7 @@
 * WINGs test application
 */

-#include "WINGs.h"
+#include <WINGs/WINGs.h>

 #include <stdio.h>

@@ -1206,7 +1206,6 @@ testDragAndDrop(WMScreen *scr)

 /*******************************************************************/

-#include "WUtil.h"

 void
 testUD()
--- a/WINGs/WINGs/.cvsignore
+++ b/WINGs/WINGs/.cvsignore
@@ -0,0 +1 @@
+Makefile Makefile.in
--- a/WINGs/WINGs/Makefile.am
+++ b/WINGs/WINGs/Makefile.am
@@ -0,0 +1,9 @@
+## automake input file for WINGs - Headers subdir
+
+AUTOMAKE_OPTIONS = no-dependencies
+
+# is this a kluge? if so, how should i do it?
+includedir = @includedir@/WINGs
+
+include_HEADERS = WINGs.h WUtil.h WINGsP.h
+
--- a/WINGs/WINGs/WINGs.h
+++ b/WINGs/WINGs/WINGs.h
--- a/WINGs/WINGs/WINGsP.h
+++ b/WINGs/WINGs/WINGsP.h
--- a/WINGs/WINGs/WUtil.h
+++ b/WINGs/WINGs/WUtil.h
--- a/WPrefs.app/MouseSettings.c
+++ b/WPrefs.app/MouseSettings.c
@@ -90,7 +90,7 @@ typedef struct _Panel {


 /* need access to the double click variables */
-#include "WINGsP.h"
+#include <WINGs/WINGsP.h>



--- a/WPrefs.app/TexturePanel.c
+++ b/WPrefs.app/TexturePanel.c
@@ -31,8 +31,7 @@
 #include <X11/Xlib.h>


-#include <WINGs.h>
-#include <WUtil.h>
+#include <WINGs/WINGs.h>

 #include "WPrefs.h"

--- a/WPrefs.app/WPrefs.h
+++ b/WPrefs.app/WPrefs.h
@@ -34,8 +34,7 @@

 #include <wraster.h>

-#include <WINGs.h>
-#include <WUtil.h>
+#include <WINGs/WINGs.h>

 /* For EXTENDED_WINDOWSHORTCUT */
 #include "../src/wconfig.h"
--- a/WPrefs.app/double.c
+++ b/WPrefs.app/double.c
@@ -4,7 +4,7 @@
 * 
 */

-#include "WINGsP.h"
+#include <WINGs/WINGsP.h>

 #include "double.h"

--- a/WPrefs.app/editmenu.c
+++ b/WPrefs.app/editmenu.c
@@ -21,8 +21,8 @@
 */


-#include <WINGsP.h>
-#include <WUtil.h>
+#include <WINGs/WINGsP.h>
+#include <WINGs/WUtil.h>
 #include <stdlib.h>
 #include <assert.h>
 #include <ctype.h>
--- a/WPrefs.app/imagebrowser.c
+++ b/WPrefs.app/imagebrowser.c
@@ -28,8 +28,8 @@
 # define _(a) a
 #endif

-#include <WINGs.h>
-#include <WINGsP.h>
+#include <WINGs/WINGs.h>
+#include <WINGs/WINGsP.h>
 #include <assert.h>
 #include <ctype.h>
 #include <stdlib.h>
--- a/WPrefs.app/xmodifier.c
+++ b/WPrefs.app/xmodifier.c
@@ -35,7 +35,7 @@ Boston, MA 02111-1307, USA.  */
 #include <X11/Xlib.h>
 #include <X11/keysym.h>

-#include "WUtil.h"
+#include <WINGs/WUtil.h>



--- a/configure.in
+++ b/configure.in
@@ -854,16 +854,18 @@ dnl AC_CHECK_PROG(TEXI2HTML, texi2html, texi2html, ,$PATH)
  
 dnl AC_SUBST(DOCTYPES)

-AC_OUTPUT(Makefile po/Makefile util/Makefile test/Makefile wmlib/Makefile \
-	WINGs/Makefile WINGs/Documentation/Makefile WINGs/Examples/Makefile \
-	WINGs/Resources/Makefile WINGs/Tests/Makefile WINGs/Extras/Makefile \
-	wrlib/Makefile src/Makefile src/wconfig.h doc/Makefile \
-	contrib/Makefile WindowMaker/Makefile WindowMaker/Backgrounds/Makefile \
+AC_OUTPUT(Makefile po/Makefile util/Makefile test/Makefile \
+	WINGs/Makefile WINGs/WINGs/Makefile WINGs/Documentation/Makefile \
+	WINGs/Examples/Makefile WINGs/Resources/Makefile WINGs/Tests/Makefile \
+	WINGs/Extras/Makefile \
+	wmlib/Makefile wrlib/Makefile src/Makefile src/wconfig.h doc/Makefile \
+	WindowMaker/Makefile WindowMaker/Backgrounds/Makefile \
 	WindowMaker/Defaults/Makefile WindowMaker/IconSets/Makefile \
 	WindowMaker/Icons/Makefile WindowMaker/Pixmaps/Makefile \
 	WindowMaker/Styles/Makefile WindowMaker/Themes/Makefile \
 	WPrefs.app/Makefile WPrefs.app/tiff/Makefile WPrefs.app/xpm/Makefile \
-	WPrefs.app/po/Makefile contrib/WindowMaker.spec )
+	WPrefs.app/po/Makefile \
+	contrib/Makefile contrib/WindowMaker.spec )
 #	plugins/Makefile plugins/libwmfun/Makefile)


@@ -925,7 +927,7 @@ cat <<EOF >get-wings-flags
 prefix="$prefix"
 exec_prefix=\$prefix

-WCFLAGS="-I\$prefix/include/WINGs $inc_search_path"
+WCFLAGS="-I\$prefix/include $inc_search_path"
 WLFLAGS="-L\$exec_prefix/lib $lib_search_path"
 WLIBS="-lWINGs -lwraster $GFXLIBS $XLIBS -lm $NETLIBS -lPropList"

@@ -964,7 +966,7 @@ cat <<EOF >get-wutil-flags
 prefix="$prefix"
 exec_prefix=\$prefix

-WCFLAGS="-I\$prefix/include/WINGs $inc_search_path"
+WCFLAGS="-I\$prefix/include $inc_search_path"
 WLFLAGS="-L\$exec_prefix/lib $lib_search_path"
 WLIBS="-lWUtil $NETLIBS -lPropList"

--- a/src/WindowMaker.h
+++ b/src/WindowMaker.h
@@ -26,8 +26,7 @@

 #include <assert.h>

-#include "WINGs.h"
-#include "WUtil.h"
+#include <WINGs/WINGs.h>

 #if HAVE_LIBINTL_H && I18N
 # include <libintl.h>
--- a/src/appicon.c
+++ b/src/appicon.c
@@ -48,7 +48,7 @@
 #include "xdnd.h"
 #endif
 #include "wsound.h"
-#include "WINGsP.h"
+#include <WINGs/WINGsP.h>


 /*
--- a/src/defaults.c
+++ b/src/defaults.c
@@ -3376,7 +3376,7 @@ setButtonImages(WScreen *scr, WDefaultEntry *entry, int *value, void *foo)
 * wmaker panels will have the same dbl-click values. 
 * TODO: figure a better way of dealing with it.
 */
-#include "WINGsP.h"
+#include <WINGs/WINGsP.h>

 static int
 setDoubleClick(WScreen *scr, WDefaultEntry *entry, int *value, void *foo)
--- a/src/geomview.c
+++ b/src/geomview.c
@@ -1,7 +1,7 @@



-#include "WINGsP.h"
+#include <WINGs/WINGsP.h>



--- a/src/misc.c
+++ b/src/misc.c
@@ -33,7 +33,7 @@
 #include <math.h>
 #include <time.h>

-#include <WUtil.h>
+#include <WINGs/WUtil.h>
 #include <wraster.h>


--- a/src/xmodifier.c
+++ b/src/xmodifier.c
@@ -33,7 +33,7 @@ Boston, MA 02111-1307, USA.  */
 #include <X11/Xlib.h>
 #include <X11/keysym.h>

-#include "WUtil.h"
+#include <WINGs/WUtil.h>


 extern Display *dpy;
--- a/src/xutil.c
+++ b/src/xutil.c
@@ -29,7 +29,7 @@

 #include "xutil.h"

-#include <WUtil.h>
+#include <WINGs/WUtil.h>
 #if 0
 static Atom Clipboard=0;
 #endif
--- a/util/wmagnify.c
+++ b/util/wmagnify.c
@@ -8,7 +8,7 @@

 #include <X11/Xproto.h>

-#include <WINGs.h>
+#include <WINGs/WINGs.h>
 #include <stdlib.h>
 #include <stdio.h>

--- a/util/wmsetbg.c
+++ b/util/wmsetbg.c
@@ -46,7 +46,7 @@

 #include "../src/wconfig.h"

-#include <WINGs.h>
+#include <WINGs/WINGs.h>
 #include <wraster.h>

 #include <proplist.h>
--- a/util/wmsetup.c
+++ b/util/wmsetup.c
@@ -33,7 +33,7 @@ main()
 #include <sys/types.h>
 #include <sys/stat.h>

-#include <WINGs.h>
+#include <WINGs/WINGs.h>

 #include "../src/config.h"