wgui-cvs Mailing List for wGui (Page 8)
Status: Beta
Brought to you by:
greenwire
Menu
▾
▴
wgui-cvs — Mailing list for CVS commit messages.
You can subscribe to this list here.
| 2004 |
Jan
|
Feb
|
Mar
|
Apr
(47) |
May
(7) |
Jun
(29) |
Jul
(41) |
Aug
(5) |
Sep
(4) |
Oct
|
Nov
(5) |
Dec
(15) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2005 |
Jan
(14) |
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
(16) |
Oct
(1) |
Nov
|
Dec
(5) |
| 2006 |
Jan
(5) |
Feb
(10) |
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(2) |
Nov
|
Dec
|
|
From: Rob W. <gre...@us...> - 2004-04-23 02:28:48
|
Update of /cvsroot/wgui/wgui/includes/unit_tests In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28323/includes/unit_tests Modified Files: wg_textbox_unittests.h Log Message: Unit Test fix. Index: wg_textbox_unittests.h =================================================================== RCS file: /cvsroot/wgui/wgui/includes/unit_tests/wg_textbox_unittests.h,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** wg_textbox_unittests.h 13 Apr 2004 19:15:22 -0000 1.3 --- wg_textbox_unittests.h 23 Apr 2004 02:28:39 -0000 1.4 *************** *** 49,54 **** wGui::CMessageServer& Server = wGui::CMessageServer::Instance(); Server.IgnoreAllNewMessages(false); ! ! wGui::CTextBox* pTextBox1 = new wGui::CTextBox(wGui::CRect(1, 1, 5, 5), &Client1); ensure("CTextBox - IsReadOnly", !pTextBox1->IsReadOnly()); ensure("CTextBox - GetSelText", pTextBox1->GetSelText().empty()); --- 49,54 ---- wGui::CMessageServer& Server = wGui::CMessageServer::Instance(); Server.IgnoreAllNewMessages(false); ! ! wGui::CTextBox* pTextBox1 = new wGui::CTextBox(wGui::CRect(1, 1, 50, 20), &Client1); ensure("CTextBox - IsReadOnly", !pTextBox1->IsReadOnly()); ensure("CTextBox - GetSelText", pTextBox1->GetSelText().empty()); |
|
From: Rob W. <gre...@us...> - 2004-04-23 02:28:48
|
Update of /cvsroot/wgui/wgui/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28323/src Modified Files: wg_textbox.cpp Log Message: Unit Test fix. Index: wg_textbox.cpp =================================================================== RCS file: /cvsroot/wgui/wgui/src/wg_textbox.cpp,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** wg_textbox.cpp 14 Apr 2004 16:21:21 -0000 1.15 --- wg_textbox.cpp 23 Apr 2004 02:28:39 -0000 1.16 *************** *** 63,68 **** m_pDblClickTimer = new CTimer(); ! m_pCursorTimer = new CTimer(this); ! CRect ScrollbarRect(m_WindowRect); ScrollbarRect.Grow(-1); --- 63,67 ---- m_pDblClickTimer = new CTimer(); ! m_pCursorTimer = new CTimer(this); CRect ScrollbarRect(m_WindowRect); ScrollbarRect.Grow(-1); *************** *** 74,78 **** m_ScrollBarVisibilityMap[CScrollBar::HORIZONTAL] = SCROLLBAR_VIS_AUTO; PrepareWindowText(""); ! CMessageServer::Instance().RegisterMessageClient(this, CMessage::KEYBOARD_KEYDOWN); CMessageServer::Instance().RegisterMessageClient(this, CMessage::MOUSE_BUTTONUP); --- 73,77 ---- m_ScrollBarVisibilityMap[CScrollBar::HORIZONTAL] = SCROLLBAR_VIS_AUTO; PrepareWindowText(""); ! CMessageServer::Instance().RegisterMessageClient(this, CMessage::KEYBOARD_KEYDOWN); CMessageServer::Instance().RegisterMessageClient(this, CMessage::MOUSE_BUTTONUP); |
|
From: Rob W. <gre...@us...> - 2004-04-23 02:28:47
|
Update of /cvsroot/wgui/wgui/includes In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28323/includes Modified Files: wgui_config.h.in Log Message: Unit Test fix. Index: wgui_config.h.in =================================================================== RCS file: /cvsroot/wgui/wgui/includes/wgui_config.h.in,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** wgui_config.h.in 26 Mar 2004 08:21:55 -0000 1.10 --- wgui_config.h.in 23 Apr 2004 02:28:39 -0000 1.11 *************** *** 1,3 **** --- 1,16 ---- /* includes/wgui_config.h.in. Generated from configure.in by autoheader. */ + #undef ENABLE_NLS + #undef HAVE_CATGETS + #undef HAVE_GETTEXT + #undef HAVE_LC_MESSAGES + #undef HAVE_STPCPY + #undef HAVE_LIBSM + #undef PACKAGE_LOCALE_DIR + #undef PACKAGE_DOC_DIR + #undef PACKAGE_DATA_DIR + #undef PACKAGE_PIXMAPS_DIR + #undef PACKAGE_HELP_DIR + #undef PACKAGE_MENU_DIR + #undef PACKAGE_SOURCE_DIR /* Define to 1 if you have the <inttypes.h> header file. */ |
|
From: Rob W. <gre...@us...> - 2004-04-23 02:28:47
|
Update of /cvsroot/wgui/wgui In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28323 Modified Files: Makefile.in Log Message: Unit Test fix. Index: Makefile.in =================================================================== RCS file: /cvsroot/wgui/wgui/Makefile.in,v retrieving revision 1.22 retrieving revision 1.23 diff -C2 -d -r1.22 -r1.23 *** Makefile.in 22 Apr 2004 16:39:44 -0000 1.22 --- Makefile.in 23 Apr 2004 02:28:39 -0000 1.23 *************** *** 129,135 **** uninstall-recursive check-recursive installcheck-recursive DIST_COMMON = README AUTHORS COPYING ChangeLog INSTALL Makefile.am \ ! Makefile.in NEWS TODO acinclude.m4 aclocal.m4 config.guess \ ! config.sub configure configure.in depcomp install-sh missing \ ! mkinstalldirs DIST_SUBDIRS = $(SUBDIRS) all: all-recursive --- 129,135 ---- uninstall-recursive check-recursive installcheck-recursive DIST_COMMON = README AUTHORS COPYING ChangeLog INSTALL Makefile.am \ ! Makefile.in NEWS TODO acconfig.h acinclude.m4 aclocal.m4 \ ! config.guess config.sub configure configure.in depcomp \ ! install-sh missing mkinstalldirs DIST_SUBDIRS = $(SUBDIRS) all: all-recursive |
|
From: Rob W. <gre...@us...> - 2004-04-22 18:20:29
|
Update of /cvsroot/wgui/wgui In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21135 Modified Files: wGui-VS7.sln Log Message: Build fix. Index: wGui-VS7.sln =================================================================== RCS file: /cvsroot/wgui/wgui/wGui-VS7.sln,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** wGui-VS7.sln 23 Feb 2004 16:27:29 -0000 1.4 --- wGui-VS7.sln 22 Apr 2004 18:20:20 -0000 1.5 *************** *** 14,17 **** --- 14,19 ---- Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ConfigEditor", "tests\ConfigEditor-VS7.vcproj", "{AF91A475-64FA-4E76-8FAF-AB0F740C7352}" EndProject + Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Notepad", "tests\Notepad-VS7.vcproj", "{E6670BD6-A382-4D8E-AA95-2C9C45D6D4E2}" + EndProject Global GlobalSection(SolutionConfiguration) = preSolution *************** *** 31,34 **** --- 33,38 ---- {AF91A475-64FA-4E76-8FAF-AB0F740C7352}.0 = {494440B0-0279-402C-863D-DB79507585A3} {AF91A475-64FA-4E76-8FAF-AB0F740C7352}.1 = {8DCE4CA7-207C-461D-91F2-D9E0A8BD3E9C} + {E6670BD6-A382-4D8E-AA95-2C9C45D6D4E2}.0 = {8DCE4CA7-207C-461D-91F2-D9E0A8BD3E9C} + {E6670BD6-A382-4D8E-AA95-2C9C45D6D4E2}.1 = {494440B0-0279-402C-863D-DB79507585A3} EndGlobalSection GlobalSection(ProjectConfiguration) = postSolution *************** *** 61,64 **** --- 65,72 ---- {AF91A475-64FA-4E76-8FAF-AB0F740C7352}.Release.ActiveCfg = Release|Win32 {AF91A475-64FA-4E76-8FAF-AB0F740C7352}.Release.Build.0 = Release|Win32 + {E6670BD6-A382-4D8E-AA95-2C9C45D6D4E2}.Debug.ActiveCfg = Debug|Win32 + {E6670BD6-A382-4D8E-AA95-2C9C45D6D4E2}.Debug.Build.0 = Debug|Win32 + {E6670BD6-A382-4D8E-AA95-2C9C45D6D4E2}.Release.ActiveCfg = Release|Win32 + {E6670BD6-A382-4D8E-AA95-2C9C45D6D4E2}.Release.Build.0 = Release|Win32 EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution |
|
From: Rob W. <gre...@us...> - 2004-04-22 16:40:26
|
Update of /cvsroot/wgui/wgui/docs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30103/docs Modified Files: Makefile.am Makefile.in Log Message: Makefile fixes. Index: Makefile.in =================================================================== RCS file: /cvsroot/wgui/wgui/docs/Makefile.in,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** Makefile.in 20 Apr 2004 18:55:05 -0000 1.8 --- Makefile.in 22 Apr 2004 16:39:45 -0000 1.9 *************** *** 78,82 **** STRIP = @STRIP@ VERSION = @VERSION@ ! WGUI_CFLAGS = @WGUI_CFLAGS@ WGUI_INCLUDES = @WGUI_INCLUDES@ WGUI_LIBS = @WGUI_LIBS@ --- 78,82 ---- STRIP = @STRIP@ VERSION = @VERSION@ ! WGUI_CXXFLAGS = @WGUI_CXXFLAGS@ WGUI_INCLUDES = @WGUI_INCLUDES@ WGUI_LIBS = @WGUI_LIBS@ *************** *** 90,95 **** install_sh = @install_sh@ ! libwguidocsdir = ${prefix}/wGui/docs ! libwguidocs_DATA = \ Application.html \ BullseyeTutorial.html \ --- 90,95 ---- install_sh = @install_sh@ ! libwguidocsdir = ${prefix}/docs ! nobase_libwguidocs_DATA = \ Application.html \ BullseyeTutorial.html \ *************** *** 102,112 **** Messaging.html \ Overview.html \ ! Resources.html \ ! tutorial/Bullseye/* \ ! tutorial/Calc/* \ ! html/* ! EXTRA_DIST = $(libwguidocs_DATA) subdir = docs mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs --- 102,112 ---- Messaging.html \ Overview.html \ ! Resources.html ! # tutorial/Bullseye/* \ ! # tutorial/Calc/* \ ! # html/* ! EXTRA_DIST = $(nobase_libwguidocs_DATA) subdir = docs mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs *************** *** 114,118 **** CONFIG_CLEAN_FILES = DIST_SOURCES = ! DATA = $(libwguidocs_DATA) DIST_COMMON = Makefile.am Makefile.in --- 114,118 ---- CONFIG_CLEAN_FILES = DIST_SOURCES = ! DATA = $(nobase_libwguidocs_DATA) DIST_COMMON = Makefile.am Makefile.in *************** *** 126,144 **** cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) uninstall-info-am: ! libwguidocsDATA_INSTALL = $(INSTALL_DATA) ! install-libwguidocsDATA: $(libwguidocs_DATA) @$(NORMAL_INSTALL) $(mkinstalldirs) $(DESTDIR)$(libwguidocsdir) ! @list='$(libwguidocs_DATA)'; for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ ! f="`echo $$p | sed -e 's|^.*/||'`"; \ ! echo " $(libwguidocsDATA_INSTALL) $$d$$p $(DESTDIR)$(libwguidocsdir)/$$f"; \ ! $(libwguidocsDATA_INSTALL) $$d$$p $(DESTDIR)$(libwguidocsdir)/$$f; \ done ! uninstall-libwguidocsDATA: @$(NORMAL_UNINSTALL) ! @list='$(libwguidocs_DATA)'; for p in $$list; do \ ! f="`echo $$p | sed -e 's|^.*/||'`"; \ echo " rm -f $(DESTDIR)$(libwguidocsdir)/$$f"; \ rm -f $(DESTDIR)$(libwguidocsdir)/$$f; \ --- 126,144 ---- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) uninstall-info-am: ! nobase_libwguidocsDATA_INSTALL = $(install_sh_DATA) ! install-nobase_libwguidocsDATA: $(nobase_libwguidocs_DATA) @$(NORMAL_INSTALL) $(mkinstalldirs) $(DESTDIR)$(libwguidocsdir) ! @list='$(nobase_libwguidocs_DATA)'; for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ ! f="$$p"; \ ! echo " $(nobase_libwguidocsDATA_INSTALL) $$d$$p $(DESTDIR)$(libwguidocsdir)/$$f"; \ ! $(nobase_libwguidocsDATA_INSTALL) $$d$$p $(DESTDIR)$(libwguidocsdir)/$$f; \ done ! uninstall-nobase_libwguidocsDATA: @$(NORMAL_UNINSTALL) ! @list='$(nobase_libwguidocs_DATA)'; for p in $$list; do \ ! f="$$p"; \ echo " rm -f $(DESTDIR)$(libwguidocsdir)/$$f"; \ rm -f $(DESTDIR)$(libwguidocsdir)/$$f; \ *************** *** 153,157 **** distdir: $(DISTFILES) - $(mkinstalldirs) $(distdir)/html $(distdir)/tutorial/Bullseye $(distdir)/tutorial/Calc @list='$(DISTFILES)'; for file in $$list; do \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ --- 153,156 ---- *************** *** 224,228 **** info-am: ! install-data-am: install-libwguidocsDATA install-exec-am: --- 223,227 ---- info-am: ! install-data-am: install-nobase_libwguidocsDATA install-exec-am: *************** *** 242,260 **** mostlyclean-am: mostlyclean-generic ! uninstall-am: uninstall-info-am uninstall-libwguidocsDATA .PHONY: all all-am check check-am clean clean-generic distclean \ distclean-generic distdir dvi dvi-am info info-am install \ install-am install-data install-data-am install-exec \ ! install-exec-am install-info install-info-am \ ! install-libwguidocsDATA install-man install-strip installcheck \ installcheck-am installdirs maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-generic \ uninstall uninstall-am uninstall-info-am \ ! uninstall-libwguidocsDATA dist-hook: ! rm -rf `find $(distdir)/tutorial -name CVS` rm -f $(distdir)/tutorial/Calc/*~ rm -f $(distdir)/tutorial/Calc/*.o --- 241,260 ---- mostlyclean-am: mostlyclean-generic ! uninstall-am: uninstall-info-am uninstall-nobase_libwguidocsDATA .PHONY: all all-am check check-am clean clean-generic distclean \ distclean-generic distdir dvi dvi-am info info-am install \ install-am install-data install-data-am install-exec \ ! install-exec-am install-info install-info-am install-man \ ! install-nobase_libwguidocsDATA install-strip installcheck \ installcheck-am installdirs maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-generic \ uninstall uninstall-am uninstall-info-am \ ! uninstall-nobase_libwguidocsDATA dist-hook: ! cp -r html $(distdir) ! cp -r tutorial $(distdir) rm -f $(distdir)/tutorial/Calc/*~ rm -f $(distdir)/tutorial/Calc/*.o Index: Makefile.am =================================================================== RCS file: /cvsroot/wgui/wgui/docs/Makefile.am,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** Makefile.am 7 Apr 2004 15:14:38 -0000 1.4 --- Makefile.am 22 Apr 2004 16:39:45 -0000 1.5 *************** *** 1,6 **** ## Process this file with automake to produce Makefile.in ! libwguidocsdir = ${prefix}/wGui/docs ! libwguidocs_DATA = \ Application.html \ BullseyeTutorial.html \ --- 1,6 ---- ## Process this file with automake to produce Makefile.in ! libwguidocsdir = ${prefix}/docs ! nobase_libwguidocs_DATA = \ Application.html \ BullseyeTutorial.html \ *************** *** 13,25 **** Messaging.html \ Overview.html \ ! Resources.html \ ! tutorial/Bullseye/* \ ! tutorial/Calc/* \ ! html/* ! EXTRA_DIST = $(libwguidocs_DATA) dist-hook: ! rm -rf `find $(distdir)/tutorial -name CVS` rm -f $(distdir)/tutorial/Calc/*~ rm -f $(distdir)/tutorial/Calc/*.o --- 13,26 ---- Messaging.html \ Overview.html \ ! Resources.html ! # tutorial/Bullseye/* \ ! # tutorial/Calc/* \ ! # html/* ! EXTRA_DIST = $(nobase_libwguidocs_DATA) dist-hook: ! cp -r html $(distdir) ! cp -r tutorial $(distdir) rm -f $(distdir)/tutorial/Calc/*~ rm -f $(distdir)/tutorial/Calc/*.o |
|
From: Rob W. <gre...@us...> - 2004-04-22 16:40:25
|
Update of /cvsroot/wgui/wgui/fonts In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30103/fonts Modified Files: Makefile.am Makefile.in Log Message: Makefile fixes. Index: Makefile.in =================================================================== RCS file: /cvsroot/wgui/wgui/fonts/Makefile.in,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** Makefile.in 20 Apr 2004 18:55:20 -0000 1.5 --- Makefile.in 22 Apr 2004 16:39:45 -0000 1.6 *************** *** 78,82 **** STRIP = @STRIP@ VERSION = @VERSION@ ! WGUI_CFLAGS = @WGUI_CFLAGS@ WGUI_INCLUDES = @WGUI_INCLUDES@ WGUI_LIBS = @WGUI_LIBS@ --- 78,82 ---- STRIP = @STRIP@ VERSION = @VERSION@ ! WGUI_CXXFLAGS = @WGUI_CXXFLAGS@ WGUI_INCLUDES = @WGUI_INCLUDES@ WGUI_LIBS = @WGUI_LIBS@ *************** *** 90,94 **** install_sh = @install_sh@ ! libwguifontsdir = ${prefix}/wGui/fonts nobase_libwguifonts_DATA = \ Vera.ttf \ --- 90,94 ---- install_sh = @install_sh@ ! libwguifontsdir = ${prefix}/fonts nobase_libwguifonts_DATA = \ Vera.ttf \ *************** *** 175,181 **** fi; \ done - $(MAKE) $(AM_MAKEFLAGS) \ - top_distdir="${top_distdir}" distdir="$(distdir)" \ - dist-hook check-am: all-am check: check-am --- 175,178 ---- *************** *** 256,261 **** ! dist-hook: ! rm -rf `find $(distdir)/ttf-bitstream-vera-1.10 -name CVS` # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. --- 253,258 ---- ! #dist-hook: ! # rm -rf `find $(distdir)/ttf-bitstream-vera-1.10 -name CVS` # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. Index: Makefile.am =================================================================== RCS file: /cvsroot/wgui/wgui/fonts/Makefile.am,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** Makefile.am 22 Oct 2003 21:18:11 -0000 1.3 --- Makefile.am 22 Apr 2004 16:39:45 -0000 1.4 *************** *** 1,5 **** ## Process this file with automake to produce Makefile.in ! libwguifontsdir = ${prefix}/wGui/fonts nobase_libwguifonts_DATA = \ Vera.ttf \ --- 1,5 ---- ## Process this file with automake to produce Makefile.in ! libwguifontsdir = ${prefix}/fonts nobase_libwguifonts_DATA = \ Vera.ttf \ *************** *** 21,25 **** EXTRA_DIST = $(nobase_libwguifonts_DATA) ! dist-hook: ! rm -rf `find $(distdir)/ttf-bitstream-vera-1.10 -name CVS` --- 21,25 ---- EXTRA_DIST = $(nobase_libwguifonts_DATA) ! #dist-hook: ! # rm -rf `find $(distdir)/ttf-bitstream-vera-1.10 -name CVS` |
|
From: Rob W. <gre...@us...> - 2004-04-22 16:40:24
|
Update of /cvsroot/wgui/wgui In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30103 Modified Files: Makefile.am Makefile.in configure configure.in Log Message: Makefile fixes. Index: Makefile.in =================================================================== RCS file: /cvsroot/wgui/wgui/Makefile.in,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -d -r1.21 -r1.22 *** Makefile.in 20 Apr 2004 19:49:15 -0000 1.21 --- Makefile.in 22 Apr 2004 16:39:44 -0000 1.22 *************** *** 78,82 **** STRIP = @STRIP@ VERSION = @VERSION@ ! WGUI_CFLAGS = @WGUI_CFLAGS@ WGUI_INCLUDES = @WGUI_INCLUDES@ WGUI_LIBS = @WGUI_LIBS@ --- 78,82 ---- STRIP = @STRIP@ VERSION = @VERSION@ ! WGUI_CXXFLAGS = @WGUI_CXXFLAGS@ WGUI_INCLUDES = @WGUI_INCLUDES@ WGUI_LIBS = @WGUI_LIBS@ *************** *** 103,108 **** NEWS\ LICENSE\ ! BUGS\ ! wgui.conf --- 103,107 ---- NEWS\ LICENSE\ ! BUGS *************** *** 317,320 **** --- 316,322 ---- fi; \ done + $(MAKE) $(AM_MAKEFLAGS) \ + top_distdir="${top_distdir}" distdir="$(distdir)" \ + dist-hook -find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \ ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \ *************** *** 468,471 **** --- 470,476 ---- uninstall-recursive + + dist-hook: + rm -rf `find $(distdir) -name CVS` # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. Index: Makefile.am =================================================================== RCS file: /cvsroot/wgui/wgui/Makefile.am,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** Makefile.am 11 Mar 2004 19:28:06 -0000 1.8 --- Makefile.am 22 Apr 2004 16:39:44 -0000 1.9 *************** *** 14,19 **** NEWS\ LICENSE\ ! BUGS\ ! wgui.conf EXTRA_DIST = $(libwguidoc_DATA) \ --- 14,18 ---- NEWS\ LICENSE\ ! BUGS EXTRA_DIST = $(libwguidoc_DATA) \ *************** *** 26,28 **** wgui.conf ! --- 25,28 ---- wgui.conf ! dist-hook: ! rm -rf `find $(distdir) -name CVS` Index: configure =================================================================== RCS file: /cvsroot/wgui/wgui/configure,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** configure 20 Apr 2004 18:38:08 -0000 1.17 --- configure 22 Apr 2004 16:39:44 -0000 1.18 *************** *** 309,313 **** #endif" ! ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS WGUI_VERSION_MAJOR WGUI_VERSION_MINOR WGUI_VERSION_REVISION WGUI_VERSION VERSION PACKAGE INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM AWK SET_MAKE CXX CXXFLAGS LDFLAGS CPPFLAGS ac_ct_CXX EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CXXDEPMODE CC CFLAGS ac_ct_CC CCDEPMODE RANLIB ac_ct_RANLIB LN_S build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os SDL_CONFIG SDL_CFLAGS SDL_LIBS freetype_config CPP EGREP WGUI_CFLAGS WGUI_LIBS WGUI_INCLUDES LIBOBJS LTLIBOBJS' ac_subst_files='' --- 309,313 ---- #endif" ! ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS WGUI_VERSION_MAJOR WGUI_VERSION_MINOR WGUI_VERSION_REVISION WGUI_VERSION VERSION PACKAGE INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM AWK SET_MAKE CXX CXXFLAGS LDFLAGS CPPFLAGS ac_ct_CXX EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CXXDEPMODE CC CFLAGS ac_ct_CC CCDEPMODE RANLIB ac_ct_RANLIB LN_S build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os SDL_CONFIG SDL_CFLAGS SDL_LIBS freetype_config CPP EGREP WGUI_CXXFLAGS WGUI_LIBS WGUI_INCLUDES LIBOBJS LTLIBOBJS' ac_subst_files='' *************** *** 4431,4438 **** ! WGUI_CFLAGS="$CFLAGS $FREETYPE_CFLAGS $SDL_CFLAGS" WGUI_LIBS="$LIBS $FREETYPE_LIBS $SDL_LIBS -L../src -lwguid" WGUI_INCLUDES="$FREETYPE_INCLUDES $SDL_INCLUDES" --- 4431,4440 ---- ! WGUI_CXXFLAGS="$CXXFLAGS $FREETYPE_CFLAGS $SDL_CFLAGS" ! #WGUI_CFLAGS="$CFLAGS $FREETYPE_CFLAGS $SDL_CFLAGS" WGUI_LIBS="$LIBS $FREETYPE_LIBS $SDL_LIBS -L../src -lwguid" WGUI_INCLUDES="$FREETYPE_INCLUDES $SDL_INCLUDES" + #AC_SUBST(WGUI_CFLAGS) *************** *** 5141,5145 **** s,@CPP@,$CPP,;t t s,@EGREP@,$EGREP,;t t ! s,@WGUI_CFLAGS@,$WGUI_CFLAGS,;t t s,@WGUI_LIBS@,$WGUI_LIBS,;t t s,@WGUI_INCLUDES@,$WGUI_INCLUDES,;t t --- 5143,5147 ---- s,@CPP@,$CPP,;t t s,@EGREP@,$EGREP,;t t ! s,@WGUI_CXXFLAGS@,$WGUI_CXXFLAGS,;t t s,@WGUI_LIBS@,$WGUI_LIBS,;t t s,@WGUI_INCLUDES@,$WGUI_INCLUDES,;t t Index: configure.in =================================================================== RCS file: /cvsroot/wgui/wgui/configure.in,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** configure.in 23 Mar 2004 15:14:22 -0000 1.13 --- configure.in 22 Apr 2004 16:39:44 -0000 1.14 *************** *** 95,102 **** dnl The composite lib and cflags ! WGUI_CFLAGS="$CFLAGS $FREETYPE_CFLAGS $SDL_CFLAGS" WGUI_LIBS="$LIBS $FREETYPE_LIBS $SDL_LIBS -L../src -lwguid" WGUI_INCLUDES="$FREETYPE_INCLUDES $SDL_INCLUDES" ! AC_SUBST(WGUI_CFLAGS) AC_SUBST(WGUI_LIBS) AC_SUBST(WGUI_INCLUDES) --- 95,104 ---- dnl The composite lib and cflags ! WGUI_CXXFLAGS="$CXXFLAGS $FREETYPE_CFLAGS $SDL_CFLAGS" ! #WGUI_CFLAGS="$CFLAGS $FREETYPE_CFLAGS $SDL_CFLAGS" WGUI_LIBS="$LIBS $FREETYPE_LIBS $SDL_LIBS -L../src -lwguid" WGUI_INCLUDES="$FREETYPE_INCLUDES $SDL_INCLUDES" ! AC_SUBST(WGUI_CXXFLAGS) ! #AC_SUBST(WGUI_CFLAGS) AC_SUBST(WGUI_LIBS) AC_SUBST(WGUI_INCLUDES) |
|
From: Rob W. <gre...@us...> - 2004-04-22 16:40:03
|
Update of /cvsroot/wgui/wgui/tests In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30103/tests Modified Files: Makefile.am Makefile.in Log Message: Makefile fixes. Index: Makefile.in =================================================================== RCS file: /cvsroot/wgui/wgui/tests/Makefile.in,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** Makefile.in 20 Apr 2004 18:55:25 -0000 1.16 --- Makefile.in 22 Apr 2004 16:39:54 -0000 1.17 *************** *** 78,82 **** STRIP = @STRIP@ VERSION = @VERSION@ ! WGUI_CFLAGS = @WGUI_CFLAGS@ WGUI_INCLUDES = @WGUI_INCLUDES@ WGUI_LIBS = @WGUI_LIBS@ --- 78,82 ---- STRIP = @STRIP@ VERSION = @VERSION@ ! WGUI_CXXFLAGS = @WGUI_CXXFLAGS@ WGUI_INCLUDES = @WGUI_INCLUDES@ WGUI_LIBS = @WGUI_LIBS@ *************** *** 90,94 **** install_sh = @install_sh@ INCLUDES = @WGUI_INCLUDES@ ! AM_CXXFLAGS = @WGUI_CFLAGS@ noinst_PROGRAMS = Calc TestApp1 TestApp2 ConfigEditor Notepad MessagingTest UnitTests --- 90,94 ---- install_sh = @install_sh@ INCLUDES = @WGUI_INCLUDES@ ! AM_CXXFLAGS = @WGUI_CXXFLAGS@ noinst_PROGRAMS = Calc TestApp1 TestApp2 ConfigEditor Notepad MessagingTest UnitTests Index: Makefile.am =================================================================== RCS file: /cvsroot/wgui/wgui/tests/Makefile.am,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** Makefile.am 19 Apr 2004 17:41:13 -0000 1.16 --- Makefile.am 22 Apr 2004 16:39:54 -0000 1.17 *************** *** 1,4 **** INCLUDES = @WGUI_INCLUDES@ ! AM_CXXFLAGS = @WGUI_CFLAGS@ noinst_PROGRAMS = Calc TestApp1 TestApp2 ConfigEditor Notepad MessagingTest UnitTests --- 1,4 ---- INCLUDES = @WGUI_INCLUDES@ ! AM_CXXFLAGS = @WGUI_CXXFLAGS@ noinst_PROGRAMS = Calc TestApp1 TestApp2 ConfigEditor Notepad MessagingTest UnitTests |
|
From: Rob W. <gre...@us...> - 2004-04-22 16:40:03
|
Update of /cvsroot/wgui/wgui/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30103/src Modified Files: Makefile.am Makefile.in Log Message: Makefile fixes. Index: Makefile.in =================================================================== RCS file: /cvsroot/wgui/wgui/src/Makefile.in,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** Makefile.in 20 Apr 2004 18:55:23 -0000 1.10 --- Makefile.in 22 Apr 2004 16:39:53 -0000 1.11 *************** *** 78,82 **** STRIP = @STRIP@ VERSION = @VERSION@ ! WGUI_CFLAGS = @WGUI_CFLAGS@ WGUI_INCLUDES = @WGUI_INCLUDES@ WGUI_LIBS = @WGUI_LIBS@ --- 78,82 ---- STRIP = @STRIP@ VERSION = @VERSION@ ! WGUI_CXXFLAGS = @WGUI_CXXFLAGS@ WGUI_INCLUDES = @WGUI_INCLUDES@ WGUI_LIBS = @WGUI_LIBS@ *************** *** 92,96 **** INCLUDES = @WGUI_INCLUDES@ ! AM_CXXFLAGS = -Wall -Wpointer-arith -Wunreachable-code -O0 -g -DDEBUG @WGUI_CFLAGS@ lib_LIBRARIES = libwguid.a --- 92,96 ---- INCLUDES = @WGUI_INCLUDES@ ! AM_CXXFLAGS = -Wall -Wpointer-arith -Wunreachable-code -O0 -g -DDEBUG @WGUI_CXXFLAGS@ lib_LIBRARIES = libwguid.a Index: Makefile.am =================================================================== RCS file: /cvsroot/wgui/wgui/src/Makefile.am,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** Makefile.am 31 Mar 2004 15:31:32 -0000 1.9 --- Makefile.am 22 Apr 2004 16:39:53 -0000 1.10 *************** *** 3,8 **** INCLUDES = @WGUI_INCLUDES@ ! AM_CXXFLAGS = -Wall -Wpointer-arith -Wunreachable-code -O0 -g -DDEBUG @WGUI_CFLAGS@ ! ## AM_CXXFLAGS = -Wall -Wpointer-arith -Wunreachable-code -O2 -g @WGUI_CFLAGS@ lib_LIBRARIES = libwguid.a --- 3,8 ---- INCLUDES = @WGUI_INCLUDES@ ! AM_CXXFLAGS = -Wall -Wpointer-arith -Wunreachable-code -O0 -g -DDEBUG @WGUI_CXXFLAGS@ ! ## AM_CXXFLAGS = -Wall -Wpointer-arith -Wunreachable-code -O2 -g @WGUI_CXXFLAGS@ lib_LIBRARIES = libwguid.a |
|
From: Rob W. <gre...@us...> - 2004-04-22 16:40:02
|
Update of /cvsroot/wgui/wgui/includes/unit_tests In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30103/includes/unit_tests Modified Files: Makefile.in Log Message: Makefile fixes. Index: Makefile.in =================================================================== RCS file: /cvsroot/wgui/wgui/includes/unit_tests/Makefile.in,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** Makefile.in 20 Apr 2004 18:55:23 -0000 1.5 --- Makefile.in 22 Apr 2004 16:39:53 -0000 1.6 *************** *** 78,82 **** STRIP = @STRIP@ VERSION = @VERSION@ ! WGUI_CFLAGS = @WGUI_CFLAGS@ WGUI_INCLUDES = @WGUI_INCLUDES@ WGUI_LIBS = @WGUI_LIBS@ --- 78,82 ---- STRIP = @STRIP@ VERSION = @VERSION@ ! WGUI_CXXFLAGS = @WGUI_CXXFLAGS@ WGUI_INCLUDES = @WGUI_INCLUDES@ WGUI_LIBS = @WGUI_LIBS@ |
|
From: Rob W. <gre...@us...> - 2004-04-22 16:40:02
|
Update of /cvsroot/wgui/wgui/includes In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30103/includes Modified Files: Makefile.in Log Message: Makefile fixes. Index: Makefile.in =================================================================== RCS file: /cvsroot/wgui/wgui/includes/Makefile.in,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** Makefile.in 20 Apr 2004 19:49:16 -0000 1.19 --- Makefile.in 22 Apr 2004 16:39:45 -0000 1.20 *************** *** 78,82 **** STRIP = @STRIP@ VERSION = @VERSION@ ! WGUI_CFLAGS = @WGUI_CFLAGS@ WGUI_INCLUDES = @WGUI_INCLUDES@ WGUI_LIBS = @WGUI_LIBS@ --- 78,82 ---- STRIP = @STRIP@ VERSION = @VERSION@ ! WGUI_CXXFLAGS = @WGUI_CXXFLAGS@ WGUI_INCLUDES = @WGUI_INCLUDES@ WGUI_LIBS = @WGUI_LIBS@ |
|
From: Rob W. <gre...@us...> - 2004-04-22 07:24:59
|
Update of /cvsroot/wgui/wgui In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8345 Modified Files: wGui-VS71.sln Log Message: VS7.1 Build fixes. Index: wGui-VS71.sln =================================================================== RCS file: /cvsroot/wgui/wgui/wGui-VS71.sln,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** wGui-VS71.sln 27 Jan 2004 21:40:07 -0000 1.3 --- wGui-VS71.sln 22 Apr 2004 07:15:11 -0000 1.4 *************** *** 30,33 **** --- 30,37 ---- EndProjectSection EndProject + Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Notepad", "tests\Notepad-VS71.vcproj", "{E6670BD6-A382-4D8E-AA95-2C9C45D6D4E2}" + ProjectSection(ProjectDependencies) = postProject + EndProjectSection + EndProject Global GlobalSection(SolutionConfiguration) = preSolution *************** *** 56,63 **** {CB9F92EA-850A-4C69-A322-1F4F40F5E14F}.Release.ActiveCfg = Release|Win32 {CB9F92EA-850A-4C69-A322-1F4F40F5E14F}.Release.Build.0 = Release|Win32 - {DD0757DD-D8BD-49D1-B9E4-F523D274B0C0}.Debug.ActiveCfg = Debug|Win32 - {DD0757DD-D8BD-49D1-B9E4-F523D274B0C0}.Debug.Build.0 = Debug|Win32 - {DD0757DD-D8BD-49D1-B9E4-F523D274B0C0}.Release.ActiveCfg = Release|Win32 - {DD0757DD-D8BD-49D1-B9E4-F523D274B0C0}.Release.Build.0 = Release|Win32 {8DCE4CA7-207C-461D-91F2-D9E0A8BD3E9C}.Debug.ActiveCfg = Debug|Win32 {8DCE4CA7-207C-461D-91F2-D9E0A8BD3E9C}.Debug.Build.0 = Debug|Win32 --- 60,63 ---- *************** *** 68,71 **** --- 68,75 ---- {CB9F92EA-850A-4C69-A322-1F4F40F5E14F}.Release.ActiveCfg = Release|Win32 {CB9F92EA-850A-4C69-A322-1F4F40F5E14F}.Release.Build.0 = Release|Win32 + {E6670BD6-A382-4D8E-AA95-2C9C45D6D4E2}.Debug.ActiveCfg = Debug|Win32 + {E6670BD6-A382-4D8E-AA95-2C9C45D6D4E2}.Debug.Build.0 = Debug|Win32 + {E6670BD6-A382-4D8E-AA95-2C9C45D6D4E2}.Release.ActiveCfg = Release|Win32 + {E6670BD6-A382-4D8E-AA95-2C9C45D6D4E2}.Release.Build.0 = Release|Win32 EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution |
|
From: Rob W. <gre...@us...> - 2004-04-22 07:21:46
|
Update of /cvsroot/wgui/wgui/tests In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8345/tests Modified Files: Notepad-VS71.vcproj Notepad.dsp UnitTests.cpp Log Message: VS7.1 Build fixes. Index: Notepad-VS71.vcproj =================================================================== RCS file: /cvsroot/wgui/wgui/tests/Notepad-VS71.vcproj,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Notepad-VS71.vcproj 20 Apr 2004 19:05:37 -0000 1.1 --- Notepad-VS71.vcproj 22 Apr 2004 07:15:11 -0000 1.2 *************** *** 0 **** --- 1,148 ---- + <?xml version="1.0" encoding="Windows-1252"?> + <VisualStudioProject + ProjectType="Visual C++" + Version="7.10" + Name="Notepad" + ProjectGUID="{E6670BD6-A382-4D8E-AA95-2C9C45D6D4E2}" + Keyword="Win32Proj"> + <Platforms> + <Platform + Name="Win32"/> + </Platforms> + <Configurations> + <Configuration + Name="Debug|Win32" + OutputDirectory="Debug" + IntermediateDirectory="Debug" + ConfigurationType="1" + CharacterSet="2"> + <Tool + Name="VCCLCompilerTool" + Optimization="0" + AdditionalIncludeDirectories="../includes" + PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;DEBUG" + MinimalRebuild="TRUE" + BasicRuntimeChecks="3" + RuntimeLibrary="3" + ForceConformanceInForLoopScope="TRUE" + RuntimeTypeInfo="TRUE" + UsePrecompiledHeader="0" + WarningLevel="4" + WarnAsError="TRUE" + Detect64BitPortabilityProblems="TRUE" + DebugInformationFormat="4"/> + <Tool + Name="VCCustomBuildTool"/> + <Tool + Name="VCLinkerTool" + AdditionalDependencies="SDL.lib sdlmain.lib msvcrtd.lib msvcprtd.lib wGuid.lib freetype214_D.lib" + OutputFile="$(OutDir)/Notepad.exe" + LinkIncremental="2" + AdditionalLibraryDirectories="../lib" + IgnoreAllDefaultLibraries="TRUE" + GenerateDebugInformation="TRUE" + ProgramDatabaseFile="$(OutDir)/Notepad.pdb" + SubSystem="2" + TargetMachine="1"/> + <Tool + Name="VCMIDLTool"/> + <Tool + Name="VCPostBuildEventTool"/> + <Tool + Name="VCPreBuildEventTool"/> + <Tool + Name="VCPreLinkEventTool"/> + <Tool + Name="VCResourceCompilerTool"/> + <Tool + Name="VCWebServiceProxyGeneratorTool"/> + <Tool + Name="VCXMLDataGeneratorTool"/> + <Tool + Name="VCWebDeploymentTool"/> + <Tool + Name="VCManagedWrapperGeneratorTool"/> + <Tool + Name="VCAuxiliaryManagedWrapperGeneratorTool"/> + </Configuration> + <Configuration + Name="Release|Win32" + OutputDirectory="Release" + IntermediateDirectory="Release" + ConfigurationType="1" + CharacterSet="2"> + <Tool + Name="VCCLCompilerTool" + Optimization="2" + InlineFunctionExpansion="1" + OmitFramePointers="TRUE" + AdditionalIncludeDirectories="../includes" + PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS" + StringPooling="TRUE" + RuntimeLibrary="2" + EnableFunctionLevelLinking="TRUE" + ForceConformanceInForLoopScope="TRUE" + RuntimeTypeInfo="TRUE" + UsePrecompiledHeader="0" + WarningLevel="4" + WarnAsError="TRUE" + Detect64BitPortabilityProblems="TRUE" + DebugInformationFormat="3"/> + <Tool + Name="VCCustomBuildTool"/> + <Tool + Name="VCLinkerTool" + AdditionalDependencies="SDL.lib sdlmain.lib msvcrt.lib MSVCPRT.LIB wGui.lib freetype214.lib" + OutputFile="$(OutDir)/Notepad.exe" + LinkIncremental="1" + AdditionalLibraryDirectories="../lib" + IgnoreAllDefaultLibraries="TRUE" + GenerateDebugInformation="TRUE" + SubSystem="2" + OptimizeReferences="2" + EnableCOMDATFolding="2" + TargetMachine="1"/> + <Tool + Name="VCMIDLTool"/> + <Tool + Name="VCPostBuildEventTool"/> + <Tool + Name="VCPreBuildEventTool"/> + <Tool + Name="VCPreLinkEventTool"/> + <Tool + Name="VCResourceCompilerTool"/> + <Tool + Name="VCWebServiceProxyGeneratorTool"/> + <Tool + Name="VCXMLDataGeneratorTool"/> + <Tool + Name="VCWebDeploymentTool"/> + <Tool + Name="VCManagedWrapperGeneratorTool"/> + <Tool + Name="VCAuxiliaryManagedWrapperGeneratorTool"/> + </Configuration> + </Configurations> + <References> + </References> + <Files> + <Filter + Name="Source Files" + Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm"> + <File + RelativePath="Notepad.cpp"> + </File> + </Filter> + <Filter + Name="Header Files" + Filter="h;hpp;hxx;hm;inl;inc"> + </Filter> + <Filter + Name="Resource Files" + Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"> + </Filter> + </Files> + <Globals> + </Globals> + </VisualStudioProject> Index: Notepad.dsp =================================================================== RCS file: /cvsroot/wgui/wgui/tests/Notepad.dsp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Notepad.dsp 20 Apr 2004 19:05:37 -0000 1.1 --- Notepad.dsp 22 Apr 2004 07:15:11 -0000 1.2 *************** *** 0 **** --- 1,109 ---- + # Microsoft Developer Studio Project File - Name="Notepad" - Package Owner=<4> + # Microsoft Developer Studio Generated Build File, Format Version 6.00 + # ** DO NOT EDIT ** + + # TARGTYPE "Win32 (x86) Application" 0x0101 + + CFG=Notepad - Win32 Debug + !MESSAGE This is not a valid makefile. To build this project using NMAKE, + !MESSAGE use the Export Makefile command and run + !MESSAGE + !MESSAGE NMAKE /f "Notepad.mak". + !MESSAGE + !MESSAGE You can specify a configuration when running NMAKE + !MESSAGE by defining the macro CFG on the command line. For example: + !MESSAGE + !MESSAGE NMAKE /f "Notepad.mak" CFG="Notepad - Win32 Debug" + !MESSAGE + !MESSAGE Possible choices for configuration are: + !MESSAGE + !MESSAGE "Notepad - Win32 Release" (based on "Win32 (x86) Application") + !MESSAGE "Notepad - Win32 Debug" (based on "Win32 (x86) Application") + !MESSAGE + + # Begin Project + # PROP AllowPerConfigDependencies 0 + # PROP Scc_ProjName "" + # PROP Scc_LocalPath "" + CPP=cl.exe + MTL=midl.exe + RSC=rc.exe + + !IF "$(CFG)" == "Notepad - Win32 Release" + + # PROP BASE Use_MFC 0 + # PROP BASE Use_Debug_Libraries 0 + # PROP BASE Output_Dir "Release" + # PROP BASE Intermediate_Dir "Release" + # PROP BASE Target_Dir "" + # PROP Use_MFC 0 + # PROP Use_Debug_Libraries 0 + # PROP Output_Dir "Release" + # PROP Intermediate_Dir "Release" + # PROP Ignore_Export_Lib 0 + # PROP Target_Dir "" + # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /c + # ADD CPP /nologo /MD /W3 /GR /GX /O1 /I "../includes" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "MSVC6" /YX /FD /c + # SUBTRACT CPP /WX + # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 + # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 + # ADD BASE RSC /l 0x409 /d "NDEBUG" + # ADD RSC /l 0x409 /d "NDEBUG" + BSC32=bscmake.exe + # ADD BASE BSC32 /nologo + # ADD BSC32 /nologo + LINK32=link.exe + # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /machine:I386 + # ADD LINK32 SDL.lib sdlmain.lib msvcrt.lib MSVCPRT.LIB ../lib/wGui.lib freetype214.lib kernel32.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib + + !ELSEIF "$(CFG)" == "Notepad - Win32 Debug" + + # PROP BASE Use_MFC 0 + # PROP BASE Use_Debug_Libraries 1 + # PROP BASE Output_Dir "Debug" + # PROP BASE Intermediate_Dir "Debug" + # PROP BASE Target_Dir "" + # PROP Use_MFC 0 + # PROP Use_Debug_Libraries 1 + # PROP Output_Dir "Debug" + # PROP Intermediate_Dir "Debug" + # PROP Ignore_Export_Lib 0 + # PROP Target_Dir "" + # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /GZ /c + # ADD CPP /nologo /MDd /W3 /Gm /GR /GX /ZI /Od /I "../includes" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "MSVC6" /YX /FD /GZ /c + # SUBTRACT CPP /WX + # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 + # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 + # ADD BASE RSC /l 0x409 /d "_DEBUG" + # ADD RSC /l 0x409 /d "_DEBUG" + BSC32=bscmake.exe + # ADD BASE BSC32 /nologo + # ADD BSC32 /nologo + LINK32=link.exe + # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept + # ADD LINK32 SDL.lib sdlmain.lib msvcrtd.lib msvcprtd.lib ../lib/wGuid.lib freetype214_D.lib kernel32.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib /pdbtype:sept + + !ENDIF + + # Begin Target + + # Name "Notepad - Win32 Release" + # Name "Notepad - Win32 Debug" + # Begin Group "Source Files" + + # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" + # Begin Source File + + SOURCE=Notepad.cpp + # End Source File + # End Group + # Begin Group "Header Files" + + # PROP Default_Filter "h;hpp;hxx;hm;inl" + # End Group + # Begin Group "Resource Files" + + # PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" + # End Group + # End Target + # End Project Index: UnitTests.cpp =================================================================== RCS file: /cvsroot/wgui/wgui/tests/UnitTests.cpp,v retrieving revision 1.23 retrieving revision 1.24 diff -C2 -d -r1.23 -r1.24 *** UnitTests.cpp 19 Apr 2004 16:46:08 -0000 1.23 --- UnitTests.cpp 22 Apr 2004 07:15:11 -0000 1.24 *************** *** 23,26 **** --- 23,27 ---- + #include "wgui_include_config.h" #include "wgui.h" #include "unit_tests/tut.h" |
|
From: Rob W. <gre...@us...> - 2004-04-20 19:49:36
|
Update of /cvsroot/wgui/wgui In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8061 Modified Files: Makefile.in Added Files: depcomp Log Message: Build fix. Index: Makefile.in =================================================================== RCS file: /cvsroot/wgui/wgui/Makefile.in,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** Makefile.in 20 Apr 2004 18:38:08 -0000 1.20 --- Makefile.in 20 Apr 2004 19:49:15 -0000 1.21 *************** *** 130,136 **** uninstall-recursive check-recursive installcheck-recursive DIST_COMMON = README AUTHORS COPYING ChangeLog INSTALL Makefile.am \ ! Makefile.in NEWS TODO acconfig.h acinclude.m4 aclocal.m4 \ ! config.guess config.sub configure configure.in depcomp \ ! install-sh missing mkinstalldirs DIST_SUBDIRS = $(SUBDIRS) all: all-recursive --- 130,136 ---- uninstall-recursive check-recursive installcheck-recursive DIST_COMMON = README AUTHORS COPYING ChangeLog INSTALL Makefile.am \ ! Makefile.in NEWS TODO acinclude.m4 aclocal.m4 config.guess \ ! config.sub configure configure.in depcomp install-sh missing \ ! mkinstalldirs DIST_SUBDIRS = $(SUBDIRS) all: all-recursive --- NEW FILE: depcomp --- #! /bin/sh # depcomp - compile a program generating dependencies as side-effects # Copyright 1999, 2000 Free Software Foundation, Inc. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; either version 2, or (at your option) # any later version. # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA # 02111-1307, USA. # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a # configuration script generated by Autoconf, you may include it under # the same distribution terms that you use for the rest of that program. # Originally written by Alexandre Oliva <ol...@dc...>. if test -z "$depmode" || test -z "$source" || test -z "$object"; then echo "depcomp: Variables source, object and depmode must be set" 1>&2 exit 1 fi # `libtool' can also be set to `yes' or `no'. if test -z "$depfile"; then base=`echo "$object" | sed -e 's,^.*/,,' -e 's,\.\([^.]*\)$,.P\1,'` dir=`echo "$object" | sed 's,/.*$,/,'` if test "$dir" = "$object"; then dir= fi # FIXME: should be _deps on DOS. depfile="$dir.deps/$base" fi tmpdepfile=${tmpdepfile-`echo "$depfile" | sed 's/\.\([^.]*\)$/.T\1/'`} rm -f "$tmpdepfile" # Some modes work just like other modes, but use different flags. We # parameterize here, but still list the modes in the big case below, # to make depend.m4 easier to write. Note that we *cannot* use a case # here, because this file can only contain one case statement. if test "$depmode" = hp; then # HP compiler uses -M and no extra arg. gccflag=-M depmode=gcc fi if test "$depmode" = dashXmstdout; then # This is just like dashmstdout with a different argument. dashmflag=-xM depmode=dashmstdout fi case "$depmode" in gcc3) ## gcc 3 implements dependency tracking that does exactly what ## we want. Yay! Note: for some reason libtool 1.4 doesn't like ## it if -MD -MP comes after the -MF stuff. Hmm. "$@" -MT "$object" -MD -MP -MF "$tmpdepfile" stat=$? if test $stat -eq 0; then : else rm -f "$tmpdepfile" exit $stat fi mv "$tmpdepfile" "$depfile" ;; gcc) ## There are various ways to get dependency output from gcc. Here's ## why we pick this rather obscure method: ## - Don't want to use -MD because we'd like the dependencies to end ## up in a subdir. Having to rename by hand is ugly. ## (We might end up doing this anyway to support other compilers.) ## - The DEPENDENCIES_OUTPUT environment variable makes gcc act like ## -MM, not -M (despite what the docs say). ## - Using -M directly means running the compiler twice (even worse ## than renaming). if test -z "$gccflag"; then gccflag=-MD, fi "$@" -Wp,"$gccflag$tmpdepfile" stat=$? if test $stat -eq 0; then : else rm -f "$tmpdepfile" exit $stat fi rm -f "$depfile" echo "$object : \\" > "$depfile" alpha=ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz ## The second -e expression handles DOS-style file names with drive letters. sed -e 's/^[^:]*: / /' \ -e 's/^['$alpha']:\/[^:]*: / /' < "$tmpdepfile" >> "$depfile" ## This next piece of magic avoids the `deleted header file' problem. ## The problem is that when a header file which appears in a .P file ## is deleted, the dependency causes make to die (because there is ## typically no way to rebuild the header). We avoid this by adding ## dummy dependencies for each header file. Too bad gcc doesn't do ## this for us directly. tr ' ' ' ' < "$tmpdepfile" | ## Some versions of gcc put a space before the `:'. On the theory ## that the space means something, we add a space to the output as ## well. ## Some versions of the HPUX 10.20 sed can't process this invocation ## correctly. Breaking it into two sed invocations is a workaround. sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile" rm -f "$tmpdepfile" ;; hp) # This case exists only to let depend.m4 do its work. It works by # looking at the text of this script. This case will never be run, # since it is checked for above. exit 1 ;; sgi) if test "$libtool" = yes; then "$@" "-Wp,-MDupdate,$tmpdepfile" else "$@" -MDupdate "$tmpdepfile" fi stat=$? if test $stat -eq 0; then : else rm -f "$tmpdepfile" exit $stat fi rm -f "$depfile" if test -f "$tmpdepfile"; then # yes, the sourcefile depend on other files echo "$object : \\" > "$depfile" # Clip off the initial element (the dependent). Don't try to be # clever and replace this with sed code, as IRIX sed won't handle # lines with more than a fixed number of characters (4096 in # IRIX 6.2 sed, 8192 in IRIX 6.5). We also remove comment lines; # the IRIX cc adds comments like `#:fec' to the end of the # dependency line. tr ' ' ' ' < "$tmpdepfile" \ | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' | \ tr ' ' ' ' >> $depfile echo >> $depfile # The second pass generates a dummy entry for each header file. tr ' ' ' ' < "$tmpdepfile" \ | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \ >> $depfile else # The sourcefile does not contain any dependencies, so just # store a dummy comment line, to avoid errors with the Makefile # "include basename.Plo" scheme. echo "#dummy" > "$depfile" fi rm -f "$tmpdepfile" ;; aix) # The C for AIX Compiler uses -M and outputs the dependencies # in a .u file. This file always lives in the current directory. # Also, the AIX compiler puts `$object:' at the start of each line; # $object doesn't have directory information. stripped=`echo "$object" | sed -e 's,^.*/,,' -e 's/\(.*\)\..*$/\1/'` tmpdepfile="$stripped.u" outname="$stripped.o" if test "$libtool" = yes; then "$@" -Wc,-M else "$@" -M fi stat=$? if test $stat -eq 0; then : else rm -f "$tmpdepfile" exit $stat fi if test -f "$tmpdepfile"; then # Each line is of the form `foo.o: dependent.h'. # Do two passes, one to just change these to # `$object: dependent.h' and one to simply `dependent.h:'. sed -e "s,^$outname:,$object :," < "$tmpdepfile" > "$depfile" sed -e "s,^$outname: \(.*\)$,\1:," < "$tmpdepfile" >> "$depfile" else # The sourcefile does not contain any dependencies, so just # store a dummy comment line, to avoid errors with the Makefile # "include basename.Plo" scheme. echo "#dummy" > "$depfile" fi rm -f "$tmpdepfile" ;; tru64) # The Tru64 compiler uses -MD to generate dependencies as a side # effect. `cc -MD -o foo.o ...' puts the dependencies into `foo.o.d'. # At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put # dependencies in `foo.d' instead, so we check for that too. # Subdirectories are respected. dir=`echo "$object" | sed -e 's|/[^/]*$|/|'` test "x$dir" = "x$object" && dir= base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'` if test "$libtool" = yes; then tmpdepfile1="$dir.libs/$base.lo.d" tmpdepfile2="$dir.libs/$base.d" "$@" -Wc,-MD else tmpdepfile1="$dir$base.o.d" tmpdepfile2="$dir$base.d" "$@" -MD fi stat=$? if test $stat -eq 0; then : else rm -f "$tmpdepfile1" "$tmpdepfile2" exit $stat fi if test -f "$tmpdepfile1"; then tmpdepfile="$tmpdepfile1" else tmpdepfile="$tmpdepfile2" fi if test -f "$tmpdepfile"; then sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile" # That's a space and a tab in the []. sed -e 's,^.*\.[a-z]*:[ ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile" else echo "#dummy" > "$depfile" fi rm -f "$tmpdepfile" ;; #nosideeffect) # This comment above is used by automake to tell side-effect # dependency tracking mechanisms from slower ones. dashmstdout) # Important note: in order to support this mode, a compiler *must* # always write the proprocessed file to stdout, regardless of -o. "$@" || exit $? # Remove the call to Libtool. if test "$libtool" = yes; then while test $1 != '--mode=compile'; do shift done shift fi # Remove `-o $object'. We will use -o /dev/null later, # however we can't do the remplacement now because # `-o $object' might simply not be used IFS=" " for arg do case $arg in -o) shift ;; $object) shift ;; *) set fnord "$@" "$arg" shift # fnord shift # $arg ;; esac done test -z "$dashmflag" && dashmflag=-M "$@" -o /dev/null $dashmflag | sed 's:^[^:]*\:[ ]*:'"$object"'\: :' > "$tmpdepfile" rm -f "$depfile" cat < "$tmpdepfile" > "$depfile" tr ' ' ' ' < "$tmpdepfile" | \ ## Some versions of the HPUX 10.20 sed can't process this invocation ## correctly. Breaking it into two sed invocations is a workaround. sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile" rm -f "$tmpdepfile" ;; dashXmstdout) # This case only exists to satisfy depend.m4. It is never actually # run, as this mode is specially recognized in the preamble. exit 1 ;; makedepend) "$@" || exit $? # X makedepend shift cleared=no for arg in "$@"; do case $cleared in no) set ""; shift cleared=yes ;; esac case "$arg" in -D*|-I*) set fnord "$@" "$arg"; shift ;; -*) ;; *) set fnord "$@" "$arg"; shift ;; esac done obj_suffix="`echo $object | sed 's/^.*\././'`" touch "$tmpdepfile" ${MAKEDEPEND-makedepend} -o"$obj_suffix" -f"$tmpdepfile" "$@" rm -f "$depfile" cat < "$tmpdepfile" > "$depfile" sed '1,2d' "$tmpdepfile" | tr ' ' ' ' | \ ## Some versions of the HPUX 10.20 sed can't process this invocation ## correctly. Breaking it into two sed invocations is a workaround. sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile" rm -f "$tmpdepfile" "$tmpdepfile".bak ;; cpp) # Important note: in order to support this mode, a compiler *must* # always write the proprocessed file to stdout. "$@" || exit $? # Remove the call to Libtool. if test "$libtool" = yes; then while test $1 != '--mode=compile'; do shift done shift fi # Remove `-o $object'. IFS=" " for arg do case $arg in -o) shift ;; $object) shift ;; *) set fnord "$@" "$arg" shift # fnord shift # $arg ;; esac done "$@" -E | sed -n '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' | sed '$ s: \\$::' > "$tmpdepfile" rm -f "$depfile" echo "$object : \\" > "$depfile" cat < "$tmpdepfile" >> "$depfile" sed < "$tmpdepfile" '/^$/d;s/^ //;s/ \\$//;s/$/ :/' >> "$depfile" rm -f "$tmpdepfile" ;; msvisualcpp) # Important note: in order to support this mode, a compiler *must* # always write the proprocessed file to stdout, regardless of -o, # because we must use -o when running libtool. "$@" || exit $? IFS=" " for arg do case "$arg" in "-Gm"|"/Gm"|"-Gi"|"/Gi"|"-ZI"|"/ZI") set fnord "$@" shift shift ;; *) set fnord "$@" "$arg" shift shift ;; esac done "$@" -E | sed -n '/^#line [0-9][0-9]* "\([^"]*\)"/ s::echo "`cygpath -u \\"\1\\"`":p' | sort | uniq > "$tmpdepfile" rm -f "$depfile" echo "$object : \\" > "$depfile" . "$tmpdepfile" | sed 's% %\\ %g' | sed -n '/^\(.*\)$/ s:: \1 \\:p' >> "$depfile" echo " " >> "$depfile" . "$tmpdepfile" | sed 's% %\\ %g' | sed -n '/^\(.*\)$/ s::\1\::p' >> "$depfile" rm -f "$tmpdepfile" ;; none) exec "$@" ;; *) echo "Unknown depmode $depmode" 1>&2 exit 1 ;; esac exit 0 |
|
From: Rob W. <gre...@us...> - 2004-04-20 19:49:35
|
Update of /cvsroot/wgui/wgui/includes In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8061/includes Modified Files: Makefile.in Log Message: Build fix. Index: Makefile.in =================================================================== RCS file: /cvsroot/wgui/wgui/includes/Makefile.in,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** Makefile.in 20 Apr 2004 18:55:22 -0000 1.18 --- Makefile.in 20 Apr 2004 19:49:16 -0000 1.19 *************** *** 173,177 **** cd $(top_builddir) && $(SHELL) ./config.status includes/wgui_config.h ! $(srcdir)/wgui_config.h.in: $(top_srcdir)/configure.in $(ACLOCAL_M4) $(top_srcdir)/acconfig.h cd $(top_srcdir) && $(AUTOHEADER) touch $(srcdir)/wgui_config.h.in --- 173,177 ---- cd $(top_builddir) && $(SHELL) ./config.status includes/wgui_config.h ! $(srcdir)/wgui_config.h.in: $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && $(AUTOHEADER) touch $(srcdir)/wgui_config.h.in |
|
From: Rob W. <gre...@us...> - 2004-04-20 19:05:51
|
Update of /cvsroot/wgui/wgui/tests In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31845/tests Added Files: Notepad-VS71.vcproj Notepad.dsp Log Message: Notepad project files. --- NEW FILE: Notepad-VS71.vcproj --- --- NEW FILE: Notepad.dsp --- |
|
From: Rob W. <gre...@us...> - 2004-04-20 18:59:18
|
Update of /cvsroot/wgui/wgui/includes In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30174/includes Modified Files: wg_window.h Log Message: DOxygen docs fix Index: wg_window.h =================================================================== RCS file: /cvsroot/wgui/wgui/includes/wg_window.h,v retrieving revision 1.34 retrieving revision 1.35 diff -C2 -d -r1.34 -r1.35 *** wg_window.h 13 Apr 2004 15:28:56 -0000 1.34 --- wg_window.h 20 Apr 2004 18:59:06 -0000 1.35 *************** *** 38,41 **** --- 38,45 ---- { + // forward declaration of the view class + class CView; + + //! A base class with all the basic properties needed by a window *************** *** 44,51 **** //! Almost all controls and views will be derived from this - - // forward declaration of the view class - class CView; - class CWindow : public CMessageClient { --- 48,51 ---- |
|
From: Rob W. <gre...@us...> - 2004-04-20 18:56:08
|
Update of /cvsroot/wgui/wgui/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29132/src Modified Files: Makefile.in Log Message: Makefile fix. Index: Makefile.in =================================================================== RCS file: /cvsroot/wgui/wgui/src/Makefile.in,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** Makefile.in 31 Mar 2004 08:15:06 -0000 1.9 --- Makefile.in 20 Apr 2004 18:55:23 -0000 1.10 *************** *** 1,7 **** ! # Makefile.in generated by automake 1.8.3 from Makefile.am. # @configure_input@ ! # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, ! # 2003, 2004 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, --- 1,7 ---- ! # Makefile.in generated by automake 1.6.3 from Makefile.am. # @configure_input@ ! # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 ! # Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, *************** *** 14,34 **** @SET_MAKE@ ! ! SOURCES = $(libwguid_a_SOURCES) srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ top_builddir = .. am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd INSTALL = @INSTALL@ install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c INSTALL_HEADER = $(INSTALL_DATA) ! transform = $(program_transform_name) NORMAL_INSTALL = : PRE_INSTALL = : --- 14,57 ---- @SET_MAKE@ ! SHELL = @SHELL@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ + prefix = @prefix@ + exec_prefix = @exec_prefix@ + + bindir = @bindir@ + sbindir = @sbindir@ + libexecdir = @libexecdir@ + datadir = @datadir@ + sysconfdir = @sysconfdir@ + sharedstatedir = @sharedstatedir@ + localstatedir = @localstatedir@ + libdir = @libdir@ + infodir = @infodir@ + mandir = @mandir@ + includedir = @includedir@ + oldincludedir = /usr/include pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ top_builddir = .. + + ACLOCAL = @ACLOCAL@ + AUTOCONF = @AUTOCONF@ + AUTOMAKE = @AUTOMAKE@ + AUTOHEADER = @AUTOHEADER@ + am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd INSTALL = @INSTALL@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_DATA = @INSTALL_DATA@ install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c + INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_HEADER = $(INSTALL_DATA) ! transform = @program_transform_name@ NORMAL_INSTALL = : PRE_INSTALL = : *************** *** 37,159 **** PRE_UNINSTALL = : POST_UNINSTALL = : ! host_triplet = @host@ ! subdir = src ! DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ! ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 ! am__aclocal_m4_deps = $(top_srcdir)/configure.in ! am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ ! $(ACLOCAL_M4) ! mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs ! CONFIG_HEADER = $(top_builddir)/includes/wgui_config.h ! CONFIG_CLEAN_FILES = ! AR = ar ! ARFLAGS = cru ! am__installdirs = "$(DESTDIR)$(libdir)" ! libLIBRARIES_INSTALL = $(INSTALL_DATA) ! LIBRARIES = $(lib_LIBRARIES) ! libwguid_a_AR = $(AR) $(ARFLAGS) ! libwguid_a_LIBADD = ! am_libwguid_a_OBJECTS = std_ex.$(OBJEXT) wg_application.$(OBJEXT) \ ! wg_button.$(OBJEXT) wg_checkbox.$(OBJEXT) wg_color.$(OBJEXT) \ ! wg_dropdown.$(OBJEXT) wg_editbox.$(OBJEXT) \ ! wg_fontengine.$(OBJEXT) wg_frame.$(OBJEXT) \ ! wg_groupbox.$(OBJEXT) wg_label.$(OBJEXT) wg_listbox.$(OBJEXT) \ ! wg_menu.$(OBJEXT) wg_message.$(OBJEXT) \ ! wg_message_client.$(OBJEXT) wg_message_server.$(OBJEXT) \ ! wg_messagebox.$(OBJEXT) wg_painter.$(OBJEXT) \ ! wg_picture.$(OBJEXT) wg_point.$(OBJEXT) wg_progress.$(OBJEXT) \ ! wg_rect.$(OBJEXT) wg_renderedstring.$(OBJEXT) \ ! wg_scrollbar.$(OBJEXT) wg_tab.$(OBJEXT) wg_textbox.$(OBJEXT) \ ! wg_timer.$(OBJEXT) wg_tree.$(OBJEXT) wg_view.$(OBJEXT) \ ! wg_window.$(OBJEXT) wg_toolbar.$(OBJEXT) wg_tooltip.$(OBJEXT) \ ! wg_resources.$(OBJEXT) wg_resource_handle.$(OBJEXT) \ ! wutil_config_store.$(OBJEXT) ! libwguid_a_OBJECTS = $(am_libwguid_a_OBJECTS) ! DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/includes ! depcomp = $(SHELL) $(top_srcdir)/depcomp ! am__depfiles_maybe = depfiles ! @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/std_ex.Po \ ! @AMDEP_TRUE@ ./$(DEPDIR)/wg_application.Po \ ! @AMDEP_TRUE@ ./$(DEPDIR)/wg_button.Po \ ! @AMDEP_TRUE@ ./$(DEPDIR)/wg_checkbox.Po ./$(DEPDIR)/wg_color.Po \ ! @AMDEP_TRUE@ ./$(DEPDIR)/wg_dropdown.Po \ ! @AMDEP_TRUE@ ./$(DEPDIR)/wg_editbox.Po \ ! @AMDEP_TRUE@ ./$(DEPDIR)/wg_fontengine.Po \ ! @AMDEP_TRUE@ ./$(DEPDIR)/wg_frame.Po ./$(DEPDIR)/wg_groupbox.Po \ ! @AMDEP_TRUE@ ./$(DEPDIR)/wg_label.Po ./$(DEPDIR)/wg_listbox.Po \ ! @AMDEP_TRUE@ ./$(DEPDIR)/wg_menu.Po ./$(DEPDIR)/wg_message.Po \ ! @AMDEP_TRUE@ ./$(DEPDIR)/wg_message_client.Po \ ! @AMDEP_TRUE@ ./$(DEPDIR)/wg_message_server.Po \ ! @AMDEP_TRUE@ ./$(DEPDIR)/wg_messagebox.Po \ ! @AMDEP_TRUE@ ./$(DEPDIR)/wg_painter.Po \ ! @AMDEP_TRUE@ ./$(DEPDIR)/wg_picture.Po ./$(DEPDIR)/wg_point.Po \ ! @AMDEP_TRUE@ ./$(DEPDIR)/wg_progress.Po ./$(DEPDIR)/wg_rect.Po \ ! @AMDEP_TRUE@ ./$(DEPDIR)/wg_renderedstring.Po \ ! @AMDEP_TRUE@ ./$(DEPDIR)/wg_resource_handle.Po \ ! @AMDEP_TRUE@ ./$(DEPDIR)/wg_resources.Po \ ! @AMDEP_TRUE@ ./$(DEPDIR)/wg_scrollbar.Po ./$(DEPDIR)/wg_tab.Po \ ! @AMDEP_TRUE@ ./$(DEPDIR)/wg_textbox.Po ./$(DEPDIR)/wg_timer.Po \ ! @AMDEP_TRUE@ ./$(DEPDIR)/wg_toolbar.Po \ ! @AMDEP_TRUE@ ./$(DEPDIR)/wg_tooltip.Po ./$(DEPDIR)/wg_tree.Po \ ! @AMDEP_TRUE@ ./$(DEPDIR)/wg_view.Po ./$(DEPDIR)/wg_window.Po \ ! @AMDEP_TRUE@ ./$(DEPDIR)/wutil_config_store.Po ! CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ ! $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) ! CXXLD = $(CXX) ! CXXLINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) \ ! -o $@ ! SOURCES = $(libwguid_a_SOURCES) ! DIST_SOURCES = $(libwguid_a_SOURCES) ! ETAGS = etags ! CTAGS = ctags ! DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ! ACLOCAL = @ACLOCAL@ ! AMDEP_FALSE = @AMDEP_FALSE@ ! AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ - AUTOCONF = @AUTOCONF@ - AUTOHEADER = @AUTOHEADER@ - AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ CC = @CC@ - CCDEPMODE = @CCDEPMODE@ - CFLAGS = @CFLAGS@ - CPP = @CPP@ - CPPFLAGS = @CPPFLAGS@ CXX = @CXX@ - CXXDEPMODE = @CXXDEPMODE@ - CXXFLAGS = @CXXFLAGS@ - CYGPATH_W = @CYGPATH_W@ - DEFS = @DEFS@ DEPDIR = @DEPDIR@ - ECHO_C = @ECHO_C@ - ECHO_N = @ECHO_N@ - ECHO_T = @ECHO_T@ - EGREP = @EGREP@ - EXEEXT = @EXEEXT@ - INSTALL_DATA = @INSTALL_DATA@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ - INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ - LDFLAGS = @LDFLAGS@ - LIBOBJS = @LIBOBJS@ - LIBS = @LIBS@ LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ - MAKEINFO = @MAKEINFO@ - OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ - PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ - PACKAGE_NAME = @PACKAGE_NAME@ - PACKAGE_STRING = @PACKAGE_STRING@ - PACKAGE_TARNAME = @PACKAGE_TARNAME@ - PACKAGE_VERSION = @PACKAGE_VERSION@ - PATH_SEPARATOR = @PATH_SEPARATOR@ RANLIB = @RANLIB@ SDL_CFLAGS = @SDL_CFLAGS@ SDL_CONFIG = @SDL_CONFIG@ SDL_LIBS = @SDL_LIBS@ - SET_MAKE = @SET_MAKE@ - SHELL = @SHELL@ STRIP = @STRIP@ VERSION = @VERSION@ --- 60,79 ---- PRE_UNINSTALL = : POST_UNINSTALL = : ! ! EXEEXT = @EXEEXT@ ! OBJEXT = @OBJEXT@ ! PATH_SEPARATOR = @PATH_SEPARATOR@ AMTAR = @AMTAR@ AWK = @AWK@ CC = @CC@ CXX = @CXX@ DEPDIR = @DEPDIR@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ LN_S = @LN_S@ PACKAGE = @PACKAGE@ RANLIB = @RANLIB@ SDL_CFLAGS = @SDL_CFLAGS@ SDL_CONFIG = @SDL_CONFIG@ SDL_LIBS = @SDL_LIBS@ STRIP = @STRIP@ VERSION = @VERSION@ *************** *** 165,216 **** WGUI_VERSION_MINOR = @WGUI_VERSION_MINOR@ WGUI_VERSION_REVISION = @WGUI_VERSION_REVISION@ - ac_ct_CC = @ac_ct_CC@ - ac_ct_CXX = @ac_ct_CXX@ - ac_ct_RANLIB = @ac_ct_RANLIB@ - ac_ct_STRIP = @ac_ct_STRIP@ - am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ - am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ - am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ - am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ am__include = @am__include@ - am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ - bindir = @bindir@ - build = @build@ - build_alias = @build_alias@ - build_cpu = @build_cpu@ - build_os = @build_os@ - build_vendor = @build_vendor@ - datadir = @datadir@ - exec_prefix = @exec_prefix@ freetype_config = @freetype_config@ - host = @host@ - host_alias = @host_alias@ - host_cpu = @host_cpu@ - host_os = @host_os@ - host_vendor = @host_vendor@ - includedir = @includedir@ - infodir = @infodir@ install_sh = @install_sh@ ! libdir = @libdir@ ! libexecdir = @libexecdir@ ! localstatedir = @localstatedir@ ! mandir = @mandir@ ! oldincludedir = @oldincludedir@ ! prefix = @prefix@ ! program_transform_name = @program_transform_name@ ! sbindir = @sbindir@ ! sharedstatedir = @sharedstatedir@ ! sysconfdir = @sysconfdir@ ! target = @target@ ! target_alias = @target_alias@ ! target_cpu = @target_cpu@ ! target_os = @target_os@ ! target_vendor = @target_vendor@ INCLUDES = @WGUI_INCLUDES@ ! AM_CXXFLAGS = -Wall -Wimplicit -Wreturn-type -Wunused -Wswitch -Wcomment -Wuninitialized -Wparentheses -Wtraditional -Wpointer-arith -Wmissing-prototypes\ ! -O0 -g -DDEBUG @WGUI_CFLAGS@ lib_LIBRARIES = libwguid.a libwguid_a_SOURCES = \ std_ex.cpp \ --- 85,99 ---- WGUI_VERSION_MINOR = @WGUI_VERSION_MINOR@ WGUI_VERSION_REVISION = @WGUI_VERSION_REVISION@ am__include = @am__include@ am__quote = @am__quote@ freetype_config = @freetype_config@ install_sh = @install_sh@ ! INCLUDES = @WGUI_INCLUDES@ ! ! AM_CXXFLAGS = -Wall -Wpointer-arith -Wunreachable-code -O0 -g -DDEBUG @WGUI_CFLAGS@ lib_LIBRARIES = libwguid.a + libwguid_a_SOURCES = \ std_ex.cpp \ *************** *** 248,252 **** wg_resources.cpp \ wg_resource_handle.cpp \ ! wutil_config_store.cpp all: all-am --- 131,203 ---- wg_resources.cpp \ wg_resource_handle.cpp \ ! wutil_config_store.cpp \ ! wutil_log.cpp ! ! subdir = src ! mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs ! CONFIG_HEADER = $(top_builddir)/includes/wgui_config.h ! CONFIG_CLEAN_FILES = ! LIBRARIES = $(lib_LIBRARIES) ! ! libwguid_a_AR = $(AR) cru ! libwguid_a_LIBADD = ! am_libwguid_a_OBJECTS = std_ex.$(OBJEXT) wg_application.$(OBJEXT) \ ! wg_button.$(OBJEXT) wg_checkbox.$(OBJEXT) wg_color.$(OBJEXT) \ ! wg_dropdown.$(OBJEXT) wg_editbox.$(OBJEXT) \ ! wg_fontengine.$(OBJEXT) wg_frame.$(OBJEXT) \ ! wg_groupbox.$(OBJEXT) wg_label.$(OBJEXT) wg_listbox.$(OBJEXT) \ ! wg_menu.$(OBJEXT) wg_message.$(OBJEXT) \ ! wg_message_client.$(OBJEXT) wg_message_server.$(OBJEXT) \ ! wg_messagebox.$(OBJEXT) wg_painter.$(OBJEXT) \ ! wg_picture.$(OBJEXT) wg_point.$(OBJEXT) wg_progress.$(OBJEXT) \ ! wg_rect.$(OBJEXT) wg_renderedstring.$(OBJEXT) \ ! wg_scrollbar.$(OBJEXT) wg_tab.$(OBJEXT) wg_textbox.$(OBJEXT) \ ! wg_timer.$(OBJEXT) wg_tree.$(OBJEXT) wg_view.$(OBJEXT) \ ! wg_window.$(OBJEXT) wg_toolbar.$(OBJEXT) wg_tooltip.$(OBJEXT) \ ! wg_resources.$(OBJEXT) wg_resource_handle.$(OBJEXT) \ ! wutil_config_store.$(OBJEXT) wutil_log.$(OBJEXT) ! libwguid_a_OBJECTS = $(am_libwguid_a_OBJECTS) ! ! DEFS = @DEFS@ ! DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/includes ! CPPFLAGS = @CPPFLAGS@ ! LDFLAGS = @LDFLAGS@ ! LIBS = @LIBS@ ! depcomp = $(SHELL) $(top_srcdir)/depcomp ! am__depfiles_maybe = depfiles ! @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/std_ex.Po \ ! @AMDEP_TRUE@ ./$(DEPDIR)/wg_application.Po \ ! @AMDEP_TRUE@ ./$(DEPDIR)/wg_button.Po ./$(DEPDIR)/wg_checkbox.Po \ ! @AMDEP_TRUE@ ./$(DEPDIR)/wg_color.Po ./$(DEPDIR)/wg_dropdown.Po \ ! @AMDEP_TRUE@ ./$(DEPDIR)/wg_editbox.Po \ ! @AMDEP_TRUE@ ./$(DEPDIR)/wg_fontengine.Po \ ! @AMDEP_TRUE@ ./$(DEPDIR)/wg_frame.Po ./$(DEPDIR)/wg_groupbox.Po \ ! @AMDEP_TRUE@ ./$(DEPDIR)/wg_label.Po ./$(DEPDIR)/wg_listbox.Po \ ! @AMDEP_TRUE@ ./$(DEPDIR)/wg_menu.Po ./$(DEPDIR)/wg_message.Po \ ! @AMDEP_TRUE@ ./$(DEPDIR)/wg_message_client.Po \ ! @AMDEP_TRUE@ ./$(DEPDIR)/wg_message_server.Po \ ! @AMDEP_TRUE@ ./$(DEPDIR)/wg_messagebox.Po \ ! @AMDEP_TRUE@ ./$(DEPDIR)/wg_painter.Po ./$(DEPDIR)/wg_picture.Po \ ! @AMDEP_TRUE@ ./$(DEPDIR)/wg_point.Po ./$(DEPDIR)/wg_progress.Po \ ! @AMDEP_TRUE@ ./$(DEPDIR)/wg_rect.Po \ ! @AMDEP_TRUE@ ./$(DEPDIR)/wg_renderedstring.Po \ ! @AMDEP_TRUE@ ./$(DEPDIR)/wg_resource_handle.Po \ ! @AMDEP_TRUE@ ./$(DEPDIR)/wg_resources.Po \ ! @AMDEP_TRUE@ ./$(DEPDIR)/wg_scrollbar.Po ./$(DEPDIR)/wg_tab.Po \ ! @AMDEP_TRUE@ ./$(DEPDIR)/wg_textbox.Po ./$(DEPDIR)/wg_timer.Po \ ! @AMDEP_TRUE@ ./$(DEPDIR)/wg_toolbar.Po ./$(DEPDIR)/wg_tooltip.Po \ ! @AMDEP_TRUE@ ./$(DEPDIR)/wg_tree.Po ./$(DEPDIR)/wg_view.Po \ ! @AMDEP_TRUE@ ./$(DEPDIR)/wg_window.Po \ ! @AMDEP_TRUE@ ./$(DEPDIR)/wutil_config_store.Po \ ! @AMDEP_TRUE@ ./$(DEPDIR)/wutil_log.Po ! CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ ! $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) ! CXXLD = $(CXX) ! CXXLINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) \ ! -o $@ ! CXXFLAGS = @CXXFLAGS@ ! DIST_SOURCES = $(libwguid_a_SOURCES) ! DIST_COMMON = Makefile.am Makefile.in ! SOURCES = $(libwguid_a_SOURCES) all: all-am *************** *** 254,294 **** .SUFFIXES: .SUFFIXES: .cpp .o .obj ! $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) ! @for dep in $?; do \ ! case '$(am__configure_deps)' in \ ! *$$dep*) \ ! cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ ! && exit 0; \ ! exit 1;; \ ! esac; \ ! done; \ ! echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/Makefile'; \ cd $(top_srcdir) && \ $(AUTOMAKE) --gnu src/Makefile ! .PRECIOUS: Makefile ! Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status ! @case '$?' in \ ! *config.status*) \ ! cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ ! *) \ ! echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ ! cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ ! esac; ! ! $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) ! cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ! $(top_srcdir)/configure: $(am__configure_deps) ! cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ! $(ACLOCAL_M4): $(am__aclocal_m4_deps) ! cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh install-libLIBRARIES: $(lib_LIBRARIES) @$(NORMAL_INSTALL) ! test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)" @list='$(lib_LIBRARIES)'; for p in $$list; do \ if test -f $$p; then \ f="`echo $$p | sed -e 's|^.*/||'`"; \ ! echo " $(libLIBRARIES_INSTALL) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \ ! $(libLIBRARIES_INSTALL) "$$p" "$(DESTDIR)$(libdir)/$$f"; \ else :; fi; \ done --- 205,224 ---- .SUFFIXES: .SUFFIXES: .cpp .o .obj ! $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && \ $(AUTOMAKE) --gnu src/Makefile ! Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status ! cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) ! AR = ar ! libLIBRARIES_INSTALL = $(INSTALL_DATA) install-libLIBRARIES: $(lib_LIBRARIES) @$(NORMAL_INSTALL) ! $(mkinstalldirs) $(DESTDIR)$(libdir) @list='$(lib_LIBRARIES)'; for p in $$list; do \ if test -f $$p; then \ f="`echo $$p | sed -e 's|^.*/||'`"; \ ! echo " $(libLIBRARIES_INSTALL) $$p $(DESTDIR)$(libdir)/$$f"; \ ! $(libLIBRARIES_INSTALL) $$p $(DESTDIR)$(libdir)/$$f; \ else :; fi; \ done *************** *** 297,302 **** if test -f $$p; then \ p="`echo $$p | sed -e 's|^.*/||'`"; \ ! echo " $(RANLIB) '$(DESTDIR)$(libdir)/$$p'"; \ ! $(RANLIB) "$(DESTDIR)$(libdir)/$$p"; \ else :; fi; \ done --- 227,232 ---- if test -f $$p; then \ p="`echo $$p | sed -e 's|^.*/||'`"; \ ! echo " $(RANLIB) $(DESTDIR)$(libdir)/$$p"; \ ! $(RANLIB) $(DESTDIR)$(libdir)/$$p; \ else :; fi; \ done *************** *** 306,311 **** @list='$(lib_LIBRARIES)'; for p in $$list; do \ p="`echo $$p | sed -e 's|^.*/||'`"; \ ! echo " rm -f '$(DESTDIR)$(libdir)/$$p'"; \ ! rm -f "$(DESTDIR)$(libdir)/$$p"; \ done --- 236,241 ---- @list='$(lib_LIBRARIES)'; for p in $$list; do \ p="`echo $$p | sed -e 's|^.*/||'`"; \ ! echo " rm -f $(DESTDIR)$(libdir)/$$p"; \ ! rm -f $(DESTDIR)$(libdir)/$$p; \ done *************** *** 318,322 **** mostlyclean-compile: ! -rm -f *.$(OBJEXT) distclean-compile: --- 248,252 ---- mostlyclean-compile: ! -rm -f *.$(OBJEXT) core *.core distclean-compile: *************** *** 358,379 **** @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/wg_window.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/wutil_config_store.Po@am__quote@ .cpp.o: ! @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ ! @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi ! @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ ! @AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ ! @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ! @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $< .cpp.obj: ! @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \ ! @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi ! @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ ! @AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ ! @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ! @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` uninstall-info-am: ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ --- 288,315 ---- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/wg_window.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/wutil_config_store.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/wutil_log.Po@am__quote@ + + distclean-depend: + -rm -rf ./$(DEPDIR) .cpp.o: ! @AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ ! @AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ ! @AMDEP_TRUE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ! $(CXXCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< .cpp.obj: ! @AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ ! @AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ ! @AMDEP_TRUE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ! $(CXXCOMPILE) -c -o $@ `cygpath -w $<` ! CXXDEPMODE = @CXXDEPMODE@ uninstall-info-am: + ETAGS = etags + ETAGSFLAGS = + + tags: TAGS + ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ *************** *** 384,388 **** END { for (i in files) print i; }'`; \ mkid -fID $$unique - tags: TAGS TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ --- 320,323 ---- *************** *** 399,416 **** || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ $$tags $$unique - ctags: CTAGS - CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ - here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - test -z "$(CTAGS_ARGS)$$tags$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$tags $$unique GTAGS: --- 334,337 ---- *************** *** 420,438 **** distclean-tags: ! -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags distdir: $(DISTFILES) ! @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ ! topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ ! list='$(DISTFILES)'; for file in $$list; do \ ! case $$file in \ ! $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ ! $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ ! esac; \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ if test "$$dir" != "$$file" && test "$$dir" != "."; then \ dir="/$$dir"; \ ! $(mkdir_p) "$(distdir)$$dir"; \ else \ dir=''; \ --- 341,357 ---- distclean-tags: ! -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH ! DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ! ! top_distdir = .. ! distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) ! @list='$(DISTFILES)'; for file in $$list; do \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ if test "$$dir" != "$$file" && test "$$dir" != "."; then \ dir="/$$dir"; \ ! $(mkinstalldirs) "$(distdir)$$dir"; \ else \ dir=''; \ *************** *** 452,459 **** check: check-am all-am: Makefile $(LIBRARIES) installdirs: ! for dir in "$(DESTDIR)$(libdir)"; do \ ! test -z "$$dir" || $(mkdir_p) "$$dir"; \ ! done install: install-am install-exec: install-exec-am --- 371,378 ---- check: check-am all-am: Makefile $(LIBRARIES) + installdirs: ! $(mkinstalldirs) $(DESTDIR)$(libdir) ! install: install-am install-exec: install-exec-am *************** *** 467,471 **** install-strip: $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ ! install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ `test -z '$(STRIP)' || \ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install --- 386,390 ---- install-strip: $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ ! INSTALL_STRIP_FLAG=-s \ `test -z '$(STRIP)' || \ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install *************** *** 475,479 **** distclean-generic: ! -rm -f $(CONFIG_CLEAN_FILES) maintainer-clean-generic: --- 394,398 ---- distclean-generic: ! -rm -f Makefile $(CONFIG_CLEAN_FILES) maintainer-clean-generic: *************** *** 485,492 **** distclean: distclean-am ! -rm -rf ./$(DEPDIR) ! -rm -f Makefile ! distclean-am: clean-am distclean-compile distclean-generic \ ! distclean-tags dvi: dvi-am --- 404,410 ---- distclean: distclean-am ! ! distclean-am: clean-am distclean-compile distclean-depend \ ! distclean-generic distclean-tags dvi: dvi-am *************** *** 494,499 **** dvi-am: - html: html-am - info: info-am --- 412,415 ---- *************** *** 511,516 **** maintainer-clean: maintainer-clean-am ! -rm -rf ./$(DEPDIR) ! -rm -f Makefile maintainer-clean-am: distclean-am maintainer-clean-generic --- 427,431 ---- maintainer-clean: maintainer-clean-am ! maintainer-clean-am: distclean-am maintainer-clean-generic *************** *** 519,542 **** mostlyclean-am: mostlyclean-compile mostlyclean-generic - pdf: pdf-am - - pdf-am: - - ps: ps-am - - ps-am: - uninstall-am: uninstall-info-am uninstall-libLIBRARIES ! .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ ! clean-libLIBRARIES ctags distclean distclean-compile \ ! distclean-generic distclean-tags distdir dvi dvi-am html \ ! html-am info info-am install install-am install-data \ ! install-data-am install-exec install-exec-am install-info \ ! install-info-am install-libLIBRARIES install-man install-strip \ ! installcheck installcheck-am installdirs maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-compile \ ! mostlyclean-generic pdf pdf-am ps ps-am tags uninstall \ ! uninstall-am uninstall-info-am uninstall-libLIBRARIES # Tell versions [3.59,3.63) of GNU make to not export all variables. --- 434,449 ---- mostlyclean-am: mostlyclean-compile mostlyclean-generic uninstall-am: uninstall-info-am uninstall-libLIBRARIES ! .PHONY: GTAGS all all-am check check-am clean clean-generic \ ! clean-libLIBRARIES distclean distclean-compile distclean-depend \ ! distclean-generic distclean-tags distdir dvi dvi-am info \ ! info-am install install-am install-data install-data-am \ ! install-exec install-exec-am install-info install-info-am \ ! install-libLIBRARIES install-man install-strip installcheck \ ! installcheck-am installdirs maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-compile \ ! mostlyclean-generic tags uninstall uninstall-am \ ! uninstall-info-am uninstall-libLIBRARIES # Tell versions [3.59,3.63) of GNU make to not export all variables. |
|
From: Rob W. <gre...@us...> - 2004-04-20 18:56:08
|
Update of /cvsroot/wgui/wgui/docs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29132/docs Modified Files: Makefile.in Log Message: Makefile fix. Index: Makefile.in =================================================================== RCS file: /cvsroot/wgui/wgui/docs/Makefile.in,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** Makefile.in 31 Mar 2004 08:15:06 -0000 1.7 --- Makefile.in 20 Apr 2004 18:55:05 -0000 1.8 *************** *** 1,7 **** ! # Makefile.in generated by automake 1.8.3 from Makefile.am. # @configure_input@ ! # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, ! # 2003, 2004 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, --- 1,7 ---- ! # Makefile.in generated by automake 1.6.3 from Makefile.am. # @configure_input@ ! # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 ! # Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, *************** *** 14,32 **** @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ top_builddir = .. am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd INSTALL = @INSTALL@ install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c INSTALL_HEADER = $(INSTALL_DATA) ! transform = $(program_transform_name) NORMAL_INSTALL = : PRE_INSTALL = : --- 14,57 ---- @SET_MAKE@ + SHELL = @SHELL@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ + prefix = @prefix@ + exec_prefix = @exec_prefix@ + + bindir = @bindir@ + sbindir = @sbindir@ + libexecdir = @libexecdir@ + datadir = @datadir@ + sysconfdir = @sysconfdir@ + sharedstatedir = @sharedstatedir@ + localstatedir = @localstatedir@ + libdir = @libdir@ + infodir = @infodir@ + mandir = @mandir@ + includedir = @includedir@ + oldincludedir = /usr/include pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ top_builddir = .. + + ACLOCAL = @ACLOCAL@ + AUTOCONF = @AUTOCONF@ + AUTOMAKE = @AUTOMAKE@ + AUTOHEADER = @AUTOHEADER@ + am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd INSTALL = @INSTALL@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_DATA = @INSTALL_DATA@ install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c + INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_HEADER = $(INSTALL_DATA) ! transform = @program_transform_name@ NORMAL_INSTALL = : PRE_INSTALL = : *************** *** 35,102 **** PRE_UNINSTALL = : POST_UNINSTALL = : ! host_triplet = @host@ ! subdir = docs ! DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ! ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 ! am__aclocal_m4_deps = $(top_srcdir)/configure.in ! am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ ! $(ACLOCAL_M4) ! mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs ! CONFIG_HEADER = $(top_builddir)/includes/wgui_config.h ! CONFIG_CLEAN_FILES = ! SOURCES = ! DIST_SOURCES = ! am__installdirs = "$(DESTDIR)$(libwguidocsdir)" ! libwguidocsDATA_INSTALL = $(INSTALL_DATA) ! DATA = $(libwguidocs_DATA) ! DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ! ACLOCAL = @ACLOCAL@ ! AMDEP_FALSE = @AMDEP_FALSE@ ! AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ - AUTOCONF = @AUTOCONF@ - AUTOHEADER = @AUTOHEADER@ - AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ CC = @CC@ - CCDEPMODE = @CCDEPMODE@ - CFLAGS = @CFLAGS@ - CPP = @CPP@ - CPPFLAGS = @CPPFLAGS@ CXX = @CXX@ - CXXDEPMODE = @CXXDEPMODE@ - CXXFLAGS = @CXXFLAGS@ - CYGPATH_W = @CYGPATH_W@ - DEFS = @DEFS@ DEPDIR = @DEPDIR@ - ECHO_C = @ECHO_C@ - ECHO_N = @ECHO_N@ - ECHO_T = @ECHO_T@ - EGREP = @EGREP@ - EXEEXT = @EXEEXT@ - INSTALL_DATA = @INSTALL_DATA@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ - INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ - LDFLAGS = @LDFLAGS@ - LIBOBJS = @LIBOBJS@ - LIBS = @LIBS@ LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ - MAKEINFO = @MAKEINFO@ - OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ - PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ - PACKAGE_NAME = @PACKAGE_NAME@ - PACKAGE_STRING = @PACKAGE_STRING@ - PACKAGE_TARNAME = @PACKAGE_TARNAME@ - PACKAGE_VERSION = @PACKAGE_VERSION@ - PATH_SEPARATOR = @PATH_SEPARATOR@ RANLIB = @RANLIB@ SDL_CFLAGS = @SDL_CFLAGS@ SDL_CONFIG = @SDL_CONFIG@ SDL_LIBS = @SDL_LIBS@ - SET_MAKE = @SET_MAKE@ - SHELL = @SHELL@ STRIP = @STRIP@ VERSION = @VERSION@ --- 60,79 ---- PRE_UNINSTALL = : POST_UNINSTALL = : ! ! EXEEXT = @EXEEXT@ ! OBJEXT = @OBJEXT@ ! PATH_SEPARATOR = @PATH_SEPARATOR@ AMTAR = @AMTAR@ AWK = @AWK@ CC = @CC@ CXX = @CXX@ DEPDIR = @DEPDIR@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ LN_S = @LN_S@ PACKAGE = @PACKAGE@ RANLIB = @RANLIB@ SDL_CFLAGS = @SDL_CFLAGS@ SDL_CONFIG = @SDL_CONFIG@ SDL_LIBS = @SDL_LIBS@ STRIP = @STRIP@ VERSION = @VERSION@ *************** *** 108,157 **** WGUI_VERSION_MINOR = @WGUI_VERSION_MINOR@ WGUI_VERSION_REVISION = @WGUI_VERSION_REVISION@ - ac_ct_CC = @ac_ct_CC@ - ac_ct_CXX = @ac_ct_CXX@ - ac_ct_RANLIB = @ac_ct_RANLIB@ - ac_ct_STRIP = @ac_ct_STRIP@ - am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ - am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ - am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ - am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ am__include = @am__include@ - am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ - bindir = @bindir@ - build = @build@ - build_alias = @build_alias@ - build_cpu = @build_cpu@ - build_os = @build_os@ - build_vendor = @build_vendor@ - datadir = @datadir@ - exec_prefix = @exec_prefix@ freetype_config = @freetype_config@ - host = @host@ - host_alias = @host_alias@ - host_cpu = @host_cpu@ - host_os = @host_os@ - host_vendor = @host_vendor@ - includedir = @includedir@ - infodir = @infodir@ install_sh = @install_sh@ ! libdir = @libdir@ ! libexecdir = @libexecdir@ ! localstatedir = @localstatedir@ ! mandir = @mandir@ ! oldincludedir = @oldincludedir@ ! prefix = @prefix@ ! program_transform_name = @program_transform_name@ ! sbindir = @sbindir@ ! sharedstatedir = @sharedstatedir@ ! sysconfdir = @sysconfdir@ ! target = @target@ ! target_alias = @target_alias@ ! target_cpu = @target_cpu@ ! target_os = @target_os@ ! target_vendor = @target_vendor@ libwguidocsdir = ${prefix}/wGui/docs libwguidocs_DATA = \ Application.html \ CalcTutorial.html \ ConfigStore.html \ --- 85,97 ---- WGUI_VERSION_MINOR = @WGUI_VERSION_MINOR@ WGUI_VERSION_REVISION = @WGUI_VERSION_REVISION@ am__include = @am__include@ am__quote = @am__quote@ freetype_config = @freetype_config@ install_sh = @install_sh@ ! libwguidocsdir = ${prefix}/wGui/docs libwguidocs_DATA = \ Application.html \ + BullseyeTutorial.html \ CalcTutorial.html \ ConfigStore.html \ *************** *** 163,211 **** Overview.html \ Resources.html \ ! tutorial/* \ html/* EXTRA_DIST = $(libwguidocs_DATA) all: all-am .SUFFIXES: ! $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) ! @for dep in $?; do \ ! case '$(am__configure_deps)' in \ ! *$$dep*) \ ! cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ ! && exit 0; \ ! exit 1;; \ ! esac; \ ! done; \ ! echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu docs/Makefile'; \ cd $(top_srcdir) && \ $(AUTOMAKE) --gnu docs/Makefile ! .PRECIOUS: Makefile ! Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status ! @case '$?' in \ ! *config.status*) \ ! cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ ! *) \ ! echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ ! cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ ! esac; ! ! $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) ! cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ! ! $(top_srcdir)/configure: $(am__configure_deps) ! cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ! $(ACLOCAL_M4): $(am__aclocal_m4_deps) ! cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh uninstall-info-am: install-libwguidocsDATA: $(libwguidocs_DATA) @$(NORMAL_INSTALL) ! test -z "$(libwguidocsdir)" || $(mkdir_p) "$(DESTDIR)$(libwguidocsdir)" @list='$(libwguidocs_DATA)'; for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ f="`echo $$p | sed -e 's|^.*/||'`"; \ ! echo " $(libwguidocsDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(libwguidocsdir)/$$f'"; \ ! $(libwguidocsDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(libwguidocsdir)/$$f"; \ done --- 103,138 ---- Overview.html \ Resources.html \ ! tutorial/Bullseye/* \ ! tutorial/Calc/* \ html/* + EXTRA_DIST = $(libwguidocs_DATA) + subdir = docs + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs + CONFIG_HEADER = $(top_builddir)/includes/wgui_config.h + CONFIG_CLEAN_FILES = + DIST_SOURCES = + DATA = $(libwguidocs_DATA) + + DIST_COMMON = Makefile.am Makefile.in all: all-am .SUFFIXES: ! $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && \ $(AUTOMAKE) --gnu docs/Makefile ! Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status ! cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) uninstall-info-am: + libwguidocsDATA_INSTALL = $(INSTALL_DATA) install-libwguidocsDATA: $(libwguidocs_DATA) @$(NORMAL_INSTALL) ! $(mkinstalldirs) $(DESTDIR)$(libwguidocsdir) @list='$(libwguidocs_DATA)'; for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ f="`echo $$p | sed -e 's|^.*/||'`"; \ ! echo " $(libwguidocsDATA_INSTALL) $$d$$p $(DESTDIR)$(libwguidocsdir)/$$f"; \ ! $(libwguidocsDATA_INSTALL) $$d$$p $(DESTDIR)$(libwguidocsdir)/$$f; \ done *************** *** 214,241 **** @list='$(libwguidocs_DATA)'; for p in $$list; do \ f="`echo $$p | sed -e 's|^.*/||'`"; \ ! echo " rm -f '$(DESTDIR)$(libwguidocsdir)/$$f'"; \ ! rm -f "$(DESTDIR)$(libwguidocsdir)/$$f"; \ done tags: TAGS TAGS: ! ctags: CTAGS ! CTAGS: distdir: $(DISTFILES) ! $(mkdir_p) $(distdir)/html $(distdir)/tutorial ! @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ ! topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ ! list='$(DISTFILES)'; for file in $$list; do \ ! case $$file in \ ! $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ ! $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ ! esac; \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ if test "$$dir" != "$$file" && test "$$dir" != "."; then \ dir="/$$dir"; \ ! $(mkdir_p) "$(distdir)$$dir"; \ else \ dir=''; \ --- 141,163 ---- @list='$(libwguidocs_DATA)'; for p in $$list; do \ f="`echo $$p | sed -e 's|^.*/||'`"; \ ! echo " rm -f $(DESTDIR)$(libwguidocsdir)/$$f"; \ ! rm -f $(DESTDIR)$(libwguidocsdir)/$$f; \ done tags: TAGS TAGS: ! DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + top_distdir = .. + distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) ! $(mkinstalldirs) $(distdir)/html $(distdir)/tutorial/Bullseye $(distdir)/tutorial/Calc ! @list='$(DISTFILES)'; for file in $$list; do \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ if test "$$dir" != "$$file" && test "$$dir" != "."; then \ dir="/$$dir"; \ ! $(mkinstalldirs) "$(distdir)$$dir"; \ else \ dir=''; \ *************** *** 253,265 **** done $(MAKE) $(AM_MAKEFLAGS) \ ! top_distdir="$(top_distdir)" distdir="$(distdir)" \ dist-hook check-am: all-am check: check-am all-am: Makefile $(DATA) installdirs: ! for dir in "$(DESTDIR)$(libwguidocsdir)"; do \ ! test -z "$$dir" || $(mkdir_p) "$$dir"; \ ! done install: install-am install-exec: install-exec-am --- 175,187 ---- done $(MAKE) $(AM_MAKEFLAGS) \ ! top_distdir="${top_distdir}" distdir="$(distdir)" \ dist-hook check-am: all-am check: check-am all-am: Makefile $(DATA) + installdirs: ! $(mkinstalldirs) $(DESTDIR)$(libwguidocsdir) ! install: install-am install-exec: install-exec-am *************** *** 273,277 **** install-strip: $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ ! install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ `test -z '$(STRIP)' || \ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install --- 195,199 ---- install-strip: $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ ! INSTALL_STRIP_FLAG=-s \ `test -z '$(STRIP)' || \ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install *************** *** 281,285 **** distclean-generic: ! -rm -f $(CONFIG_CLEAN_FILES) maintainer-clean-generic: --- 203,207 ---- distclean-generic: ! -rm -f Makefile $(CONFIG_CLEAN_FILES) maintainer-clean-generic: *************** *** 291,295 **** distclean: distclean-am ! -rm -f Makefile distclean-am: clean-am distclean-generic --- 213,217 ---- distclean: distclean-am ! distclean-am: clean-am distclean-generic *************** *** 298,303 **** dvi-am: - html: html-am - info: info-am --- 220,223 ---- *************** *** 315,319 **** maintainer-clean: maintainer-clean-am ! -rm -f Makefile maintainer-clean-am: distclean-am maintainer-clean-generic --- 235,239 ---- maintainer-clean: maintainer-clean-am ! maintainer-clean-am: distclean-am maintainer-clean-generic *************** *** 322,343 **** mostlyclean-am: mostlyclean-generic - pdf: pdf-am - - pdf-am: - - ps: ps-am - - ps-am: - uninstall-am: uninstall-info-am uninstall-libwguidocsDATA .PHONY: all all-am check check-am clean clean-generic distclean \ ! distclean-generic distdir dvi dvi-am html html-am info info-am \ ! install install-am install-data install-data-am install-exec \ install-exec-am install-info install-info-am \ install-libwguidocsDATA install-man install-strip installcheck \ installcheck-am installdirs maintainer-clean \ ! maintainer-clean-generic mostlyclean mostlyclean-generic pdf \ ! pdf-am ps ps-am uninstall uninstall-am uninstall-info-am \ uninstall-libwguidocsDATA --- 242,255 ---- mostlyclean-am: mostlyclean-generic uninstall-am: uninstall-info-am uninstall-libwguidocsDATA .PHONY: all all-am check check-am clean clean-generic distclean \ ! distclean-generic distdir dvi dvi-am info info-am install \ ! install-am install-data install-data-am install-exec \ install-exec-am install-info install-info-am \ install-libwguidocsDATA install-man install-strip installcheck \ installcheck-am installdirs maintainer-clean \ ! maintainer-clean-generic mostlyclean mostlyclean-generic \ ! uninstall uninstall-am uninstall-info-am \ uninstall-libwguidocsDATA *************** *** 345,351 **** dist-hook: rm -rf `find $(distdir)/tutorial -name CVS` ! rm -f $(distdir)/tutorial/*~ ! rm -f $(distdir)/tutorial/*.o ! rm -f $(distdir)/tutorial/CalcTutorial # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. --- 257,266 ---- dist-hook: rm -rf `find $(distdir)/tutorial -name CVS` ! rm -f $(distdir)/tutorial/Calc/*~ ! rm -f $(distdir)/tutorial/Calc/*.o ! rm -f $(distdir)/tutorial/Calc/CalcTutorial ! rm -f $(distdir)/tutorial/Bullseye/*~ ! rm -f $(distdir)/tutorial/Bullseye/*.o ! rm -f $(distdir)/tutorial/Bullseye/BullseyeTutorial # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. |
|
From: Rob W. <gre...@us...> - 2004-04-20 18:56:08
|
Update of /cvsroot/wgui/wgui/includes/unit_tests In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29132/includes/unit_tests Modified Files: Makefile.in Log Message: Makefile fix. Index: Makefile.in =================================================================== RCS file: /cvsroot/wgui/wgui/includes/unit_tests/Makefile.in,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** Makefile.in 31 Mar 2004 08:15:06 -0000 1.4 --- Makefile.in 20 Apr 2004 18:55:23 -0000 1.5 *************** *** 1,7 **** ! # Makefile.in generated by automake 1.8.3 from Makefile.am. # @configure_input@ ! # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, ! # 2003, 2004 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, --- 1,7 ---- ! # Makefile.in generated by automake 1.6.3 from Makefile.am. # @configure_input@ ! # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 ! # Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, *************** *** 14,32 **** @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ top_builddir = ../.. am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd INSTALL = @INSTALL@ install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c INSTALL_HEADER = $(INSTALL_DATA) ! transform = $(program_transform_name) NORMAL_INSTALL = : PRE_INSTALL = : --- 14,57 ---- @SET_MAKE@ + SHELL = @SHELL@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ + prefix = @prefix@ + exec_prefix = @exec_prefix@ + + bindir = @bindir@ + sbindir = @sbindir@ + libexecdir = @libexecdir@ + datadir = @datadir@ + sysconfdir = @sysconfdir@ + sharedstatedir = @sharedstatedir@ + localstatedir = @localstatedir@ + libdir = @libdir@ + infodir = @infodir@ + mandir = @mandir@ + includedir = @includedir@ + oldincludedir = /usr/include pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ top_builddir = ../.. + + ACLOCAL = @ACLOCAL@ + AUTOCONF = @AUTOCONF@ + AUTOMAKE = @AUTOMAKE@ + AUTOHEADER = @AUTOHEADER@ + am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd INSTALL = @INSTALL@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_DATA = @INSTALL_DATA@ install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c + INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_HEADER = $(INSTALL_DATA) ! transform = @program_transform_name@ NORMAL_INSTALL = : PRE_INSTALL = : *************** *** 35,102 **** PRE_UNINSTALL = : POST_UNINSTALL = : ! host_triplet = @host@ ! subdir = includes/unit_tests ! DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ! ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 ! am__aclocal_m4_deps = $(top_srcdir)/configure.in ! am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ ! $(ACLOCAL_M4) ! mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs ! CONFIG_HEADER = $(top_builddir)/includes/wgui_config.h ! CONFIG_CLEAN_FILES = ! SOURCES = ! DIST_SOURCES = ! am__installdirs = "$(DESTDIR)$(libwguiunittestsdir)" ! libwguiunittestsDATA_INSTALL = $(INSTALL_DATA) ! DATA = $(libwguiunittests_DATA) ! DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ! ACLOCAL = @ACLOCAL@ ! AMDEP_FALSE = @AMDEP_FALSE@ ! AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ - AUTOCONF = @AUTOCONF@ - AUTOHEADER = @AUTOHEADER@ - AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ CC = @CC@ - CCDEPMODE = @CCDEPMODE@ - CFLAGS = @CFLAGS@ - CPP = @CPP@ - CPPFLAGS = @CPPFLAGS@ CXX = @CXX@ - CXXDEPMODE = @CXXDEPMODE@ - CXXFLAGS = @CXXFLAGS@ - CYGPATH_W = @CYGPATH_W@ - DEFS = @DEFS@ DEPDIR = @DEPDIR@ - ECHO_C = @ECHO_C@ - ECHO_N = @ECHO_N@ - ECHO_T = @ECHO_T@ - EGREP = @EGREP@ - EXEEXT = @EXEEXT@ - INSTALL_DATA = @INSTALL_DATA@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ - INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ - LDFLAGS = @LDFLAGS@ - LIBOBJS = @LIBOBJS@ - LIBS = @LIBS@ LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ - MAKEINFO = @MAKEINFO@ - OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ - PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ - PACKAGE_NAME = @PACKAGE_NAME@ - PACKAGE_STRING = @PACKAGE_STRING@ - PACKAGE_TARNAME = @PACKAGE_TARNAME@ - PACKAGE_VERSION = @PACKAGE_VERSION@ - PATH_SEPARATOR = @PATH_SEPARATOR@ RANLIB = @RANLIB@ SDL_CFLAGS = @SDL_CFLAGS@ SDL_CONFIG = @SDL_CONFIG@ SDL_LIBS = @SDL_LIBS@ - SET_MAKE = @SET_MAKE@ - SHELL = @SHELL@ STRIP = @STRIP@ VERSION = @VERSION@ --- 60,79 ---- PRE_UNINSTALL = : POST_UNINSTALL = : ! ! EXEEXT = @EXEEXT@ ! OBJEXT = @OBJEXT@ ! PATH_SEPARATOR = @PATH_SEPARATOR@ AMTAR = @AMTAR@ AWK = @AWK@ CC = @CC@ CXX = @CXX@ DEPDIR = @DEPDIR@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ LN_S = @LN_S@ PACKAGE = @PACKAGE@ RANLIB = @RANLIB@ SDL_CFLAGS = @SDL_CFLAGS@ SDL_CONFIG = @SDL_CONFIG@ SDL_LIBS = @SDL_LIBS@ STRIP = @STRIP@ VERSION = @VERSION@ *************** *** 108,154 **** WGUI_VERSION_MINOR = @WGUI_VERSION_MINOR@ WGUI_VERSION_REVISION = @WGUI_VERSION_REVISION@ - ac_ct_CC = @ac_ct_CC@ - ac_ct_CXX = @ac_ct_CXX@ - ac_ct_RANLIB = @ac_ct_RANLIB@ - ac_ct_STRIP = @ac_ct_STRIP@ - am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ - am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ - am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ - am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ am__include = @am__include@ - am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ - bindir = @bindir@ - build = @build@ - build_alias = @build_alias@ - build_cpu = @build_cpu@ - build_os = @build_os@ - build_vendor = @build_vendor@ - datadir = @datadir@ - exec_prefix = @exec_prefix@ freetype_config = @freetype_config@ - host = @host@ - host_alias = @host_alias@ - host_cpu = @host_cpu@ - host_os = @host_os@ - host_vendor = @host_vendor@ - includedir = @includedir@ - infodir = @infodir@ install_sh = @install_sh@ ! libdir = @libdir@ ! libexecdir = @libexecdir@ ! localstatedir = @localstatedir@ ! mandir = @mandir@ ! oldincludedir = @oldincludedir@ ! prefix = @prefix@ ! program_transform_name = @program_transform_name@ ! sbindir = @sbindir@ ! sharedstatedir = @sharedstatedir@ ! sysconfdir = @sysconfdir@ ! target = @target@ ! target_alias = @target_alias@ ! target_cpu = @target_cpu@ ! target_os = @target_os@ ! target_vendor = @target_vendor@ libwguiunittestsdir = ${prefix}/wGui/includes/unit_tests libwguiunittests_DATA = \ --- 85,93 ---- WGUI_VERSION_MINOR = @WGUI_VERSION_MINOR@ WGUI_VERSION_REVISION = @WGUI_VERSION_REVISION@ am__include = @am__include@ am__quote = @am__quote@ freetype_config = @freetype_config@ install_sh = @install_sh@ ! libwguiunittestsdir = ${prefix}/wGui/includes/unit_tests libwguiunittests_DATA = \ *************** *** 177,224 **** wg_view_unittests.h \ wg_window_unittests.h \ ! wutil_config_store_unittests.h EXTRA_DIST = $(libwguiunittests_DATA) all: all-am .SUFFIXES: ! $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) ! @for dep in $?; do \ ! case '$(am__configure_deps)' in \ ! *$$dep*) \ ! cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ ! && exit 0; \ ! exit 1;; \ ! esac; \ ! done; \ ! echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu includes/unit_tests/Makefile'; \ cd $(top_srcdir) && \ $(AUTOMAKE) --gnu includes/unit_tests/Makefile ! .PRECIOUS: Makefile ! Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status ! @case '$?' in \ ! *config.status*) \ ! cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ ! *) \ ! echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ ! cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ ! esac; ! ! $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) ! cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ! ! $(top_srcdir)/configure: $(am__configure_deps) ! cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ! $(ACLOCAL_M4): $(am__aclocal_m4_deps) ! cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh uninstall-info-am: install-libwguiunittestsDATA: $(libwguiunittests_DATA) @$(NORMAL_INSTALL) ! test -z "$(libwguiunittestsdir)" || $(mkdir_p) "$(DESTDIR)$(libwguiunittestsdir)" @list='$(libwguiunittests_DATA)'; for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ f="`echo $$p | sed -e 's|^.*/||'`"; \ ! echo " $(libwguiunittestsDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(libwguiunittestsdir)/$$f'"; \ ! $(libwguiunittestsDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(libwguiunittestsdir)/$$f"; \ done --- 116,150 ---- wg_view_unittests.h \ wg_window_unittests.h \ ! wutil_config_store_unittests.h \ ! wutil_log_unittests.h ! EXTRA_DIST = $(libwguiunittests_DATA) + subdir = includes/unit_tests + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs + CONFIG_HEADER = $(top_builddir)/includes/wgui_config.h + CONFIG_CLEAN_FILES = + DIST_SOURCES = + DATA = $(libwguiunittests_DATA) + + DIST_COMMON = Makefile.am Makefile.in all: all-am .SUFFIXES: ! $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && \ $(AUTOMAKE) --gnu includes/unit_tests/Makefile ! Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status ! cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) uninstall-info-am: + libwguiunittestsDATA_INSTALL = $(INSTALL_DATA) install-libwguiunittestsDATA: $(libwguiunittests_DATA) @$(NORMAL_INSTALL) ! $(mkinstalldirs) $(DESTDIR)$(libwguiunittestsdir) @list='$(libwguiunittests_DATA)'; for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ f="`echo $$p | sed -e 's|^.*/||'`"; \ ! echo " $(libwguiunittestsDATA_INSTALL) $$d$$p $(DESTDIR)$(libwguiunittestsdir)/$$f"; \ ! $(libwguiunittestsDATA_INSTALL) $$d$$p $(DESTDIR)$(libwguiunittestsdir)/$$f; \ done *************** *** 227,253 **** @list='$(libwguiunittests_DATA)'; for p in $$list; do \ f="`echo $$p | sed -e 's|^.*/||'`"; \ ! echo " rm -f '$(DESTDIR)$(libwguiunittestsdir)/$$f'"; \ ! rm -f "$(DESTDIR)$(libwguiunittestsdir)/$$f"; \ done tags: TAGS TAGS: ! ctags: CTAGS ! CTAGS: distdir: $(DISTFILES) ! @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ ! topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ ! list='$(DISTFILES)'; for file in $$list; do \ ! case $$file in \ ! $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ ! $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ ! esac; \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ if test "$$dir" != "$$file" && test "$$dir" != "."; then \ dir="/$$dir"; \ ! $(mkdir_p) "$(distdir)$$dir"; \ else \ dir=''; \ --- 153,174 ---- @list='$(libwguiunittests_DATA)'; for p in $$list; do \ f="`echo $$p | sed -e 's|^.*/||'`"; \ ! echo " rm -f $(DESTDIR)$(libwguiunittestsdir)/$$f"; \ ! rm -f $(DESTDIR)$(libwguiunittestsdir)/$$f; \ done tags: TAGS TAGS: ! DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + top_distdir = ../.. + distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) ! @list='$(DISTFILES)'; for file in $$list; do \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ if test "$$dir" != "$$file" && test "$$dir" != "."; then \ dir="/$$dir"; \ ! $(mkinstalldirs) "$(distdir)$$dir"; \ else \ dir=''; \ *************** *** 267,274 **** check: check-am all-am: Makefile $(DATA) installdirs: ! for dir in "$(DESTDIR)$(libwguiunittestsdir)"; do \ ! test -z "$$dir" || $(mkdir_p) "$$dir"; \ ! done install: install-am install-exec: install-exec-am --- 188,195 ---- check: check-am all-am: Makefile $(DATA) + installdirs: ! $(mkinstalldirs) $(DESTDIR)$(libwguiunittestsdir) ! install: install-am install-exec: install-exec-am *************** *** 282,286 **** install-strip: $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ ! install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ `test -z '$(STRIP)' || \ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install --- 203,207 ---- install-strip: $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ ! INSTALL_STRIP_FLAG=-s \ `test -z '$(STRIP)' || \ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install *************** *** 290,294 **** distclean-generic: ! -rm -f $(CONFIG_CLEAN_FILES) maintainer-clean-generic: --- 211,215 ---- distclean-generic: ! -rm -f Makefile $(CONFIG_CLEAN_FILES) maintainer-clean-generic: *************** *** 300,304 **** distclean: distclean-am ! -rm -f Makefile distclean-am: clean-am distclean-generic --- 221,225 ---- distclean: distclean-am ! distclean-am: clean-am distclean-generic *************** *** 307,312 **** dvi-am: - html: html-am - info: info-am --- 228,231 ---- *************** *** 324,328 **** maintainer-clean: maintainer-clean-am ! -rm -f Makefile maintainer-clean-am: distclean-am maintainer-clean-generic --- 243,247 ---- maintainer-clean: maintainer-clean-am ! maintainer-clean-am: distclean-am maintainer-clean-generic *************** *** 331,352 **** mostlyclean-am: mostlyclean-generic - pdf: pdf-am - - pdf-am: - - ps: ps-am - - ps-am: - uninstall-am: uninstall-info-am uninstall-libwguiunittestsDATA .PHONY: all all-am check check-am clean clean-generic distclean \ ! distclean-generic distdir dvi dvi-am html html-am info info-am \ ! install install-am install-data install-data-am install-exec \ install-exec-am install-info install-info-am \ install-libwguiunittestsDATA install-man install-strip \ installcheck installcheck-am installdirs maintainer-clean \ ! maintainer-clean-generic mostlyclean mostlyclean-generic pdf \ ! pdf-am ps ps-am uninstall uninstall-am uninstall-info-am \ uninstall-libwguiunittestsDATA --- 250,263 ---- mostlyclean-am: mostlyclean-generic uninstall-am: uninstall-info-am uninstall-libwguiunittestsDATA .PHONY: all all-am check check-am clean clean-generic distclean \ ! distclean-generic distdir dvi dvi-am info info-am install \ ! install-am install-data install-data-am install-exec \ install-exec-am install-info install-info-am \ install-libwguiunittestsDATA install-man install-strip \ installcheck installcheck-am installdirs maintainer-clean \ ! maintainer-clean-generic mostlyclean mostlyclean-generic \ ! uninstall uninstall-am uninstall-info-am \ uninstall-libwguiunittestsDATA |
|
From: Rob W. <gre...@us...> - 2004-04-20 18:56:08
|
Update of /cvsroot/wgui/wgui/tests In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29132/tests Modified Files: Makefile.in Log Message: Makefile fix. Index: Makefile.in =================================================================== RCS file: /cvsroot/wgui/wgui/tests/Makefile.in,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** Makefile.in 31 Mar 2004 08:15:07 -0000 1.15 --- Makefile.in 20 Apr 2004 18:55:25 -0000 1.16 *************** *** 1,7 **** ! # Makefile.in generated by automake 1.8.3 from Makefile.am. # @configure_input@ ! # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, ! # 2003, 2004 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, --- 1,7 ---- ! # Makefile.in generated by automake 1.6.3 from Makefile.am. # @configure_input@ ! # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 ! # Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, *************** *** 14,34 **** @SET_MAKE@ ! ! SOURCES = $(Calc_SOURCES) $(ConfigEditor_SOURCES) $(MessagingTest_SOURCES) $(TestApp1_SOURCES) $(TestApp2_SOURCES) $(UnitTests_SOURCES) srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ top_builddir = .. am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd INSTALL = @INSTALL@ install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c INSTALL_HEADER = $(INSTALL_DATA) ! transform = $(program_transform_name) NORMAL_INSTALL = : PRE_INSTALL = : --- 14,57 ---- @SET_MAKE@ ! SHELL = @SHELL@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ + prefix = @prefix@ + exec_prefix = @exec_prefix@ + + bindir = @bindir@ + sbindir = @sbindir@ + libexecdir = @libexecdir@ + datadir = @datadir@ + sysconfdir = @sysconfdir@ + sharedstatedir = @sharedstatedir@ + localstatedir = @localstatedir@ + libdir = @libdir@ + infodir = @infodir@ + mandir = @mandir@ + includedir = @includedir@ + oldincludedir = /usr/include pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ top_builddir = .. + + ACLOCAL = @ACLOCAL@ + AUTOCONF = @AUTOCONF@ + AUTOMAKE = @AUTOMAKE@ + AUTOHEADER = @AUTOHEADER@ + am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd INSTALL = @INSTALL@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_DATA = @INSTALL_DATA@ install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c + INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_HEADER = $(INSTALL_DATA) ! transform = @program_transform_name@ NORMAL_INSTALL = : PRE_INSTALL = : *************** *** 37,79 **** PRE_UNINSTALL = : POST_UNINSTALL = : ! host_triplet = @host@ ! noinst_PROGRAMS = Calc$(EXEEXT) TestApp1$(EXEEXT) TestApp2$(EXEEXT) \ ! ConfigEditor$(EXEEXT) MessagingTest$(EXEEXT) \ ! UnitTests$(EXEEXT) subdir = tests - DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in - ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 - am__aclocal_m4_deps = $(top_srcdir)/configure.in - am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = $(top_builddir)/includes/wgui_config.h CONFIG_CLEAN_FILES = PROGRAMS = $(noinst_PROGRAMS) am_Calc_OBJECTS = CalcApp.$(OBJEXT) Calc_OBJECTS = $(am_Calc_OBJECTS) Calc_DEPENDENCIES = am_ConfigEditor_OBJECTS = ConfigEditor.$(OBJEXT) ConfigEditor_OBJECTS = $(am_ConfigEditor_OBJECTS) ConfigEditor_DEPENDENCIES = am_MessagingTest_OBJECTS = MessagingTest.$(OBJEXT) MessagingTest_OBJECTS = $(am_MessagingTest_OBJECTS) MessagingTest_DEPENDENCIES = am_TestApp1_OBJECTS = TestApp1.$(OBJEXT) TestView1.$(OBJEXT) TestApp1_OBJECTS = $(am_TestApp1_OBJECTS) TestApp1_DEPENDENCIES = am_TestApp2_OBJECTS = TestApp2.$(OBJEXT) TestView2.$(OBJEXT) \ TestFrame2.$(OBJEXT) TestApp2_OBJECTS = $(am_TestApp2_OBJECTS) TestApp2_DEPENDENCIES = am_UnitTests_OBJECTS = UnitTests-UnitTests.$(OBJEXT) UnitTests_OBJECTS = $(am_UnitTests_OBJECTS) UnitTests_DEPENDENCIES = ! DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/includes depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/CalcApp.Po \ @AMDEP_TRUE@ ./$(DEPDIR)/ConfigEditor.Po \ ! @AMDEP_TRUE@ ./$(DEPDIR)/MessagingTest.Po \ @AMDEP_TRUE@ ./$(DEPDIR)/TestApp1.Po ./$(DEPDIR)/TestApp2.Po \ @AMDEP_TRUE@ ./$(DEPDIR)/TestFrame2.Po ./$(DEPDIR)/TestView1.Po \ --- 60,173 ---- PRE_UNINSTALL = : POST_UNINSTALL = : ! ! EXEEXT = @EXEEXT@ ! OBJEXT = @OBJEXT@ ! PATH_SEPARATOR = @PATH_SEPARATOR@ ! AMTAR = @AMTAR@ ! AWK = @AWK@ ! CC = @CC@ ! CXX = @CXX@ ! DEPDIR = @DEPDIR@ ! INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ ! LN_S = @LN_S@ ! PACKAGE = @PACKAGE@ ! RANLIB = @RANLIB@ ! SDL_CFLAGS = @SDL_CFLAGS@ ! SDL_CONFIG = @SDL_CONFIG@ ! SDL_LIBS = @SDL_LIBS@ ! STRIP = @STRIP@ ! VERSION = @VERSION@ ! WGUI_CFLAGS = @WGUI_CFLAGS@ ! WGUI_INCLUDES = @WGUI_INCLUDES@ ! WGUI_LIBS = @WGUI_LIBS@ ! WGUI_VERSION = @WGUI_VERSION@ ! WGUI_VERSION_MAJOR = @WGUI_VERSION_MAJOR@ ! WGUI_VERSION_MINOR = @WGUI_VERSION_MINOR@ ! WGUI_VERSION_REVISION = @WGUI_VERSION_REVISION@ ! am__include = @am__include@ ! am__quote = @am__quote@ ! freetype_config = @freetype_config@ ! install_sh = @install_sh@ ! INCLUDES = @WGUI_INCLUDES@ ! AM_CXXFLAGS = @WGUI_CFLAGS@ ! ! noinst_PROGRAMS = Calc TestApp1 TestApp2 ConfigEditor Notepad MessagingTest UnitTests ! ! Calc_SOURCES = CalcApp.cpp ! Calc_LDADD = @WGUI_LIBS@ ! ! TestApp1_SOURCES = TestApp1.cpp TestView1.cpp TestView1.h ! TestApp1_LDADD = @WGUI_LIBS@ ! ! TestApp2_SOURCES = TestApp2.cpp TestView2.cpp TestView2.h TestFrame2.cpp TestFrame2.h ! TestApp2_LDADD = @WGUI_LIBS@ ! ! ConfigEditor_SOURCES = ConfigEditor.cpp ! ConfigEditor_LDADD = @WGUI_LIBS@ ! ! Notepad_SOURCES = Notepad.cpp ! Notepad_LDADD = @WGUI_LIBS@ ! ! MessagingTest_SOURCES = MessagingTest.cpp ! MessagingTest_LDADD = @WGUI_LIBS@ ! ! UnitTests_SOURCES = UnitTests.cpp ! UnitTests_LDADD = @WGUI_LIBS@ ! UnitTests_CXXFLAGS = -DUNIT_TESTS $(AM_CXXFLAGS) ! ! EXTRA_DIST = Calc.dsp CalcApp-VS7.vcproj CalcApp-VS71.vcproj TestApp1.dsp TestApp1-VS7.vcproj TestApp1-VS71.vcproj \ ! TestApp2.dsp TestApp2-VS7.vcproj TestApp2-VS71.vcproj testpic.bmp ConfigEditor.dsp ConfigEditor-VS7.vcproj \ ! ConfigEditor-VS71.vcproj Notepad.dsp Notepad-VS7.vcproj Notepad-VS71.vcproj MessagingTest.dsp \ ! MessagingTest-VS7.vcproj MessagingTest-VS71.vcproj UnitTests.dsp UnitTests-VS7.vcproj UnitTests-VS71.vcproj ! subdir = tests mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = $(top_builddir)/includes/wgui_config.h CONFIG_CLEAN_FILES = + noinst_PROGRAMS = Calc$(EXEEXT) TestApp1$(EXEEXT) TestApp2$(EXEEXT) \ + ConfigEditor$(EXEEXT) Notepad$(EXEEXT) MessagingTest$(EXEEXT) \ + UnitTests$(EXEEXT) PROGRAMS = $(noinst_PROGRAMS) + am_Calc_OBJECTS = CalcApp.$(OBJEXT) Calc_OBJECTS = $(am_Calc_OBJECTS) Calc_DEPENDENCIES = + Calc_LDFLAGS = am_ConfigEditor_OBJECTS = ConfigEditor.$(OBJEXT) ConfigEditor_OBJECTS = $(am_ConfigEditor_OBJECTS) ConfigEditor_DEPENDENCIES = + ConfigEditor_LDFLAGS = am_MessagingTest_OBJECTS = MessagingTest.$(OBJEXT) MessagingTest_OBJECTS = $(am_MessagingTest_OBJECTS) MessagingTest_DEPENDENCIES = + MessagingTest_LDFLAGS = + am_Notepad_OBJECTS = Notepad.$(OBJEXT) + Notepad_OBJECTS = $(am_Notepad_OBJECTS) + Notepad_DEPENDENCIES = + Notepad_LDFLAGS = am_TestApp1_OBJECTS = TestApp1.$(OBJEXT) TestView1.$(OBJEXT) TestApp1_OBJECTS = $(am_TestApp1_OBJECTS) TestApp1_DEPENDENCIES = + TestApp1_LDFLAGS = am_TestApp2_OBJECTS = TestApp2.$(OBJEXT) TestView2.$(OBJEXT) \ TestFrame2.$(OBJEXT) TestApp2_OBJECTS = $(am_TestApp2_OBJECTS) TestApp2_DEPENDENCIES = + TestApp2_LDFLAGS = am_UnitTests_OBJECTS = UnitTests-UnitTests.$(OBJEXT) UnitTests_OBJECTS = $(am_UnitTests_OBJECTS) UnitTests_DEPENDENCIES = ! UnitTests_LDFLAGS = ! ! DEFS = @DEFS@ ! DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/includes ! CPPFLAGS = @CPPFLAGS@ ! LDFLAGS = @LDFLAGS@ ! LIBS = @LIBS@ depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/CalcApp.Po \ @AMDEP_TRUE@ ./$(DEPDIR)/ConfigEditor.Po \ ! @AMDEP_TRUE@ ./$(DEPDIR)/MessagingTest.Po ./$(DEPDIR)/Notepad.Po \ @AMDEP_TRUE@ ./$(DEPDIR)/TestApp1.Po ./$(DEPDIR)/TestApp2.Po \ @AMDEP_TRUE@ ./$(DEPDIR)/TestFrame2.Po ./$(DEPDIR)/TestView1.Po \ *************** *** 85,254 **** CXXLINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) \ -o $@ COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) CCLD = $(CC) LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ - SOURCES = $(Calc_SOURCES) $(ConfigEditor_SOURCES) \ - $(MessagingTest_SOURCES) $(TestApp1_SOURCES) \ - $(TestApp2_SOURCES) $(UnitTests_SOURCES) DIST_SOURCES = $(Calc_SOURCES) $(ConfigEditor_SOURCES) \ ! $(MessagingTest_SOURCES) $(TestApp1_SOURCES) \ $(TestApp2_SOURCES) $(UnitTests_SOURCES) ! ETAGS = etags ! CTAGS = ctags ! DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ! ACLOCAL = @ACLOCAL@ ! AMDEP_FALSE = @AMDEP_FALSE@ ! AMDEP_TRUE = @AMDEP_TRUE@ ! AMTAR = @AMTAR@ ! AUTOCONF = @AUTOCONF@ ! AUTOHEADER = @AUTOHEADER@ ! AUTOMAKE = @AUTOMAKE@ ! AWK = @AWK@ ! CC = @CC@ ! CCDEPMODE = @CCDEPMODE@ ! CFLAGS = @CFLAGS@ ! CPP = @CPP@ ! CPPFLAGS = @CPPFLAGS@ ! CXX = @CXX@ ! CXXDEPMODE = @CXXDEPMODE@ ! CXXFLAGS = @CXXFLAGS@ ! CYGPATH_W = @CYGPATH_W@ ! DEFS = @DEFS@ ! DEPDIR = @DEPDIR@ ! ECHO_C = @ECHO_C@ ! ECHO_N = @ECHO_N@ ! ECHO_T = @ECHO_T@ ! EGREP = @EGREP@ ! EXEEXT = @EXEEXT@ ! INSTALL_DATA = @INSTALL_DATA@ ! INSTALL_PROGRAM = @INSTALL_PROGRAM@ ! INSTALL_SCRIPT = @INSTALL_SCRIPT@ ! INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ ! LDFLAGS = @LDFLAGS@ ! LIBOBJS = @LIBOBJS@ ! LIBS = @LIBS@ ! LN_S = @LN_S@ ! LTLIBOBJS = @LTLIBOBJS@ ! MAKEINFO = @MAKEINFO@ ! OBJEXT = @OBJEXT@ ! PACKAGE = @PACKAGE@ ! PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ ! PACKAGE_NAME = @PACKAGE_NAME@ ! PACKAGE_STRING = @PACKAGE_STRING@ ! PACKAGE_TARNAME = @PACKAGE_TARNAME@ ! PACKAGE_VERSION = @PACKAGE_VERSION@ ! PATH_SEPARATOR = @PATH_SEPARATOR@ ! RANLIB = @RANLIB@ ! SDL_CFLAGS = @SDL_CFLAGS@ ! SDL_CONFIG = @SDL_CONFIG@ ! SDL_LIBS = @SDL_LIBS@ ! SET_MAKE = @SET_MAKE@ ! SHELL = @SHELL@ ! STRIP = @STRIP@ ! VERSION = @VERSION@ ! WGUI_CFLAGS = @WGUI_CFLAGS@ ! WGUI_INCLUDES = @WGUI_INCLUDES@ ! WGUI_LIBS = @WGUI_LIBS@ ! WGUI_VERSION = @WGUI_VERSION@ ! WGUI_VERSION_MAJOR = @WGUI_VERSION_MAJOR@ ! WGUI_VERSION_MINOR = @WGUI_VERSION_MINOR@ ! WGUI_VERSION_REVISION = @WGUI_VERSION_REVISION@ ! ac_ct_CC = @ac_ct_CC@ ! ac_ct_CXX = @ac_ct_CXX@ ! ac_ct_RANLIB = @ac_ct_RANLIB@ ! ac_ct_STRIP = @ac_ct_STRIP@ ! am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ ! am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ ! am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ ! am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ ! am__include = @am__include@ ! am__leading_dot = @am__leading_dot@ ! am__quote = @am__quote@ ! bindir = @bindir@ ! build = @build@ ! build_alias = @build_alias@ ! build_cpu = @build_cpu@ ! build_os = @build_os@ ! build_vendor = @build_vendor@ ! datadir = @datadir@ ! exec_prefix = @exec_prefix@ ! freetype_config = @freetype_config@ ! host = @host@ ! host_alias = @host_alias@ ! host_cpu = @host_cpu@ ! host_os = @host_os@ ! host_vendor = @host_vendor@ ! includedir = @includedir@ ! infodir = @infodir@ ! install_sh = @install_sh@ ! libdir = @libdir@ ! libexecdir = @libexecdir@ ! localstatedir = @localstatedir@ ! mandir = @mandir@ ! oldincludedir = @oldincludedir@ ! prefix = @prefix@ ! program_transform_name = @program_transform_name@ ! sbindir = @sbindir@ ! sharedstatedir = @sharedstatedir@ ! sysconfdir = @sysconfdir@ ! target = @target@ ! target_alias = @target_alias@ ! target_cpu = @target_cpu@ ! target_os = @target_os@ ! target_vendor = @target_vendor@ ! Calc_SOURCES = CalcApp.cpp ! Calc_LDADD = @WGUI_LIBS@ ! TestApp1_SOURCES = TestApp1.cpp TestView1.cpp TestView1.h ! TestApp1_LDADD = @WGUI_LIBS@ ! TestApp2_SOURCES = TestApp2.cpp TestView2.cpp TestView2.h TestFrame2.cpp TestFrame2.h ! TestApp2_LDADD = @WGUI_LIBS@ ! ConfigEditor_SOURCES = ConfigEditor.cpp ! ConfigEditor_LDADD = @WGUI_LIBS@ ! MessagingTest_SOURCES = MessagingTest.cpp ! MessagingTest_LDADD = @WGUI_LIBS@ ! UnitTests_SOURCES = UnitTests.cpp ! UnitTests_LDADD = @WGUI_LIBS@ ! UnitTests_CXXFLAGS = -DUNIT_TESTS ! EXTRA_DIST = Calc.dsp CalcApp-VS7.vcproj CalcApp-VS71.vcproj TestApp1.dsp TestApp1-VS7.vcproj TestApp1-VS71.vcproj \ ! TestApp2.dsp TestApp2-VS7.vcproj TestApp2-VS71.vcproj testpic.bmp ConfigEditor.dsp ConfigEditor-VS7.vcproj \ ! ConfigEditor-VS71.vcproj MessagingTest.dsp MessagingTest-VS7.vcproj MessagingTest-VS71.vcproj UnitTests.dsp \ ! UnitTests-VS7.vcproj UnitTests-VS71.vcproj - INCLUDES = @WGUI_INCLUDES@ - AM_CXXFLAGS = @WGUI_CFLAGS@ all: all-am .SUFFIXES: .SUFFIXES: .cpp .o .obj ! $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) ! @for dep in $?; do \ ! case '$(am__configure_deps)' in \ ! *$$dep*) \ ! cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ ! && exit 0; \ ! exit 1;; \ ! esac; \ ! done; \ ! echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu tests/Makefile'; \ cd $(top_srcdir) && \ $(AUTOMAKE) --gnu tests/Makefile ! .PRECIOUS: Makefile ! Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status ! @case '$?' in \ ! *config.status*) \ ! cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ ! *) \ ! echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ ! cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ ! esac; ! ! $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) ! cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ! ! $(top_srcdir)/configure: $(am__configure_deps) ! cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ! $(ACLOCAL_M4): $(am__aclocal_m4_deps) ! cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh clean-noinstPROGRAMS: --- 179,203 ---- CXXLINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) \ -o $@ + CXXFLAGS = @CXXFLAGS@ + CFLAGS = @CFLAGS@ COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) CCLD = $(CC) LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ DIST_SOURCES = $(Calc_SOURCES) $(ConfigEditor_SOURCES) \ ! $(MessagingTest_SOURCES) $(Notepad_SOURCES) $(TestApp1_SOURCES) \ $(TestApp2_SOURCES) $(UnitTests_SOURCES) ! DIST_COMMON = Makefile.am Makefile.in ! SOURCES = $(Calc_SOURCES) $(ConfigEditor_SOURCES) $(MessagingTest_SOURCES) $(Notepad_SOURCES) $(TestApp1_SOURCES) $(TestApp2_SOURCES) $(UnitTests_SOURCES) all: all-am .SUFFIXES: .SUFFIXES: .cpp .o .obj ! $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && \ $(AUTOMAKE) --gnu tests/Makefile ! Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status ! cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) clean-noinstPROGRAMS: *************** *** 263,266 **** --- 212,218 ---- @rm -f MessagingTest$(EXEEXT) $(CXXLINK) $(MessagingTest_LDFLAGS) $(MessagingTest_OBJECTS) $(MessagingTest_LDADD) $(LIBS) + Notepad$(EXEEXT): $(Notepad_OBJECTS) $(Notepad_DEPENDENCIES) + @rm -f Notepad$(EXEEXT) + $(CXXLINK) $(Notepad_LDFLAGS) $(Notepad_OBJECTS) $(Notepad_LDADD) $(LIBS) TestApp1$(EXEEXT): $(TestApp1_OBJECTS) $(TestApp1_DEPENDENCIES) @rm -f TestApp1$(EXEEXT) *************** *** 269,272 **** --- 221,225 ---- @rm -f TestApp2$(EXEEXT) $(CXXLINK) $(TestApp2_LDFLAGS) $(TestApp2_OBJECTS) $(TestApp2_LDADD) $(LIBS) + UnitTests-UnitTests.$(OBJEXT): UnitTests.cpp UnitTests$(EXEEXT): $(UnitTests_OBJECTS) $(UnitTests_DEPENDENCIES) @rm -f UnitTests$(EXEEXT) *************** *** 274,278 **** mostlyclean-compile: ! -rm -f *.$(OBJEXT) distclean-compile: --- 227,231 ---- mostlyclean-compile: ! -rm -f *.$(OBJEXT) core *.core distclean-compile: *************** *** 282,285 **** --- 235,239 ---- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ConfigEditor.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/MessagingTest.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Notepad.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/TestApp1.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/TestApp2.Po@am__quote@ *************** *** 289,325 **** @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/UnitTests-UnitTests.Po@am__quote@ .cpp.o: ! @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ ! @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi ! @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ ! @AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ ! @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ! @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $< .cpp.obj: ! @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \ ! @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi ! @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ ! @AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ ! @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ! @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` UnitTests-UnitTests.o: UnitTests.cpp ! @am__fastdepCXX_TRUE@ if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(UnitTests_CXXFLAGS) $(CXXFLAGS) -MT UnitTests-UnitTests.o -MD -MP -MF "$(DEPDIR)/UnitTests-UnitTests.Tpo" -c -o UnitTests-UnitTests.o `test -f 'UnitTests.cpp' || echo '$(srcdir)/'`UnitTests.cpp; \ ! @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/UnitTests-UnitTests.Tpo" "$(DEPDIR)/UnitTests-UnitTests.Po"; else rm -f "$(DEPDIR)/UnitTests-UnitTests.Tpo"; exit 1; fi ! @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='UnitTests.cpp' object='UnitTests-UnitTests.o' libtool=no @AMDEPBACKSLASH@ ! @AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/UnitTests-UnitTests.Po' tmpdepfile='$(DEPDIR)/UnitTests-UnitTests.TPo' @AMDEPBACKSLASH@ ! @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ! @am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(UnitTests_CXXFLAGS) $(CXXFLAGS) -c -o UnitTests-UnitTests.o `test -f 'UnitTests.cpp' || echo '$(srcdir)/'`UnitTests.cpp UnitTests-UnitTests.obj: UnitTests.cpp ! @am__fastdepCXX_TRUE@ if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(UnitTests_CXXFLAGS) $(CXXFLAGS) -MT UnitTests-UnitTests.obj -MD -MP -MF "$(DEPDIR)/UnitTests-UnitTests.Tpo" -c -o UnitTests-UnitTests.obj `if test -f 'UnitTests.cpp'; then $(CYGPATH_W) 'UnitTests.cpp'; else $(CYGPATH_W) '$(srcdir)/UnitTests.cpp'; fi`; \ ! @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/UnitTests-UnitTests.Tpo" "$(DEPDIR)/UnitTests-UnitTests.Po"; else rm -f "$(DEPDIR)/UnitTests-UnitTests.Tpo"; exit 1; fi ! @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='UnitTests.cpp' object='UnitTests-UnitTests.obj' libtool=no @AMDEPBACKSLASH@ ! @AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/UnitTests-UnitTests.Po' tmpdepfile='$(DEPDIR)/UnitTests-UnitTests.TPo' @AMDEPBACKSLASH@ ! @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ! @am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(UnitTests_CXXFLAGS) $(CXXFLAGS) -c -o UnitTests-UnitTests.obj `if test -f 'UnitTests.cpp'; then $(CYGPATH_W) 'UnitTests.cpp'; else $(CYGPATH_W) '$(srcdir)/UnitTests.cpp'; fi` uninstall-info-am: ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ --- 243,280 ---- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/UnitTests-UnitTests.Po@am__quote@ + distclean-depend: + -rm -rf ./$(DEPDIR) + .cpp.o: ! @AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ ! @AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ ! @AMDEP_TRUE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ! $(CXXCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< .cpp.obj: ! @AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ ! @AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ ! @AMDEP_TRUE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ! $(CXXCOMPILE) -c -o $@ `cygpath -w $<` UnitTests-UnitTests.o: UnitTests.cpp ! @AMDEP_TRUE@ source='UnitTests.cpp' object='UnitTests-UnitTests.o' libtool=no @AMDEPBACKSLASH@ ! @AMDEP_TRUE@ depfile='$(DEPDIR)/UnitTests-UnitTests.Po' tmpdepfile='$(DEPDIR)/UnitTests-UnitTests.TPo' @AMDEPBACKSLASH@ ! @AMDEP_TRUE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ! $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(UnitTests_CXXFLAGS) $(CXXFLAGS) -c -o UnitTests-UnitTests.o `test -f 'UnitTests.cpp' || echo '$(srcdir)/'`UnitTests.cpp UnitTests-UnitTests.obj: UnitTests.cpp ! @AMDEP_TRUE@ source='UnitTests.cpp' object='UnitTests-UnitTests.obj' libtool=no @AMDEPBACKSLASH@ ! @AMDEP_TRUE@ depfile='$(DEPDIR)/UnitTests-UnitTests.Po' tmpdepfile='$(DEPDIR)/UnitTests-UnitTests.TPo' @AMDEPBACKSLASH@ ! @AMDEP_TRUE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ! $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(UnitTests_CXXFLAGS) $(CXXFLAGS) -c -o UnitTests-UnitTests.obj `cygpath -w UnitTests.cpp` ! CXXDEPMODE = @CXXDEPMODE@ uninstall-info-am: + ETAGS = etags + ETAGSFLAGS = + + tags: TAGS + ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ *************** *** 330,334 **** END { for (i in files) print i; }'`; \ mkid -fID $$unique - tags: TAGS TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ --- 285,288 ---- *************** *** 345,362 **** || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ $$tags $$unique - ctags: CTAGS - CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ - here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - test -z "$(CTAGS_ARGS)$$tags$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$tags $$unique GTAGS: --- 299,302 ---- *************** *** 366,384 **** distclean-tags: ! -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags distdir: $(DISTFILES) ! @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ ! topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ ! list='$(DISTFILES)'; for file in $$list; do \ ! case $$file in \ ! $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ ! $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ ! esac; \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ if test "$$dir" != "$$file" && test "$$dir" != "."; then \ dir="/$$dir"; \ ! $(mkdir_p) "$(distdir)$$dir"; \ else \ dir=''; \ --- 306,322 ---- distclean-tags: ! -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH ! DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ! ! top_distdir = .. ! distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) ! @list='$(DISTFILES)'; for file in $$list; do \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ if test "$$dir" != "$$file" && test "$$dir" != "."; then \ dir="/$$dir"; \ ! $(mkinstalldirs) "$(distdir)$$dir"; \ else \ dir=''; \ *************** *** 398,402 **** --- 336,342 ---- check: check-am all-am: Makefile $(PROGRAMS) + installdirs: + install: install-am install-exec: install-exec-am *************** *** 410,414 **** install-strip: $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ ! install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ `test -z '$(STRIP)' || \ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install --- 350,354 ---- install-strip: $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ ! INSTALL_STRIP_FLAG=-s \ `test -z '$(STRIP)' || \ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install *************** *** 418,422 **** distclean-generic: ! -rm -f $(CONFIG_CLEAN_FILES) maintainer-clean-generic: --- 358,362 ---- distclean-generic: ! -rm -f Makefile $(CONFIG_CLEAN_FILES) maintainer-clean-generic: *************** *** 428,435 **** distclean: distclean-am ! -rm -rf ./$(DEPDIR) ! -rm -f Makefile ! distclean-am: clean-am distclean-compile distclean-generic \ ! distclean-tags dvi: dvi-am --- 368,374 ---- distclean: distclean-am ! ! distclean-am: clean-am distclean-compile distclean-depend \ ! distclean-generic distclean-tags dvi: dvi-am *************** *** 437,442 **** dvi-am: - html: html-am - info: info-am --- 376,379 ---- *************** *** 454,459 **** maintainer-clean: maintainer-clean-am ! -rm -rf ./$(DEPDIR) ! -rm -f Makefile maintainer-clean-am: distclean-am maintainer-clean-generic --- 391,395 ---- maintainer-clean: maintainer-clean-am ! maintainer-clean-am: distclean-am maintainer-clean-generic *************** *** 462,485 **** mostlyclean-am: mostlyclean-compile mostlyclean-generic - pdf: pdf-am - - pdf-am: - - ps: ps-am - - ps-am: - uninstall-am: uninstall-info-am ! .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ ! clean-noinstPROGRAMS ctags distclean distclean-compile \ ! distclean-generic distclean-tags distdir dvi dvi-am html \ ! html-am info info-am install install-am install-data \ install-data-am install-exec install-exec-am install-info \ install-info-am install-man install-strip installcheck \ installcheck-am installdirs maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-compile \ ! mostlyclean-generic pdf pdf-am ps ps-am tags uninstall \ ! uninstall-am uninstall-info-am # Tell versions [3.59,3.63) of GNU make to not export all variables. --- 398,413 ---- mostlyclean-am: mostlyclean-compile mostlyclean-generic uninstall-am: uninstall-info-am ! .PHONY: GTAGS all all-am check check-am clean clean-generic \ ! clean-noinstPROGRAMS distclean distclean-compile \ ! distclean-depend distclean-generic distclean-tags distdir dvi \ ! dvi-am info info-am install install-am install-data \ install-data-am install-exec install-exec-am install-info \ install-info-am install-man install-strip installcheck \ installcheck-am installdirs maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-compile \ ! mostlyclean-generic tags uninstall uninstall-am \ ! uninstall-info-am # Tell versions [3.59,3.63) of GNU make to not export all variables. |
|
From: Rob W. <gre...@us...> - 2004-04-20 18:56:08
|
Update of /cvsroot/wgui/wgui/includes In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29132/includes Modified Files: Makefile.in Log Message: Makefile fix. Index: Makefile.in =================================================================== RCS file: /cvsroot/wgui/wgui/includes/Makefile.in,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** Makefile.in 31 Mar 2004 08:15:06 -0000 1.17 --- Makefile.in 20 Apr 2004 18:55:22 -0000 1.18 *************** *** 1,7 **** ! # Makefile.in generated by automake 1.8.3 from Makefile.am. # @configure_input@ ! # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, ! # 2003, 2004 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, --- 1,7 ---- ! # Makefile.in generated by automake 1.6.3 from Makefile.am. # @configure_input@ ! # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 ! # Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, *************** *** 14,32 **** @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ top_builddir = .. am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd INSTALL = @INSTALL@ install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c INSTALL_HEADER = $(INSTALL_DATA) ! transform = $(program_transform_name) NORMAL_INSTALL = : PRE_INSTALL = : --- 14,57 ---- @SET_MAKE@ + SHELL = @SHELL@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ + prefix = @prefix@ + exec_prefix = @exec_prefix@ + + bindir = @bindir@ + sbindir = @sbindir@ + libexecdir = @libexecdir@ + datadir = @datadir@ + sysconfdir = @sysconfdir@ + sharedstatedir = @sharedstatedir@ + localstatedir = @localstatedir@ + libdir = @libdir@ + infodir = @infodir@ + mandir = @mandir@ + includedir = @includedir@ + oldincludedir = /usr/include pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ top_builddir = .. + + ACLOCAL = @ACLOCAL@ + AUTOCONF = @AUTOCONF@ + AUTOMAKE = @AUTOMAKE@ + AUTOHEADER = @AUTOHEADER@ + am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd INSTALL = @INSTALL@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_DATA = @INSTALL_DATA@ install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c + INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_HEADER = $(INSTALL_DATA) ! transform = @program_transform_name@ NORMAL_INSTALL = : PRE_INSTALL = : *************** *** 35,112 **** PRE_UNINSTALL = : POST_UNINSTALL = : ! host_triplet = @host@ ! subdir = includes ! DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ ! $(srcdir)/wgui_config.h.in ! ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 ! am__aclocal_m4_deps = $(top_srcdir)/configure.in ! am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ ! $(ACLOCAL_M4) ! mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs ! CONFIG_HEADER = wgui_config.h ! CONFIG_CLEAN_FILES = ! SOURCES = ! DIST_SOURCES = ! RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ ! html-recursive info-recursive install-data-recursive \ ! install-exec-recursive install-info-recursive \ ! install-recursive installcheck-recursive installdirs-recursive \ ! pdf-recursive ps-recursive uninstall-info-recursive \ ! uninstall-recursive ! am__installdirs = "$(DESTDIR)$(libwguiincludesdir)" ! libwguiincludesDATA_INSTALL = $(INSTALL_DATA) ! DATA = $(libwguiincludes_DATA) ! ETAGS = etags ! CTAGS = ctags ! DIST_SUBDIRS = $(SUBDIRS) ! DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ! ACLOCAL = @ACLOCAL@ ! AMDEP_FALSE = @AMDEP_FALSE@ ! AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ - AUTOCONF = @AUTOCONF@ - AUTOHEADER = @AUTOHEADER@ - AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ CC = @CC@ - CCDEPMODE = @CCDEPMODE@ - CFLAGS = @CFLAGS@ - CPP = @CPP@ - CPPFLAGS = @CPPFLAGS@ CXX = @CXX@ - CXXDEPMODE = @CXXDEPMODE@ - CXXFLAGS = @CXXFLAGS@ - CYGPATH_W = @CYGPATH_W@ - DEFS = @DEFS@ DEPDIR = @DEPDIR@ - ECHO_C = @ECHO_C@ - ECHO_N = @ECHO_N@ - ECHO_T = @ECHO_T@ - EGREP = @EGREP@ - EXEEXT = @EXEEXT@ - INSTALL_DATA = @INSTALL_DATA@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ - INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ - LDFLAGS = @LDFLAGS@ - LIBOBJS = @LIBOBJS@ - LIBS = @LIBS@ LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ - MAKEINFO = @MAKEINFO@ - OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ - PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ - PACKAGE_NAME = @PACKAGE_NAME@ - PACKAGE_STRING = @PACKAGE_STRING@ - PACKAGE_TARNAME = @PACKAGE_TARNAME@ - PACKAGE_VERSION = @PACKAGE_VERSION@ - PATH_SEPARATOR = @PATH_SEPARATOR@ RANLIB = @RANLIB@ SDL_CFLAGS = @SDL_CFLAGS@ SDL_CONFIG = @SDL_CONFIG@ SDL_LIBS = @SDL_LIBS@ - SET_MAKE = @SET_MAKE@ - SHELL = @SHELL@ STRIP = @STRIP@ VERSION = @VERSION@ --- 60,79 ---- PRE_UNINSTALL = : POST_UNINSTALL = : ! ! EXEEXT = @EXEEXT@ ! OBJEXT = @OBJEXT@ ! PATH_SEPARATOR = @PATH_SEPARATOR@ AMTAR = @AMTAR@ AWK = @AWK@ CC = @CC@ CXX = @CXX@ DEPDIR = @DEPDIR@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ LN_S = @LN_S@ PACKAGE = @PACKAGE@ RANLIB = @RANLIB@ SDL_CFLAGS = @SDL_CFLAGS@ SDL_CONFIG = @SDL_CONFIG@ SDL_LIBS = @SDL_LIBS@ STRIP = @STRIP@ VERSION = @VERSION@ *************** *** 118,165 **** WGUI_VERSION_MINOR = @WGUI_VERSION_MINOR@ WGUI_VERSION_REVISION = @WGUI_VERSION_REVISION@ - ac_ct_CC = @ac_ct_CC@ - ac_ct_CXX = @ac_ct_CXX@ - ac_ct_RANLIB = @ac_ct_RANLIB@ - ac_ct_STRIP = @ac_ct_STRIP@ - am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ - am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ - am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ - am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ am__include = @am__include@ - am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ - bindir = @bindir@ - build = @build@ - build_alias = @build_alias@ - build_cpu = @build_cpu@ - build_os = @build_os@ - build_vendor = @build_vendor@ - datadir = @datadir@ - exec_prefix = @exec_prefix@ freetype_config = @freetype_config@ - host = @host@ - host_alias = @host_alias@ - host_cpu = @host_cpu@ - host_os = @host_os@ - host_vendor = @host_vendor@ - includedir = @includedir@ - infodir = @infodir@ install_sh = @install_sh@ ! libdir = @libdir@ ! libexecdir = @libexecdir@ ! localstatedir = @localstatedir@ ! mandir = @mandir@ ! oldincludedir = @oldincludedir@ ! prefix = @prefix@ ! program_transform_name = @program_transform_name@ ! sbindir = @sbindir@ ! sharedstatedir = @sharedstatedir@ ! sysconfdir = @sysconfdir@ ! target = @target@ ! target_alias = @target_alias@ ! target_cpu = @target_cpu@ ! target_os = @target_os@ ! target_vendor = @target_vendor@ SUBDIRS = unit_tests libwguiincludesdir = ${prefix}/wGui/includes libwguiincludes_DATA = \ --- 85,95 ---- WGUI_VERSION_MINOR = @WGUI_VERSION_MINOR@ WGUI_VERSION_REVISION = @WGUI_VERSION_REVISION@ am__include = @am__include@ am__quote = @am__quote@ freetype_config = @freetype_config@ install_sh = @install_sh@ ! SUBDIRS = unit_tests + libwguiincludesdir = ${prefix}/wGui/includes libwguiincludes_DATA = \ *************** *** 204,243 **** wgui_win32_config.h \ wutil_config_store.h \ ! wutil_debug.h EXTRA_DIST = $(libwguiincludes_DATA) all: wgui_config.h $(MAKE) $(AM_MAKEFLAGS) all-recursive .SUFFIXES: ! $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) ! @for dep in $?; do \ ! case '$(am__configure_deps)' in \ ! *$$dep*) \ ! cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ ! && exit 0; \ ! exit 1;; \ ! esac; \ ! done; \ ! echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu includes/Makefile'; \ cd $(top_srcdir) && \ $(AUTOMAKE) --gnu includes/Makefile ! .PRECIOUS: Makefile ! Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status ! @case '$?' in \ ! *config.status*) \ ! cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ ! *) \ ! echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ ! cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ ! esac; ! ! $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) ! cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ! ! $(top_srcdir)/configure: $(am__configure_deps) ! cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ! $(ACLOCAL_M4): $(am__aclocal_m4_deps) ! cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh wgui_config.h: stamp-h1 --- 134,165 ---- wgui_win32_config.h \ wutil_config_store.h \ ! wutil_debug.h \ ! wutil_log.h ! EXTRA_DIST = $(libwguiincludes_DATA) + subdir = includes + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs + CONFIG_HEADER = wgui_config.h + CONFIG_CLEAN_FILES = + DIST_SOURCES = + DATA = $(libwguiincludes_DATA) + + + RECURSIVE_TARGETS = info-recursive dvi-recursive install-info-recursive \ + uninstall-info-recursive all-recursive install-data-recursive \ + install-exec-recursive installdirs-recursive install-recursive \ + uninstall-recursive check-recursive installcheck-recursive + DIST_COMMON = Makefile.am Makefile.in wgui_config.h.in + DIST_SUBDIRS = $(SUBDIRS) all: wgui_config.h $(MAKE) $(AM_MAKEFLAGS) all-recursive .SUFFIXES: ! $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && \ $(AUTOMAKE) --gnu includes/Makefile ! Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status ! cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) wgui_config.h: stamp-h1 *************** *** 250,269 **** @rm -f stamp-h1 cd $(top_builddir) && $(SHELL) ./config.status includes/wgui_config.h ! $(srcdir)/wgui_config.h.in: $(am__configure_deps) $(top_srcdir)/acconfig.h cd $(top_srcdir) && $(AUTOHEADER) ! rm -f stamp-h1 ! touch $@ distclean-hdr: -rm -f wgui_config.h stamp-h1 uninstall-info-am: install-libwguiincludesDATA: $(libwguiincludes_DATA) @$(NORMAL_INSTALL) ! test -z "$(libwguiincludesdir)" || $(mkdir_p) "$(DESTDIR)$(libwguiincludesdir)" @list='$(libwguiincludes_DATA)'; for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ f="`echo $$p | sed -e 's|^.*/||'`"; \ ! echo " $(libwguiincludesDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(libwguiincludesdir)/$$f'"; \ ! $(libwguiincludesDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(libwguiincludesdir)/$$f"; \ done --- 172,192 ---- @rm -f stamp-h1 cd $(top_builddir) && $(SHELL) ./config.status includes/wgui_config.h ! ! $(srcdir)/wgui_config.h.in: $(top_srcdir)/configure.in $(ACLOCAL_M4) $(top_srcdir)/acconfig.h cd $(top_srcdir) && $(AUTOHEADER) ! touch $(srcdir)/wgui_config.h.in distclean-hdr: -rm -f wgui_config.h stamp-h1 uninstall-info-am: + libwguiincludesDATA_INSTALL = $(INSTALL_DATA) install-libwguiincludesDATA: $(libwguiincludes_DATA) @$(NORMAL_INSTALL) ! $(mkinstalldirs) $(DESTDIR)$(libwguiincludesdir) @list='$(libwguiincludes_DATA)'; for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ f="`echo $$p | sed -e 's|^.*/||'`"; \ ! echo " $(libwguiincludesDATA_INSTALL) $$d$$p $(DESTDIR)$(libwguiincludesdir)/$$f"; \ ! $(libwguiincludesDATA_INSTALL) $$d$$p $(DESTDIR)$(libwguiincludesdir)/$$f; \ done *************** *** 272,277 **** @list='$(libwguiincludes_DATA)'; for p in $$list; do \ f="`echo $$p | sed -e 's|^.*/||'`"; \ ! echo " rm -f '$(DESTDIR)$(libwguiincludesdir)/$$f'"; \ ! rm -f "$(DESTDIR)$(libwguiincludesdir)/$$f"; \ done --- 195,200 ---- @list='$(libwguiincludes_DATA)'; for p in $$list; do \ f="`echo $$p | sed -e 's|^.*/||'`"; \ ! echo " rm -f $(DESTDIR)$(libwguiincludesdir)/$$f"; \ ! rm -f $(DESTDIR)$(libwguiincludesdir)/$$f; \ done *************** *** 330,337 **** test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ done ! ctags-recursive: ! list='$(SUBDIRS)'; for subdir in $$list; do \ ! test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ ! done ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) --- 253,261 ---- test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ done ! ! ETAGS = etags ! ETAGSFLAGS = ! ! tags: TAGS ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) *************** *** 343,347 **** END { for (i in files) print i; }'`; \ mkid -fID $$unique - tags: TAGS TAGS: tags-recursive $(HEADERS) $(SOURCES) wgui_config.h.in $(TAGS_DEPENDENCIES) \ --- 267,270 ---- *************** *** 349,361 **** tags=; \ here=`pwd`; \ - if (etags --etags-include --version) >/dev/null 2>&1; then \ - include_option=--etags-include; \ - else \ - include_option=--include; \ - fi; \ list='$(SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ ! test -f $$subdir/TAGS && \ ! tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ --- 272,278 ---- tags=; \ here=`pwd`; \ list='$(SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ ! test -f $$subdir/TAGS && tags="$$tags -i $$here/$$subdir/TAGS"; \ fi; \ done; \ *************** *** 369,386 **** || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ $$tags $$unique - ctags: CTAGS - CTAGS: ctags-recursive $(HEADERS) $(SOURCES) wgui_config.h.in $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ - here=`pwd`; \ - list='$(SOURCES) $(HEADERS) wgui_config.h.in $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - test -z "$(CTAGS_ARGS)$$tags$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$tags $$unique GTAGS: --- 286,289 ---- *************** *** 390,408 **** distclean-tags: ! -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags distdir: $(DISTFILES) ! @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ ! topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ ! list='$(DISTFILES)'; for file in $$list; do \ ! case $$file in \ ! $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ ! $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ ! esac; \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ if test "$$dir" != "$$file" && test "$$dir" != "."; then \ dir="/$$dir"; \ ! $(mkdir_p) "$(distdir)$$dir"; \ else \ dir=''; \ --- 293,309 ---- distclean-tags: ! -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH ! DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ! ! top_distdir = .. ! distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) ! @list='$(DISTFILES)'; for file in $$list; do \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ if test "$$dir" != "$$file" && test "$$dir" != "."; then \ dir="/$$dir"; \ ! $(mkinstalldirs) "$(distdir)$$dir"; \ else \ dir=''; \ *************** *** 421,431 **** list='$(SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ ! test -d "$(distdir)/$$subdir" \ ! || mkdir "$(distdir)/$$subdir" \ || exit 1; \ (cd $$subdir && \ $(MAKE) $(AM_MAKEFLAGS) \ ! top_distdir="../$(top_distdir)" \ ! distdir="../$(distdir)/$$subdir" \ distdir) \ || exit 1; \ --- 322,332 ---- list='$(SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ ! test -d $(distdir)/$$subdir \ ! || mkdir $(distdir)/$$subdir \ || exit 1; \ (cd $$subdir && \ $(MAKE) $(AM_MAKEFLAGS) \ ! top_distdir="$(top_distdir)" \ ! distdir=../$(distdir)/$$subdir \ distdir) \ || exit 1; \ *************** *** 437,443 **** installdirs: installdirs-recursive installdirs-am: ! for dir in "$(DESTDIR)$(libwguiincludesdir)"; do \ ! test -z "$$dir" || $(mkdir_p) "$$dir"; \ ! done install: install-recursive install-exec: install-exec-recursive --- 338,343 ---- installdirs: installdirs-recursive installdirs-am: ! $(mkinstalldirs) $(DESTDIR)$(libwguiincludesdir) ! install: install-recursive install-exec: install-exec-recursive *************** *** 451,455 **** install-strip: $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ ! install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ `test -z '$(STRIP)' || \ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install --- 351,355 ---- install-strip: $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ ! INSTALL_STRIP_FLAG=-s \ `test -z '$(STRIP)' || \ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install *************** *** 459,463 **** distclean-generic: ! -rm -f $(CONFIG_CLEAN_FILES) maintainer-clean-generic: --- 359,363 ---- distclean-generic: ! -rm -f Makefile $(CONFIG_CLEAN_FILES) maintainer-clean-generic: *************** *** 469,473 **** distclean: distclean-recursive ! -rm -f Makefile distclean-am: clean-am distclean-generic distclean-hdr distclean-tags --- 369,373 ---- distclean: distclean-recursive ! distclean-am: clean-am distclean-generic distclean-hdr distclean-tags *************** *** 476,481 **** dvi-am: - html: html-recursive - info: info-recursive --- 376,379 ---- *************** *** 493,497 **** maintainer-clean: maintainer-clean-recursive ! -rm -f Makefile maintainer-clean-am: distclean-am maintainer-clean-generic --- 391,395 ---- maintainer-clean: maintainer-clean-recursive ! maintainer-clean-am: distclean-am maintainer-clean-generic *************** *** 500,528 **** mostlyclean-am: mostlyclean-generic - pdf: pdf-recursive - - pdf-am: - - ps: ps-recursive - - ps-am: - uninstall-am: uninstall-info-am uninstall-libwguiincludesDATA uninstall-info: uninstall-info-recursive ! .PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \ ! clean clean-generic clean-recursive ctags ctags-recursive \ ! distclean distclean-generic distclean-hdr distclean-recursive \ ! distclean-tags distdir dvi dvi-am html html-am info info-am \ ! install install-am install-data install-data-am install-exec \ ! install-exec-am install-info install-info-am \ ! install-libwguiincludesDATA install-man install-strip \ ! installcheck installcheck-am installdirs installdirs-am \ ! maintainer-clean maintainer-clean-generic \ ! maintainer-clean-recursive mostlyclean mostlyclean-generic \ ! mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \ uninstall uninstall-am uninstall-info-am \ ! uninstall-libwguiincludesDATA # Tell versions [3.59,3.63) of GNU make to not export all variables. --- 398,420 ---- mostlyclean-am: mostlyclean-generic uninstall-am: uninstall-info-am uninstall-libwguiincludesDATA uninstall-info: uninstall-info-recursive ! .PHONY: $(RECURSIVE_TARGETS) GTAGS all all-am check check-am clean \ ! clean-generic clean-recursive distclean distclean-generic \ ! distclean-hdr distclean-recursive distclean-tags distdir dvi \ ! dvi-am dvi-recursive info info-am info-recursive install \ ! install-am install-data install-data-am install-data-recursive \ ! install-exec install-exec-am install-exec-recursive \ ! install-info install-info-am install-info-recursive \ ! install-libwguiincludesDATA install-man install-recursive \ ! install-strip installcheck installcheck-am installdirs \ ! installdirs-am installdirs-recursive maintainer-clean \ ! maintainer-clean-generic maintainer-clean-recursive mostlyclean \ ! mostlyclean-generic mostlyclean-recursive tags tags-recursive \ uninstall uninstall-am uninstall-info-am \ ! uninstall-info-recursive uninstall-libwguiincludesDATA \ ! uninstall-recursive # Tell versions [3.59,3.63) of GNU make to not export all variables. |
|
From: Rob W. <gre...@us...> - 2004-04-20 18:56:08
|
Update of /cvsroot/wgui/wgui/docs/tutorial/Calc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29132/docs/tutorial/Calc Modified Files: Makefile Log Message: Makefile fix. Index: Makefile =================================================================== RCS file: /cvsroot/wgui/wgui/docs/tutorial/Calc/Makefile,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Makefile 7 Apr 2004 16:16:01 -0000 1.2 --- Makefile 20 Apr 2004 18:55:18 -0000 1.3 *************** *** 20,24 **** INCLUDES = -I/usr/include/freetype2 -I../../../includes ! LIBS = -L../../../lib -lwguid -lfreetype `sdl-config --libs` CPPFLAGS = -Wall -O0 -g -DDEBUG `sdl-config --cflags` --- 20,24 ---- INCLUDES = -I/usr/include/freetype2 -I../../../includes ! LIBS = -L../../../src -lwguid -lfreetype `sdl-config --libs` CPPFLAGS = -Wall -O0 -g -DDEBUG `sdl-config --cflags` |
|
From: Rob W. <gre...@us...> - 2004-04-20 18:56:08
|
Update of /cvsroot/wgui/wgui/docs/tutorial/Bullseye In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29132/docs/tutorial/Bullseye Modified Files: Makefile Log Message: Makefile fix. Index: Makefile =================================================================== RCS file: /cvsroot/wgui/wgui/docs/tutorial/Bullseye/Makefile,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** Makefile 20 Apr 2004 18:38:09 -0000 1.4 --- Makefile 20 Apr 2004 18:55:17 -0000 1.5 *************** *** 20,24 **** INCLUDES = -I/usr/include/freetype2 -I../../../includes ! LIBS = -L../../../lib -lwguid -lfreetype `sdl-config --libs` CPPFLAGS = -Wall -O0 -g -DDEBUG `sdl-config --cflags` --- 20,24 ---- INCLUDES = -I/usr/include/freetype2 -I../../../includes ! LIBS = -L../../../src -lwguid -lfreetype `sdl-config --libs` CPPFLAGS = -Wall -O0 -g -DDEBUG `sdl-config --cflags` |
