gryf/wmaker
1
0
Fork 0
mirror of https://github.com/gryf/wmaker.git synced 2025-12-19 12:28:22 +01:00
Code Issues Projects Releases Wiki Activity

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

Browse Source 
- Updated get-{wings|wutil}-flags accordingly
This commit is contained in:
dan
2001-01-18 19:21:56 +00:00
parent 6a3b06e609
commit a20aebdef2
37 changed files with 59 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
WINGs/ChangeLog
View File

@@ -3,6 +3,10 @@ changes since wmaker 0.63.1:
- added WMRunModalLoop() and WMBreakModalLoop() - added WMRunModalLoop() and WMBreakModalLoop()
- added WMSetBoxExpandsToParent() - added WMSetBoxExpandsToParent()
- added WMRemoveBoxSubview() - 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: changes since wmaker 0.62.1:
............................ ............................

2
WINGs/Examples/connect.c
View File

@@ -23,7 +23,7 @@
#include <unistd.h> #include <unistd.h>
#include <string.h> #include <string.h>
#include "WINGs.h" #include <WINGs/WINGs.h>

4
WINGs/Examples/fontl.c
View File

@@ -24,8 +24,8 @@
#include <stdlib.h> #include <stdlib.h>
#include <stdio.h> #include <stdio.h>
#include "WINGs.h" #include <WINGs/WINGs.h>
#include "WUtil.h" #include <WINGs/WUtil.h>
void void
wAbort() wAbort()

2
WINGs/Examples/puzzle.c
View File

@@ -3,7 +3,7 @@
#include <stdlib.h> #include <stdlib.h>
#include <stdio.h> #include <stdio.h>
#include <WINGs.h> #include <WINGs/WINGs.h>

2
WINGs/Extras/test.c
View File

@@ -1,6 +1,6 @@
#include <WINGs.h> #include <WINGs/WINGs.h>
#include "wtableview.h" #include "wtableview.h"
#include "wtabledelegates.h" #include "wtabledelegates.h"

2
WINGs/Extras/wtabledelegates.c
View File

@@ -1,6 +1,6 @@
#include <WINGs.h> #include <WINGs/WINGs.h>
#include "wtableview.h" #include "wtableview.h"

2
WINGs/Extras/wtableview.c
View File

@@ -1,6 +1,6 @@
#include <WINGsP.h> #include <WINGs/WINGsP.h>
#include <X11/cursorfont.h> #include <X11/cursorfont.h>
#include "wtableview.h" #include "wtableview.h"

15
WINGs/Makefile.am
View File

@@ -2,17 +2,12 @@
AUTOMAKE_OPTIONS = no-dependencies 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 #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 bin_SCRIPTS = get-wings-flags get-wutil-flags
lib_LIBRARIES = libWINGs.a libWUtil.a 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@ LDADD= libWINGs.a $(top_builddir)/wrlib/libwraster.la @LIBPL@
EXTRA_DIST = BUGS WINGs EXTRA_DIST = BUGS
# wbutton.c # wbutton.c
libWINGs_a_SOURCES = \ libWINGs_a_SOURCES = \
WINGs.h \
WINGsP.h \
array.c \ array.c \
bagtree.c \ bagtree.c \
configuration.c \ configuration.c \
@@ -82,8 +75,6 @@ libWINGs_a_SOURCES = \
libWUtil_a_SOURCES = \ libWUtil_a_SOURCES = \
WINGs.h \
WINGsP.h \
array.c \ array.c \
bagtree.c \ bagtree.c \
connection.c \ connection.c \
@@ -103,7 +94,7 @@ libWUtil_a_SOURCES = \
wutil.c 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 -DRESOURCE_PATH=\"$(datadir)/WINGs\" @HEADER_SEARCH_PATH@ -DDEBUG

2
WINGs/Tests/mywidget.c
View File

@@ -14,7 +14,7 @@
* *
* *
*/ */
#include "WINGsP.h" #include <WINGs/WINGsP.h>
/* /*
* Our public header. * Our public header.

2
WINGs/Tests/testcolorpanel.c
View File

@@ -3,7 +3,7 @@
*/ */
#include "WINGs.h" #include <WINGs/WINGs.h>
#include <unistd.h> #include <unistd.h>
#include <stdio.h> #include <stdio.h>

3
WINGs/Tests/testmywidget.c
View File

@@ -1,7 +1,6 @@
#include <WINGs.h> #include <WINGs/WINGs.h>
#include <WUtil.h>
#include "mywidget.h" #include "mywidget.h"

