changes for make dist

git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@134 7f0cb862-5218-0410-a997-914c9d46530a

diff --git a/Makefile.am b/Makefile.am
index 93f606d..d91adc2 100644 (file)
--- a/Makefile.am
+++ b/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/configure.in b/configure.in
index 6c81ed7..76c33dd 100644 (file)
--- a/configure.in
+++ b/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/doc/Makefile.am b/doc/Makefile.am
new file mode 100644 (file)
index 0000000..a2774ee
--- /dev/null
+++ b/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/include/GL/Makefile.am b/include/GL/Makefile.am
index 03d5ace..418f874 100644 (file)
--- a/include/GL/Makefile.am
+++ b/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/progs/Makefile.am b/progs/Makefile.am
new file mode 100644 (file)
index 0000000..7cb8ff3
--- /dev/null
+++ b/progs/Makefile.am
@@ -0,0 +1 @@
+SUBDIRS = demos

diff --git a/progs/demos/Fractals/Makefile.am b/progs/demos/Fractals/Makefile.am
new file mode 100644 (file)
index 0000000..07be96a
--- /dev/null
+++ b/progs/demos/Fractals/Makefile.am
@@ -0,0 +1 @@
+EXTRA_DIST = Fractals.dsp fractals.c fractals.dat

diff --git a/progs/demos/Fractals_random/Makefile.am b/progs/demos/Fractals_random/Makefile.am
new file mode 100644 (file)
index 0000000..b6d52fb
--- /dev/null
+++ b/progs/demos/Fractals_random/Makefile.am
@@ -0,0 +1 @@
+EXTRA_DIST = Fractals_random.dsp fractals.dat fractals_random.c

diff --git a/progs/demos/Lorenz/Makefile.am b/progs/demos/Lorenz/Makefile.am
new file mode 100644 (file)
index 0000000..3a3a194
--- /dev/null
+++ b/progs/demos/Lorenz/Makefile.am
@@ -0,0 +1 @@
+EXTRA_DIST = lorenz.c lorenz.dsp

diff --git a/progs/demos/Makefile.am b/progs/demos/Makefile.am
new file mode 100644 (file)
index 0000000..78c22d2
--- /dev/null
+++ b/progs/demos/Makefile.am
@@ -0,0 +1 @@
+SUBDIRS = Fractals Fractals_random Lorenz One

diff --git a/progs/demos/One/Makefile.am b/progs/demos/One/Makefile.am
index ce09b09..1aa0c36 100644 (file)
--- a/progs/demos/One/Makefile.am
+++ b/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/src/Makefile.am b/src/Makefile.am
index 00bf384..ed623ab 100644 (file)
--- a/src/Makefile.am
+++ b/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
 #