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

- fixed compilation problem for systems that require -lintl for building WINGs

Browse Source 
- removed redundant include/lib paths from the get-*-flags scripts
This commit is contained in:
dan
2001-10-10 01:02:34 +00:00
parent 75f790160b
commit 4be9abcdbc
8 changed files with 34 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@@ -4,6 +4,9 @@ Changes since version 0.70.0:
- Disabled window birth animation by default (while it was ok with normal - Disabled window birth animation by default (while it was ok with normal
windows, it was very annoying with menus editing in WPrefs.app) windows, it was very annoying with menus editing in WPrefs.app)
- Added ability to shade/unshade a window using the mouse wheel. - Added ability to shade/unshade a window using the mouse wheel.
- Fixed compilation for systems that required -lintl for WINGs
(Jim Knoble <jmknoble@pobox.com>)
- Removed redundant include/lib paths from the get-*-flags scripts
Changes since version 0.65.1: Changes since version 0.65.1:

8
WINGs/Examples/Makefile.am
View File

@@ -6,7 +6,8 @@ AUTOMAKE_OPTIONS = no-dependencies
noinst_PROGRAMS = connect server fontl puzzle noinst_PROGRAMS = connect server fontl puzzle
LDADD= $(top_builddir)/WINGs/libWINGs.a $(top_builddir)/wrlib/libwraster.la LDADD= $(top_builddir)/WINGs/libWINGs.a $(top_builddir)/wrlib/libwraster.la \
@INTLIBS@
fontl_DEPENDENCIES = $(top_builddir)/WINGs/libWINGs.a fontl_DEPENDENCIES = $(top_builddir)/WINGs/libWINGs.a
@@ -16,11 +17,12 @@ puzzle_DEPENDENCIES = $(top_builddir)/WINGs/libWINGs.a
connect_DEPENDENCIES = $(top_builddir)/WINGs/libWUtil.a connect_DEPENDENCIES = $(top_builddir)/WINGs/libWUtil.a
connect_LDADD = $(top_builddir)/WINGs/libWUtil.a @LIBRARY_SEARCH_PATH@ \ connect_LDADD = $(top_builddir)/WINGs/libWUtil.a @LIBRARY_SEARCH_PATH@ \
@NETLIBS@ @NETLIBS@ @INTLIBS@
server_DEPENDENCIES = $(top_builddir)/WINGs/libWUtil.a server_DEPENDENCIES = $(top_builddir)/WINGs/libWUtil.a
server_LDADD = $(top_builddir)/WINGs/libWUtil.a @LIBRARY_SEARCH_PATH@ @NETLIBS@ server_LDADD = $(top_builddir)/WINGs/libWUtil.a @LIBRARY_SEARCH_PATH@ \
@NETLIBS@ @INTLIBS@
INCLUDES = -I$(top_srcdir)/WINGs -I$(top_srcdir)/wrlib -I$(top_srcdir)/src \ INCLUDES = -I$(top_srcdir)/WINGs -I$(top_srcdir)/wrlib -I$(top_srcdir)/src \

3
WINGs/Extras/Makefile.am
View File

@@ -26,7 +26,8 @@ libExtraWINGs_a_SOURCES = \
INCLUDES = -I$(top_srcdir)/wrlib -I$(top_srcdir)/WINGs \ INCLUDES = -I$(top_srcdir)/wrlib -I$(top_srcdir)/WINGs \
-DRESOURCE_PATH=\"$(datadir)/WINGs\" @HEADER_SEARCH_PATH@ -DDEBUG -DRESOURCE_PATH=\"$(datadir)/WINGs\" @HEADER_SEARCH_PATH@ -DDEBUG
LDADD= $(top_builddir)/WINGs/libWINGs.a $(top_builddir)/wrlib/libwraster.la LDADD= $(top_builddir)/WINGs/libWINGs.a $(top_builddir)/wrlib/libwraster.la \
@INTLIBS@
test_LDADD = wtableview.o wtabledelegates.o $(LDADD) test_LDADD = wtableview.o wtabledelegates.o $(LDADD)

3
WINGs/Tests/Makefile.am
View File

@@ -4,7 +4,8 @@ AUTOMAKE_OPTIONS = no-dependencies
noinst_PROGRAMS = wtest wmquery wmfile testmywidget noinst_PROGRAMS = wtest wmquery wmfile testmywidget
LDADD= $(top_builddir)/WINGs/libWINGs.a $(top_builddir)/wrlib/libwraster.la LDADD= $(top_builddir)/WINGs/libWINGs.a $(top_builddir)/wrlib/libwraster.la \
@INTLIBS@
testmywidget_SOURCES = testmywidget.c mywidget.c mywidget.h testmywidget_SOURCES = testmywidget.c mywidget.c mywidget.h

