From 2f6a51442c5a79de9770fec465edbeecb2dda0dd Mon Sep 17 00:00:00 2001 From: sandalle Date: Wed, 2 Jul 2003 15:28:13 +0000 Subject: [PATCH] * Removed genfonts/genstrokes code, updated configure.in and Makefile.in * Moved tests/one.c into progs/demos/One/one.c, updated configure.in and Makefile.in git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@120 7f0cb862-5218-0410-a997-914c9d46530a --- .gitattributes | 4 ++-- freeglut/freeglut/ChangeLog | 9 +++++++++ freeglut/freeglut/Makefile.am | 2 +- freeglut/freeglut/configure.in | 2 +- freeglut/freeglut/{tests => progs/demos/One}/Makefile.am | 0 freeglut/freeglut/{tests => progs/demos/One}/one.c | 0 6 files changed, 13 insertions(+), 4 deletions(-) rename freeglut/freeglut/{tests => progs/demos/One}/Makefile.am (100%) rename freeglut/freeglut/{tests => progs/demos/One}/one.c (100%) diff --git a/.gitattributes b/.gitattributes index c1b8284..e2e3330 100644 --- a/.gitattributes +++ b/.gitattributes @@ -71,6 +71,8 @@ freeglut/freeglut/progs/demos/Fractals_random/fractals.dat svn_keywords=Author+D freeglut/freeglut/progs/demos/Fractals_random/fractals_random.c svn_keywords=Author+Date+Id+Revision freeglut/freeglut/progs/demos/Lorenz/lorenz.c svn_keywords=Author+Date+Id+Revision freeglut/freeglut/progs/demos/Lorenz/lorenz.dsp svn_keywords=Author+Date+Id+Revision +freeglut/freeglut/progs/demos/One/Makefile.am svn_keywords=Author+Date+Id+Revision +freeglut/freeglut/progs/demos/One/one.c svn_keywords=Author+Date+Id+Revision freeglut/freeglut/src/Makefile.am svn_keywords=Author+Date+Id+Revision freeglut/freeglut/src/freeglut_callbacks.c svn_keywords=Author+Date+Id+Revision freeglut/freeglut/src/freeglut_cursor.c svn_keywords=Author+Date+Id+Revision @@ -99,5 +101,3 @@ freeglut/freeglut/src/templates/cpp_template svn_keywords=Author+Date+Id+Revisio freeglut/freeglut/src/templates/header_template svn_keywords=Author+Date+Id+Revision freeglut/freeglut/stamp-h svn_keywords=Author+Date+Id+Revision freeglut/freeglut/stamp-h.in svn_keywords=Author+Date+Id+Revision -freeglut/freeglut/tests/Makefile.am svn_keywords=Author+Date+Id+Revision -freeglut/freeglut/tests/one.c svn_keywords=Author+Date+Id+Revision diff --git a/freeglut/freeglut/ChangeLog b/freeglut/freeglut/ChangeLog index 642e178..fe594d9 100644 --- a/freeglut/freeglut/ChangeLog +++ b/freeglut/freeglut/ChangeLog @@ -198,3 +198,12 @@ October 24, 2002: ******************************************************************************************* (84) Fixed the 'ptr + len' problem in freeglut_misc.c:90 + + +******************************************************************************************* +* Changes on 02 July 2003 +******************************************************************************************* + +(85) Removed genfonts/genstrokes code, updated configure.in and Makefile.in + +(86) Moved tests/one.c into progs/demos/One/one.c, updated configure.in and Makefile.in diff --git a/freeglut/freeglut/Makefile.am b/freeglut/freeglut/Makefile.am index fdc20d9..93f606d 100644 --- a/freeglut/freeglut/Makefile.am +++ b/freeglut/freeglut/Makefile.am @@ -1,6 +1,6 @@ ## Process this file with automake to produce makefile.im -SUBDIRS = src include genfonts tests +SUBDIRS = src include AUTOMAKE_OPTIONS = gnu EXTRA_DIST = AUTHORS COPYING ChangeLog INSTALL NEWS README TODO freeglut.lsm \ diff --git a/freeglut/freeglut/configure.in b/freeglut/freeglut/configure.in index ce5c570..6c81ed7 100644 --- a/freeglut/freeglut/configure.in +++ b/freeglut/freeglut/configure.in @@ -27,4 +27,4 @@ dnl Checks for library functions. AC_CHECK_LIBM AC_SUBST(LIBM) -AC_OUTPUT(Makefile src/Makefile include/Makefile include/GL/Makefile genfonts/Makefile tests/Makefile ) +AC_OUTPUT(Makefile src/Makefile include/Makefile include/GL/Makefile) diff --git a/freeglut/freeglut/tests/Makefile.am b/freeglut/freeglut/progs/demos/One/Makefile.am similarity index 100% rename from freeglut/freeglut/tests/Makefile.am rename to freeglut/freeglut/progs/demos/One/Makefile.am diff --git a/freeglut/freeglut/tests/one.c b/freeglut/freeglut/progs/demos/One/one.c similarity index 100% rename from freeglut/freeglut/tests/one.c rename to freeglut/freeglut/progs/demos/One/one.c