2
WINGs/Tests/wmfile.c
View File

@@ -13,7 +13,7 @@
#include "WINGs.h" #include <WINGs/WINGs.h>
#include <unistd.h> #include <unistd.h>
#include <stdio.h> #include <stdio.h>

2
WINGs/Tests/wmquery.c
View File

@@ -4,7 +4,7 @@
*/ */
#include "WINGs.h" #include <WINGs/WINGs.h>
#include <unistd.h> #include <unistd.h>
#include <stdio.h> #include <stdio.h>

3
WINGs/Tests/wtest.c
View File

@@ -2,7 +2,7 @@
* WINGs test application * WINGs test application
*/ */
#include "WINGs.h" #include <WINGs/WINGs.h>
#include <stdio.h> #include <stdio.h>
@@ -1206,7 +1206,6 @@ testDragAndDrop(WMScreen *scr)
/*******************************************************************/ /*******************************************************************/
#include "WUtil.h"
void void
testUD() testUD()

1
WINGs/WINGs/.cvsignore Normal file
View File

@@ -0,0 +1 @@
Makefile Makefile.in

9
WINGs/WINGs/Makefile.am Normal file
View File

@@ -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

0
WINGs/WINGs.h → WINGs/WINGs/WINGs.h
View File

0
WINGs/WINGsP.h → WINGs/WINGs/WINGsP.h
View File

0
WINGs/WUtil.h → WINGs/WINGs/WUtil.h
View File

2
WPrefs.app/MouseSettings.c
View File