25
configure.ac
View File

@@ -840,11 +840,8 @@ dnl parsed by m4
cat <<EOF >get-wraster-flags cat <<EOF >get-wraster-flags
#!/bin/sh #!/bin/sh
prefix="$prefix" WCFLAGS="$inc_search_path"
exec_prefix=\$prefix WLFLAGS="$lib_search_path"
WCFLAGS="-I\$prefix/include $inc_search_path"
WLFLAGS="-L\$exec_prefix/lib $lib_search_path"
WLIBS="-lwraster $GFXLIBS $XLIBS -lm" WLIBS="-lwraster $GFXLIBS $XLIBS -lm"
usage="Usage: get-wraster-flags #lp#--cflags#rp# #lp#--ldflags#rp# #lp#--libs#rp#" usage="Usage: get-wraster-flags #lp#--cflags#rp# #lp#--ldflags#rp# #lp#--libs#rp#"
@@ -879,12 +876,9 @@ EOF
cat <<EOF >get-wings-flags cat <<EOF >get-wings-flags
#!/bin/sh #!/bin/sh
prefix="$prefix" WCFLAGS="$inc_search_path"
exec_prefix=\$prefix WLFLAGS="$lib_search_path"
WLIBS="-lWINGs -lwraster $GFXLIBS $XLIBS -lm $NETLIBS $INTLIBS"
WCFLAGS="-I\$prefix/include $inc_search_path"
WLFLAGS="-L\$exec_prefix/lib $lib_search_path"
WLIBS="-lWINGs -lwraster $GFXLIBS $XLIBS -lm $NETLIBS"
usage="Usage: get-wings-flags #lp#--cflags#rp# #lp#--ldflags#rp# #lp#--libs#rp#" usage="Usage: get-wings-flags #lp#--cflags#rp# #lp#--ldflags#rp# #lp#--libs#rp#"
@@ -918,12 +912,9 @@ EOF
cat <<EOF >get-wutil-flags cat <<EOF >get-wutil-flags
#!/bin/sh #!/bin/sh
prefix="$prefix" WCFLAGS="-I`eval echo ${includedir}`"
exec_prefix=\$prefix WLFLAGS="-L${_libdir}"
WLIBS="-lWUtil $NETLIBS $INTLIBS"
WCFLAGS="-I\$prefix/include $inc_search_path"
WLFLAGS="-L\$exec_prefix/lib $lib_search_path"
WLIBS="-lWUtil $NETLIBS"
usage="Usage: get-wutil-flags #lp#--cflags#rp# #lp#--ldflags#rp# #lp#--libs#rp#" usage="Usage: get-wutil-flags #lp#--cflags#rp# #lp#--ldflags#rp# #lp#--libs#rp#"

25
configure.in
View File

@@ -840,11 +840,8 @@ dnl parsed by m4
cat <<EOF >get-wraster-flags cat <<EOF >get-wraster-flags
#!/bin/sh #!/bin/sh
prefix="$prefix" WCFLAGS="$inc_search_path"
exec_prefix=\$prefix WLFLAGS="$lib_search_path"
WCFLAGS="-I\$prefix/include $inc_search_path"
WLFLAGS="-L\$exec_prefix/lib $lib_search_path"
WLIBS="-lwraster $GFXLIBS $XLIBS -lm" WLIBS="-lwraster $GFXLIBS $XLIBS -lm"
usage="Usage: get-wraster-flags #lp#--cflags#rp# #lp#--ldflags#rp# #lp#--libs#rp#" usage="Usage: get-wraster-flags #lp#--cflags#rp# #lp#--ldflags#rp# #lp#--libs#rp#"
@@ -879,12 +876,9 @@ EOF
cat <<EOF >get-wings-flags cat <<EOF >get-wings-flags
#!/bin/sh #!/bin/sh
prefix="$prefix" WCFLAGS="$inc_search_path"
exec_prefix=\$prefix WLFLAGS="$lib_search_path"
WLIBS="-lWINGs -lwraster $GFXLIBS $XLIBS -lm $NETLIBS $INTLIBS"
WCFLAGS="-I\$prefix/include $inc_search_path"
WLFLAGS="-L\$exec_prefix/lib $lib_search_path"
WLIBS="-lWINGs -lwraster $GFXLIBS $XLIBS -lm $NETLIBS"
usage="Usage: get-wings-flags #lp#--cflags#rp# #lp#--ldflags#rp# #lp#--libs#rp#" usage="Usage: get-wings-flags #lp#--cflags#rp# #lp#--ldflags#rp# #lp#--libs#rp#"
@@ -918,12 +912,9 @@ EOF
cat <<EOF >get-wutil-flags cat <<EOF >get-wutil-flags
#!/bin/sh #!/bin/sh
prefix="$prefix" WCFLAGS="-I`eval echo ${includedir}`"
exec_prefix=\$prefix WLFLAGS="-L${_libdir}"
WLIBS="-lWUtil $NETLIBS $INTLIBS"
WCFLAGS="-I\$prefix/include $inc_search_path"
WLFLAGS="-L\$exec_prefix/lib $lib_search_path"
WLIBS="-lWUtil $NETLIBS"
usage="Usage: get-wutil-flags #lp#--cflags#rp# #lp#--ldflags#rp# #lp#--libs#rp#" usage="Usage: get-wutil-flags #lp#--cflags#rp# #lp#--ldflags#rp# #lp#--libs#rp#"

