[Wgui-cvs] wgui Makefile.am,1.8,1.9 Makefile.in,1.21,1.22 configure,1.17,1.18 configure.in,1.13,1.14

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

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)