From a20aebdef2d1a2f4a8eb745b2aa3ac9d9ec3415e Mon Sep 17 00:00:00 2001 From: dan Date: Thu, 18 Jan 2001 19:21:56 +0000 Subject: [PATCH] - Made all changes for moving WINGs headers in the WINGs subdirectory. - Updated get-{wings|wutil}-flags accordingly --- WINGs/ChangeLog | 4 ++++ WINGs/Examples/connect.c | 2 +- WINGs/Examples/fontl.c | 4 ++-- WINGs/Examples/puzzle.c | 2 +- WINGs/Extras/test.c | 2 +- WINGs/Extras/wtabledelegates.c | 2 +- WINGs/Extras/wtableview.c | 2 +- WINGs/Makefile.am | 15 +++------------ WINGs/Tests/mywidget.c | 2 +- WINGs/Tests/testcolorpanel.c | 2 +- WINGs/Tests/testmywidget.c | 3 +-- WINGs/Tests/wmfile.c | 2 +- WINGs/Tests/wmquery.c | 2 +- WINGs/Tests/wtest.c | 3 +-- WINGs/WINGs/.cvsignore | 1 + WINGs/WINGs/Makefile.am | 9 +++++++++ WINGs/{ => WINGs}/WINGs.h | 0 WINGs/{ => WINGs}/WINGsP.h | 0 WINGs/{ => WINGs}/WUtil.h | 0 WPrefs.app/MouseSettings.c | 2 +- WPrefs.app/TexturePanel.c | 3 +-- WPrefs.app/WPrefs.h | 3 +-- WPrefs.app/double.c | 2 +- WPrefs.app/editmenu.c | 4 ++-- WPrefs.app/imagebrowser.c | 4 ++-- WPrefs.app/xmodifier.c | 2 +- configure.in | 18 ++++++++++-------- src/WindowMaker.h | 3 +-- src/appicon.c | 2 +- src/defaults.c | 2 +- src/geomview.c | 2 +- src/misc.c | 2 +- src/xmodifier.c | 2 +- src/xutil.c | 2 +- util/wmagnify.c | 2 +- util/wmsetbg.c | 2 +- util/wmsetup.c | 2 +- 37 files changed, 59 insertions(+), 57 deletions(-) create mode 100644 WINGs/WINGs/.cvsignore create mode 100644 WINGs/WINGs/Makefile.am rename WINGs/{ => WINGs}/WINGs.h (100%) rename WINGs/{ => WINGs}/WINGsP.h (100%) rename WINGs/{ => WINGs}/WUtil.h (100%) diff --git a/WINGs/ChangeLog b/WINGs/ChangeLog index e6f8c743..0a65659e 100644 --- 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 in your application from now on. + Also updated get-{wings|wutil}-flags. + changes since wmaker 0.62.1: ............................ diff --git a/WINGs/Examples/connect.c b/WINGs/Examples/connect.c index c7b2d3b3..9317273a 100644 --- a/WINGs/Examples/connect.c +++ b/WINGs/Examples/connect.c @@ -23,7 +23,7 @@ #include #include -#include "WINGs.h" +#include diff --git a/WINGs/Examples/fontl.c b/WINGs/Examples/fontl.c index 022a1225..6da739df 100644 --- a/WINGs/Examples/fontl.c +++ b/WINGs/Examples/fontl.c @@ -24,8 +24,8 @@ #include #include -#include "WINGs.h" -#include "WUtil.h" +#include +#include void wAbort() diff --git a/WINGs/Examples/puzzle.c b/WINGs/Examples/puzzle.c index 7ad304c7..b99da4e0 100644 --- a/WINGs/Examples/puzzle.c +++ b/WINGs/Examples/puzzle.c @@ -3,7 +3,7 @@ #include #include -#include +#include diff --git a/WINGs/Extras/test.c b/WINGs/Extras/test.c index 9da43b1f..b0b951fe 100644 --- a/WINGs/Extras/test.c +++ b/WINGs/Extras/test.c @@ -1,6 +1,6 @@ -#include +#include #include "wtableview.h" #include "wtabledelegates.h" diff --git a/WINGs/Extras/wtabledelegates.c b/WINGs/Extras/wtabledelegates.c index 5cca34f5..89f9c0f7 100644 --- a/WINGs/Extras/wtabledelegates.c +++ b/WINGs/Extras/wtabledelegates.c @@ -1,6 +1,6 @@ -#include +#include #include "wtableview.h" diff --git a/WINGs/Extras/wtableview.c b/WINGs/Extras/wtableview.c index 9401b053..d133b4b0 100644 --- a/WINGs/Extras/wtableview.c +++ b/WINGs/Extras/wtableview.c @@ -1,6 +1,6 @@ -#include +#include #include #include "wtableview.h" diff --git a/WINGs/Makefile.am b/WINGs/Makefile.am index bc4375d9..48a3c88b 100644 --- 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 diff --git a/WINGs/Tests/mywidget.c b/WINGs/Tests/mywidget.c index 45ff4b1a..a0bcc7ba 100644 --- a/WINGs/Tests/mywidget.c +++ b/WINGs/Tests/mywidget.c @@ -14,7 +14,7 @@ * * */ -#include "WINGsP.h" +#include /* * Our public header. diff --git a/WINGs/Tests/testcolorpanel.c b/WINGs/Tests/testcolorpanel.c index f7677546..87083730 100644 --- a/WINGs/Tests/testcolorpanel.c +++ b/WINGs/Tests/testcolorpanel.c @@ -3,7 +3,7 @@ */ -#include "WINGs.h" +#include #include #include diff --git a/WINGs/Tests/testmywidget.c b/WINGs/Tests/testmywidget.c index ee78f22b..2164f105 100644 --- a/WINGs/Tests/testmywidget.c +++ b/WINGs/Tests/testmywidget.c @@ -1,7 +1,6 @@ -#include -#include +#include #include "mywidget.h" diff --git a/WINGs/Tests/wmfile.c b/WINGs/Tests/wmfile.c index 2bb11782..9b74669e 100644 --- a/WINGs/Tests/wmfile.c +++ b/WINGs/Tests/wmfile.c @@ -13,7 +13,7 @@ -#include "WINGs.h" +#include #include #include diff --git a/WINGs/Tests/wmquery.c b/WINGs/Tests/wmquery.c index cfea64c2..6f91655c 100644 --- a/WINGs/Tests/wmquery.c +++ b/WINGs/Tests/wmquery.c @@ -4,7 +4,7 @@ */ -#include "WINGs.h" +#include #include #include diff --git a/WINGs/Tests/wtest.c b/WINGs/Tests/wtest.c index 43b9879b..893b8926 100644 --- a/WINGs/Tests/wtest.c +++ b/WINGs/Tests/wtest.c @@ -2,7 +2,7 @@ * WINGs test application */ -#include "WINGs.h" +#include #include @@ -1206,7 +1206,6 @@ testDragAndDrop(WMScreen *scr) /*******************************************************************/ -#include "WUtil.h" void testUD() diff --git a/WINGs/WINGs/.cvsignore b/WINGs/WINGs/.cvsignore new file mode 100644 index 00000000..6179e0db --- /dev/null +++ b/WINGs/WINGs/.cvsignore @@ -0,0 +1 @@ +Makefile Makefile.in diff --git a/WINGs/WINGs/Makefile.am b/WINGs/WINGs/Makefile.am new file mode 100644 index 00000000..0c5e38f0 --- /dev/null +++ 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 + diff --git a/WINGs/WINGs.h b/WINGs/WINGs/WINGs.h similarity index 100% rename from WINGs/WINGs.h rename to WINGs/WINGs/WINGs.h diff --git a/WINGs/WINGsP.h b/WINGs/WINGs/WINGsP.h similarity index 100% rename from WINGs/WINGsP.h rename to WINGs/WINGs/WINGsP.h diff --git a/WINGs/WUtil.h b/WINGs/WINGs/WUtil.h similarity index 100% rename from WINGs/WUtil.h rename to WINGs/WINGs/WUtil.h diff --git a/WPrefs.app/MouseSettings.c b/WPrefs.app/MouseSettings.c index b8615852..f8b1ed6a 100644 --- 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 diff --git a/WPrefs.app/TexturePanel.c b/WPrefs.app/TexturePanel.c index 035ff03b..cf2d9740 100644 --- a/WPrefs.app/TexturePanel.c +++ b/WPrefs.app/TexturePanel.c @@ -31,8 +31,7 @@ #include -#include -#include +#include #include "WPrefs.h" diff --git a/WPrefs.app/WPrefs.h b/WPrefs.app/WPrefs.h index b91c8cdc..24fd10b3 100644 --- a/WPrefs.app/WPrefs.h +++ b/WPrefs.app/WPrefs.h @@ -34,8 +34,7 @@ #include -#include -#include +#include /* For EXTENDED_WINDOWSHORTCUT */ #include "../src/wconfig.h" diff --git a/WPrefs.app/double.c b/WPrefs.app/double.c index 65049259..b3b35dcf 100644 --- a/WPrefs.app/double.c +++ b/WPrefs.app/double.c @@ -4,7 +4,7 @@ * */ -#include "WINGsP.h" +#include #include "double.h" diff --git a/WPrefs.app/editmenu.c b/WPrefs.app/editmenu.c index 1839b2eb..79944429 100644 --- a/WPrefs.app/editmenu.c +++ b/WPrefs.app/editmenu.c @@ -21,8 +21,8 @@ */ -#include -#include +#include +#include #include #include #include diff --git a/WPrefs.app/imagebrowser.c b/WPrefs.app/imagebrowser.c index eb717894..565ccc66 100644 --- a/WPrefs.app/imagebrowser.c +++ b/WPrefs.app/imagebrowser.c @@ -28,8 +28,8 @@ # define _(a) a #endif -#include -#include +#include +#include #include #include #include diff --git a/WPrefs.app/xmodifier.c b/WPrefs.app/xmodifier.c index 040e715e..cdb03688 100644 --- a/WPrefs.app/xmodifier.c +++ b/WPrefs.app/xmodifier.c @@ -35,7 +35,7 @@ Boston, MA 02111-1307, USA. */ #include #include -#include "WUtil.h" +#include diff --git a/configure.in b/configure.in index 90fac591..22a2b6e2 100644 --- 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 <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 <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" diff --git a/src/WindowMaker.h b/src/WindowMaker.h index 8e292507..ef63accf 100644 --- a/src/WindowMaker.h +++ b/src/WindowMaker.h @@ -26,8 +26,7 @@ #include -#include "WINGs.h" -#include "WUtil.h" +#include #if HAVE_LIBINTL_H && I18N # include diff --git a/src/appicon.c b/src/appicon.c index 6e65469d..7435bfdb 100644 --- a/src/appicon.c +++ b/src/appicon.c @@ -48,7 +48,7 @@ #include "xdnd.h" #endif #include "wsound.h" -#include "WINGsP.h" +#include /* diff --git a/src/defaults.c b/src/defaults.c index f953c85b..3d74b0e5 100644 --- 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 static int setDoubleClick(WScreen *scr, WDefaultEntry *entry, int *value, void *foo) diff --git a/src/geomview.c b/src/geomview.c index c1c9456b..21d1e420 100644 --- a/src/geomview.c +++ b/src/geomview.c @@ -1,7 +1,7 @@ -#include "WINGsP.h" +#include diff --git a/src/misc.c b/src/misc.c index 47b38c8e..28f5a195 100644 --- a/src/misc.c +++ b/src/misc.c @@ -33,7 +33,7 @@ #include #include -#include +#include #include diff --git a/src/xmodifier.c b/src/xmodifier.c index 729cb865..8807feed 100644 --- a/src/xmodifier.c +++ b/src/xmodifier.c @@ -33,7 +33,7 @@ Boston, MA 02111-1307, USA. */ #include #include -#include "WUtil.h" +#include extern Display *dpy; diff --git a/src/xutil.c b/src/xutil.c index 566d500d..e5866fc6 100644 --- a/src/xutil.c +++ b/src/xutil.c @@ -29,7 +29,7 @@ #include "xutil.h" -#include +#include #if 0 static Atom Clipboard=0; #endif diff --git a/util/wmagnify.c b/util/wmagnify.c index fda4d6f9..ec736f5a 100644 --- a/util/wmagnify.c +++ b/util/wmagnify.c @@ -8,7 +8,7 @@ #include -#include +#include #include #include diff --git a/util/wmsetbg.c b/util/wmsetbg.c index 8cd202f1..10822367 100644 --- a/util/wmsetbg.c +++ b/util/wmsetbg.c @@ -46,7 +46,7 @@ #include "../src/wconfig.h" -#include +#include #include #include diff --git a/util/wmsetup.c b/util/wmsetup.c index 18f7881a..1b701362 100644 --- a/util/wmsetup.c +++ b/util/wmsetup.c @@ -33,7 +33,7 @@ main() #include #include -#include +#include #include "../src/config.h" -- 2.11.4.GIT