3
src/dialog.c
View File

@@ -1085,8 +1085,9 @@ handleLogoPush(XEvent *event, void *data)
"Mooo Canada!!!!", "Mooo Canada!!!!",
"Hi! My name is bobby...", "Hi! My name is bobby...",
"AHH! The neurotic monkeys are after me!", "AHH! The neurotic monkeys are after me!",
"WHAT YOU SAY??",
"WE GET SIGNAL", "WE GET SIGNAL",
"HOW ARE YOU GENTLEMEN?",
"WHAT YOU SAY??",
"SOMEBODY SET UP US THE BOMB", "SOMEBODY SET UP US THE BOMB",
"ALL YOUR BASE ARE BELONG TO US!", "ALL YOUR BASE ARE BELONG TO US!",
"Oh My God!!! Larry is back!" "Oh My God!!! Larry is back!"

8
util/Makefile.am
View File

@@ -18,7 +18,7 @@ INCLUDES = $(DFLAGS) -I$(top_srcdir)/WINGs -I$(top_srcdir)/wrlib \
# X_EXTRA_LIBS is for libproplist in systems that need -lsocket # X_EXTRA_LIBS is for libproplist in systems that need -lsocket
# remove after we require lPL 0.10.2 which automatically resolves its # remove after we require lPL 0.10.2 which automatically resolves its
# library dependancies using the libPropList.la file # library dependancies using the libPropList.la file
liblist= @LIBRARY_SEARCH_PATH@ @X_EXTRA_LIBS@ liblist= @LIBRARY_SEARCH_PATH@ @X_EXTRA_LIBS@ @INTLIBS@
wdwrite_LDADD = $(top_builddir)/WINGs/libWUtil.a $(liblist) wdwrite_LDADD = $(top_builddir)/WINGs/libWUtil.a $(liblist)
@@ -41,17 +41,17 @@ geticonset_LDADD= $(top_builddir)/WINGs/libWUtil.a $(liblist)
wmagnify_LDADD = \ wmagnify_LDADD = \
$(top_builddir)/WINGs/libWINGs.a \ $(top_builddir)/WINGs/libWINGs.a \
$(top_builddir)/wrlib/libwraster.la \ $(top_builddir)/wrlib/libwraster.la \
@DLLIBS@ @INTLIBS@ @DLLIBS@
wmsetup_LDADD = \ wmsetup_LDADD = \
$(top_builddir)/WINGs/libWINGs.a \ $(top_builddir)/WINGs/libWINGs.a \
$(top_builddir)/wrlib/libwraster.la \ $(top_builddir)/wrlib/libwraster.la \
@DLLIBS@ @INTLIBS@ @DLLIBS@
wmsetbg_LDADD = \ wmsetbg_LDADD = \
$(top_builddir)/WINGs/libWINGs.a \ $(top_builddir)/WINGs/libWINGs.a \
$(top_builddir)/wrlib/libwraster.la \ $(top_builddir)/wrlib/libwraster.la \
@DLLIBS@ @INTLIBS@ @DLLIBS@
CLEANFILES = wmaker.inst wmchlocale CLEANFILES = wmaker.inst wmchlocale