Add more files to gitignore, recover Makefile.am

diff --git a/.gitignore b/.gitignore
index 383cdbed504f68a29dd34aeab7acf9a9682f4ed1..7a7a9121dd3ebd9791c07a18548ea2e336b11343 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,14 +1,10 @@
+configure
+aclocal.m4
+configure
+Makefile.in
 Makefile
-build-stamp
-config.cache
+autom4te.cache
 config.h
 config.log
 config.status
-configure-stamp
-stamp-h
-stamp-h.in
-docs
-autom4te.cache
-
-depcomp
 stamp-h1

diff --git a/Makefile.am b/Makefile.am
new file mode 100644 (file)
index 0000000..93a7c98
--- /dev/null
+++ b/Makefile.am
@@ -0,0 +1,34 @@
+if INCLUDED_GETOPT_LONG
+EXTRA_DIRS1=getopt
+else
+EXTRA_DIRS1=
+endif
+
+if HAVE_SGP
+EXTRA_DIRS2=libctgraphics
+else
+EXTRA_DIRS2=
+endif
+
+if HAVE_WXWINDOWS
+EXTRA_DIRS3=src
+else
+EXTRA_DIRS3=
+endif
+
+SUBDIRS=man libctsupport libctsim  html cgi-bin include $(EXTRA_DIRS1) $(EXTRA_DIRS2) $(EXTRA_DIRS3) tools helical
+
+EXTRA_DIST=acsite.m4 make.bat msvc/ctsim.dsw msvc/ctsimtext/ctsimtext.dsp msvc/libctsim/libctsim.dsp msvc/ctsim/ctsim.dsp
+
+CLEANFILES=docs/html/\* config.log config.status configure.in config.h stamp-h1
+clean-local:
+       rm -rf docs/html
+
+#install-data-hook:
+#      test -d $(datadir) || mkdir -p $(datadir) && chmod 0755 $(datadir)
+#      install -g root -o root -m 0644 docs/ctsim.htb $(datadir)
+
+
+
+
+

diff --git a/getopt/.gitignore b/getopt/.gitignore
index d55e99c299f4e78f1e832f4b0a50e1ac7c338580..2cc50296b63afc39f1835dab912b27e4bf196af2 100644 (file)
--- a/getopt/.gitignore
+++ b/getopt/.gitignore
@@ -1,3 +1,5 @@
 *.o
 .deps
 lib*.a
+Makefile.in
+Makefile

diff --git a/helical/.gitignore b/helical/.gitignore
index 8b5953c7f99bca69ad6bda5f47f3d59bd068c7c4..d956df5d1d8dc33e045a70fb898bc820de1cde78 100644 (file)
--- a/helical/.gitignore
+++ b/helical/.gitignore
@@ -1,2 +1,3 @@
 sample-helical.sh
 Makefile
+Makefile.in

diff --git a/libctgraphics/.gitignore b/libctgraphics/.gitignore
index d55e99c299f4e78f1e832f4b0a50e1ac7c338580..41c59bb31c051cb37dbd6dbe9f47ed7b9c8db482 100644 (file)
--- a/libctgraphics/.gitignore
+++ b/libctgraphics/.gitignore
@@ -1,3 +1,4 @@
 *.o
 .deps
 lib*.a
+Makefile.in

diff --git a/libctsim/.gitignore b/libctsim/.gitignore
index d55e99c299f4e78f1e832f4b0a50e1ac7c338580..2cc50296b63afc39f1835dab912b27e4bf196af2 100644 (file)
--- a/libctsim/.gitignore
+++ b/libctsim/.gitignore
@@ -1,3 +1,5 @@
 *.o
 .deps
 lib*.a
+Makefile.in
+Makefile

diff --git a/libctsupport/.gitignore b/libctsupport/.gitignore
index d55e99c299f4e78f1e832f4b0a50e1ac7c338580..41c59bb31c051cb37dbd6dbe9f47ed7b9c8db482 100644 (file)
--- a/libctsupport/.gitignore
+++ b/libctsupport/.gitignore
@@ -1,3 +1,4 @@
 *.o
 .deps
 lib*.a
+Makefile.in

diff --git a/man/.gitignore b/man/.gitignore
index f3c7a7c5da68804a1bdf391127ba34aed33c3cca..282522db0342d8750454b3dc162493b5fc709cc8 100644 (file)
--- a/man/.gitignore
+++ b/man/.gitignore
@@ -1 +1,2 @@
 Makefile
+Makefile.in

diff --git a/src/.gitignore b/src/.gitignore
index 8e78d6fda90188ea4323df3ea14a7e46734e1fa7..b549d092788ac5352fdf1f7a012a0b529e4b8782 100644 (file)
--- a/src/.gitignore
+++ b/src/.gitignore
@@ -1,3 +1,5 @@
 .deps
 *.o
 ctsim
+Makefile.in
+Makefile

diff --git a/tools/.gitignore b/tools/.gitignore
index a0e02787acd6f07cfbb1872b7154f53f5e393cf5..06963b93b6cb2b334551bae4cd4c08a3a0e4ba43 100644 (file)
--- a/tools/.gitignore
+++ b/tools/.gitignore
@@ -3,3 +3,5 @@
 lib*.a
 ctsimtext
 sample-ctsim.sh
+Makefile.in
+Makefile