@@ -90,7 +90,7 @@ typedef struct _Panel {
/* need access to the double click variables */ /* need access to the double click variables */
#include "WINGsP.h" #include <WINGs/WINGsP.h>

3
WPrefs.app/TexturePanel.c
View File

@@ -31,8 +31,7 @@
#include <X11/Xlib.h> #include <X11/Xlib.h>
#include <WINGs.h> #include <WINGs/WINGs.h>
#include <WUtil.h>
#include "WPrefs.h" #include "WPrefs.h"

3
WPrefs.app/WPrefs.h
View File

@@ -34,8 +34,7 @@
#include <wraster.h> #include <wraster.h>
#include <WINGs.h> #include <WINGs/WINGs.h>
#include <WUtil.h>
/* For EXTENDED_WINDOWSHORTCUT */ /* For EXTENDED_WINDOWSHORTCUT */
#include "../src/wconfig.h" #include "../src/wconfig.h"

2
WPrefs.app/double.c
View File

@@ -4,7 +4,7 @@
* *
*/ */
#include "WINGsP.h" #include <WINGs/WINGsP.h>
#include "double.h" #include "double.h"

4
WPrefs.app/editmenu.c
View File

@@ -21,8 +21,8 @@
*/ */
#include <WINGsP.h> #include <WINGs/WINGsP.h>
#include <WUtil.h> #include <WINGs/WUtil.h>
#include <stdlib.h> #include <stdlib.h>
#include <assert.h> #include <assert.h>
#include <ctype.h> #include <ctype.h>

4
WPrefs.app/imagebrowser.c
View File

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

2
WPrefs.app/xmodifier.c
View File

@@ -35,7 +35,7 @@ Boston, MA 02111-1307, USA. */
#include <X11/Xlib.h> #include <X11/Xlib.h>
#include <X11/keysym.h> #include <X11/keysym.h>
#include "WUtil.h" #include <WINGs/WUtil.h>

18
configure.in
View File

@@ -854,16 +854,18 @@ dnl AC_CHECK_PROG(TEXI2HTML, texi2html, texi2html, ,$PATH)
dnl AC_SUBST(DOCTYPES) dnl AC_SUBST(DOCTYPES)
AC_OUTPUT(Makefile po/Makefile util/Makefile test/Makefile wmlib/Makefile \ AC_OUTPUT(Makefile po/Makefile util/Makefile test/Makefile \
WINGs/Makefile WINGs/Documentation/Makefile WINGs/Examples/Makefile \ WINGs/Makefile WINGs/WINGs/Makefile WINGs/Documentation/Makefile \
WINGs/Resources/Makefile WINGs/Tests/Makefile WINGs/Extras/Makefile \ WINGs/Examples/Makefile WINGs/Resources/Makefile WINGs/Tests/Makefile \
wrlib/Makefile src/Makefile src/wconfig.h doc/Makefile \ WINGs/Extras/Makefile \
contrib/Makefile WindowMaker/Makefile WindowMaker/Backgrounds/Makefile \ wmlib/Makefile wrlib/Makefile src/Makefile src/wconfig.h doc/Makefile \
WindowMaker/Makefile WindowMaker/Backgrounds/Makefile \
WindowMaker/Defaults/Makefile WindowMaker/IconSets/Makefile \ WindowMaker/Defaults/Makefile WindowMaker/IconSets/Makefile \
WindowMaker/Icons/Makefile WindowMaker/Pixmaps/Makefile \ WindowMaker/Icons/Makefile WindowMaker/Pixmaps/Makefile \
WindowMaker/Styles/Makefile WindowMaker/Themes/Makefile \ WindowMaker/Styles/Makefile WindowMaker/Themes/Makefile \
WPrefs.app/Makefile WPrefs.app/tiff/Makefile WPrefs.app/xpm/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) # plugins/Makefile plugins/libwmfun/Makefile)
@@ -925,7 +927,7 @@ cat <<EOF >get-wings-flags
prefix="$prefix" prefix="$prefix"
exec_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" WLFLAGS="-L\$exec_prefix/lib $lib_search_path"
WLIBS="-lWINGs -lwraster $GFXLIBS $XLIBS -lm $NETLIBS -lPropList" WLIBS="-lWINGs -lwraster $GFXLIBS $XLIBS -lm $NETLIBS -lPropList"
@@ -964,7 +966,7 @@ cat <<EOF >get-wutil-flags
prefix="$prefix" prefix="$prefix"
exec_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" WLFLAGS="-L\$exec_prefix/lib $lib_search_path"
WLIBS="-lWUtil $NETLIBS -lPropList" WLIBS="-lWUtil $NETLIBS -lPropList"

3
src/WindowMaker.h
View File

@@ -26,8 +26,7 @@
#include <assert.h> #include <assert.h>
#include "WINGs.h" #include <WINGs/WINGs.h>
#include "WUtil.h"
#if HAVE_LIBINTL_H && I18N #if HAVE_LIBINTL_H && I18N
# include <libintl.h> # include <libintl.h>

2
src/appicon.c
View File

@@ -48,7 +48,7 @@
#include "xdnd.h" #include "xdnd.h"
#endif #endif
#include "wsound.h" #include "wsound.h"
#include "WINGsP.h" #include <WINGs/WINGsP.h>
/* /*

2
src/defaults.c
View File

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

2
src/geomview.c
View File

@@ -1,7 +1,7 @@
#include "WINGsP.h" #include <WINGs/WINGsP.h>

2
src/misc.c
View File

@@ -33,7 +33,7 @@
#include <math.h> #include <math.h>
#include <time.h> #include <time.h>
#include <WUtil.h> #include <WINGs/WUtil.h>
#include <wraster.h> #include <wraster.h>

2
src/xmodifier.c
View File

@@ -33,7 +33,7 @@ Boston, MA 02111-1307, USA. */
#include <X11/Xlib.h> #include <X11/Xlib.h>
#include <X11/keysym.h> #include <X11/keysym.h>
#include "WUtil.h" #include <WINGs/WUtil.h>
extern Display *dpy; extern Display *dpy;

2
src/xutil.c
View File

@@ -29,7 +29,7 @@
#include "xutil.h" #include "xutil.h"
#include <WUtil.h> #include <WINGs/WUtil.h>
#if 0 #if 0
static Atom Clipboard=0; static Atom Clipboard=0;
#endif #endif

2
util/wmagnify.c
View File

@@ -8,7 +8,7 @@
#include <X11/Xproto.h> #include <X11/Xproto.h>
#include <WINGs.h> #include <WINGs/WINGs.h>
#include <stdlib.h> #include <stdlib.h>
#include <stdio.h> #include <stdio.h>

2
util/wmsetbg.c
View File

@@ -46,7 +46,7 @@
#include "../src/wconfig.h" #include "../src/wconfig.h"
#include <WINGs.h> #include <WINGs/WINGs.h>
#include <wraster.h> #include <wraster.h>
#include <proplist.h> #include <proplist.h>

2
util/wmsetup.c
View File

@@ -33,7 +33,7 @@ main()
#include <sys/types.h> #include <sys/types.h>
#include <sys/stat.h> #include <sys/stat.h>
#include <WINGs.h> #include <WINGs/WINGs.h>
#include "../src/config.h" #include "../src/config.h"