From c44a5c0a480d44f66fb030b429dc87de005810e1 Mon Sep 17 00:00:00 2001 From: andi75 Date: Sat, 12 Jul 2003 19:34:28 +0000 Subject: [PATCH] changes for make dist git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@134 7f0cb862-5218-0410-a997-914c9d46530a --- .gitattributes | 6 ++++++ freeglut/freeglut/Makefile.am | 10 +++++++--- freeglut/freeglut/configure.in | 14 +++++++++++++- freeglut/freeglut/doc/Makefile.am | 4 ++++ freeglut/freeglut/include/GL/Makefile.am | 6 ++---- freeglut/freeglut/progs/Makefile.am | 1 + freeglut/freeglut/progs/demos/Fractals/Makefile.am | 1 + .../progs/demos/Fractals_random/Makefile.am | 1 + freeglut/freeglut/progs/demos/Lorenz/Makefile.am | 1 + freeglut/freeglut/progs/demos/Makefile.am | 1 + freeglut/freeglut/progs/demos/One/Makefile.am | 7 +------ freeglut/freeglut/src/Makefile.am | 2 +- 12 files changed, 39 insertions(+), 15 deletions(-) create mode 100644 freeglut/freeglut/doc/Makefile.am create mode 100644 freeglut/freeglut/progs/Makefile.am create mode 100644 freeglut/freeglut/progs/demos/Fractals/Makefile.am create mode 100644 freeglut/freeglut/progs/demos/Fractals_random/Makefile.am create mode 100644 freeglut/freeglut/progs/demos/Lorenz/Makefile.am create mode 100644 freeglut/freeglut/progs/demos/Makefile.am diff --git a/.gitattributes b/.gitattributes index 1a3b69e..8497758 100644 --- a/.gitattributes +++ b/.gitattributes @@ -10,6 +10,7 @@ freeglut/freeglut/TODO svn_keywords=Author+Date+Id+Revision freeglut/freeglut/acconfig.h svn_keywords=Author+Date+Id+Revision freeglut/freeglut/autogen.sh svn_keywords=Author+Date+Id+Revision freeglut/freeglut/configure.in svn_keywords=Author+Date+Id+Revision +freeglut/freeglut/doc/Makefile.am svn_keywords=Author+Date+Id+Revision freeglut/freeglut/doc/download.html svn_keywords=Author+Date+Id+Revision freeglut/freeglut/doc/freeglut.html svn_keywords=Author+Date+Id+Revision freeglut/freeglut/doc/freeglut_logo.png -text @@ -62,14 +63,19 @@ freeglut/freeglut/include/GL/glut.h svn_keywords=Author+Date+Id+Revision freeglut/freeglut/include/Makefile.am svn_keywords=Author+Date+Id+Revision freeglut/freeglut/install-sh svn_keywords=Author+Date+Id+Revision freeglut/freeglut/mkinstalldirs svn_keywords=Author+Date+Id+Revision +freeglut/freeglut/progs/Makefile.am svn_keywords=Author+Date+Id+Revision freeglut/freeglut/progs/demos/Fractals/Fractals.dsp svn_keywords=Author+Date+Id+Revision +freeglut/freeglut/progs/demos/Fractals/Makefile.am svn_keywords=Author+Date+Id+Revision freeglut/freeglut/progs/demos/Fractals/fractals.c svn_keywords=Author+Date+Id+Revision freeglut/freeglut/progs/demos/Fractals/fractals.dat svn_keywords=Author+Date+Id+Revision freeglut/freeglut/progs/demos/Fractals_random/Fractals_random.dsp svn_keywords=Author+Date+Id+Revision +freeglut/freeglut/progs/demos/Fractals_random/Makefile.am svn_keywords=Author+Date+Id+Revision freeglut/freeglut/progs/demos/Fractals_random/fractals.dat svn_keywords=Author+Date+Id+Revision freeglut/freeglut/progs/demos/Fractals_random/fractals_random.c svn_keywords=Author+Date+Id+Revision +freeglut/freeglut/progs/demos/Lorenz/Makefile.am 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/Makefile.am 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/progs/demos/One/one.dsp svn_keywords=Author+Date+Id+Revision diff --git a/freeglut/freeglut/Makefile.am b/freeglut/freeglut/Makefile.am index 93f606d..d91adc2 100644 --- a/freeglut/freeglut/Makefile.am +++ b/freeglut/freeglut/Makefile.am @@ -1,7 +1,11 @@ ## Process this file with automake to produce makefile.im -SUBDIRS = src include +SUBDIRS = src include progs doc AUTOMAKE_OPTIONS = gnu -EXTRA_DIST = AUTHORS COPYING ChangeLog INSTALL NEWS README TODO freeglut.lsm \ - freeglut.kdevprj +EXTRA_DIST = \ + AUTHORS COPYING ChangeLog INSTALL NEWS README TODO \ + freeglut.lsm autogen.sh \ + freeglut.kdevprj freeglut.kdevelop \ + freeglut.dsp freeglut.dsw + diff --git a/freeglut/freeglut/configure.in b/freeglut/freeglut/configure.in index 6c81ed7..76c33dd 100644 --- a/freeglut/freeglut/configure.in +++ b/freeglut/freeglut/configure.in @@ -27,4 +27,16 @@ dnl Checks for library functions. AC_CHECK_LIBM AC_SUBST(LIBM) -AC_OUTPUT(Makefile src/Makefile include/Makefile include/GL/Makefile) +AC_OUTPUT(\ + Makefile \ + doc/Makefile \ + progs/Makefile \ + progs/demos/Makefile \ + progs/demos/Fractals/Makefile \ + progs/demos/Fractals_random/Makefile \ + progs/demos/Lorenz/Makefile \ + progs/demos/One/Makefile \ + src/Makefile \ + include/Makefile \ + include/GL/Makefile \ + ) diff --git a/freeglut/freeglut/doc/Makefile.am b/freeglut/freeglut/doc/Makefile.am new file mode 100644 index 0000000..a2774ee --- /dev/null +++ b/freeglut/freeglut/doc/Makefile.am @@ -0,0 +1,4 @@ +EXTRA_DIST = \ + download.html freeglut.html freeglut_logo.png \ + freeglut_user_interface.html index.html \ + ogl_sm.png progress.html structure.html \ diff --git a/freeglut/freeglut/include/GL/Makefile.am b/freeglut/freeglut/include/GL/Makefile.am index 03d5ace..418f874 100644 --- a/freeglut/freeglut/include/GL/Makefile.am +++ b/freeglut/freeglut/include/GL/Makefile.am @@ -1,7 +1,5 @@ ## Process this file with automake to produce Makefile.in -GLincludedir = $(includedir)/GL - -EXTRA_DIST = freeglut.h freeglut_internal.h -GLinclude_HEADERS = freeglut.h freeglut_ext.h glut.h +libfreeglutincludedir = $(includedir)/GL +libfreeglutinclude_HEADERS = freeglut.h freeglut_ext.h glut.h diff --git a/freeglut/freeglut/progs/Makefile.am b/freeglut/freeglut/progs/Makefile.am new file mode 100644 index 0000000..7cb8ff3 --- /dev/null +++ b/freeglut/freeglut/progs/Makefile.am @@ -0,0 +1 @@ +SUBDIRS = demos diff --git a/freeglut/freeglut/progs/demos/Fractals/Makefile.am b/freeglut/freeglut/progs/demos/Fractals/Makefile.am new file mode 100644 index 0000000..07be96a --- /dev/null +++ b/freeglut/freeglut/progs/demos/Fractals/Makefile.am @@ -0,0 +1 @@ +EXTRA_DIST = Fractals.dsp fractals.c fractals.dat diff --git a/freeglut/freeglut/progs/demos/Fractals_random/Makefile.am b/freeglut/freeglut/progs/demos/Fractals_random/Makefile.am new file mode 100644 index 0000000..b6d52fb --- /dev/null +++ b/freeglut/freeglut/progs/demos/Fractals_random/Makefile.am @@ -0,0 +1 @@ +EXTRA_DIST = Fractals_random.dsp fractals.dat fractals_random.c diff --git a/freeglut/freeglut/progs/demos/Lorenz/Makefile.am b/freeglut/freeglut/progs/demos/Lorenz/Makefile.am new file mode 100644 index 0000000..3a3a194 --- /dev/null +++ b/freeglut/freeglut/progs/demos/Lorenz/Makefile.am @@ -0,0 +1 @@ +EXTRA_DIST = lorenz.c lorenz.dsp diff --git a/freeglut/freeglut/progs/demos/Makefile.am b/freeglut/freeglut/progs/demos/Makefile.am new file mode 100644 index 0000000..78c22d2 --- /dev/null +++ b/freeglut/freeglut/progs/demos/Makefile.am @@ -0,0 +1 @@ +SUBDIRS = Fractals Fractals_random Lorenz One diff --git a/freeglut/freeglut/progs/demos/One/Makefile.am b/freeglut/freeglut/progs/demos/One/Makefile.am index ce09b09..1aa0c36 100644 --- a/freeglut/freeglut/progs/demos/One/Makefile.am +++ b/freeglut/freeglut/progs/demos/One/Makefile.am @@ -1,6 +1 @@ -## Process this file with automake to produce Makefile.im - -bin_PROGRAMS = one -one_SOURCES = one.c -one_LDFLAGS = -export-dynamic -dlpreopen ../src/libfreeglut-2.0.la - +EXTRA_DIST = one.c one.dsp diff --git a/freeglut/freeglut/src/Makefile.am b/freeglut/freeglut/src/Makefile.am index 00bf384..ed623ab 100644 --- a/freeglut/freeglut/src/Makefile.am +++ b/freeglut/freeglut/src/Makefile.am @@ -5,6 +5,7 @@ # lib_LTLIBRARIES = libfreeglut.la +noinst_HEADERS = freeglut_internal.h # # Those source files build the freeglut library # @@ -30,7 +31,6 @@ libfreeglut_la_SOURCES = freeglut_callbacks.c \ freeglut_videoresize.c \ freeglut_window.c - # # Additional linker flags #