From: Kevin Rosenberg Date: Sat, 1 Aug 2009 18:25:14 +0000 (-0600) Subject: Add more files to gitignore, recover Makefile.am X-Git-Tag: v5.0.0~1 X-Git-Url: http://git.kpe.io/?p=ctsim.git;a=commitdiff_plain;h=091d35f26e2a96aab56b9a467d4d4bc35be689da Add more files to gitignore, recover Makefile.am --- diff --git a/.gitignore b/.gitignore index 383cdbe..7a7a912 100644 --- 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 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 d55e99c..2cc5029 100644 --- 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 8b5953c..d956df5 100644 --- 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 d55e99c..41c59bb 100644 --- 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 d55e99c..2cc5029 100644 --- 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 d55e99c..41c59bb 100644 --- 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 f3c7a7c..282522d 100644 --- a/man/.gitignore +++ b/man/.gitignore @@ -1 +1,2 @@ Makefile +Makefile.in diff --git a/src/.gitignore b/src/.gitignore index 8e78d6f..b549d09 100644 --- 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 a0e0278..06963b9 100644 --- a/tools/.gitignore +++ b/tools/.gitignore @@ -3,3 +3,5 @@ lib*.a ctsimtext sample-ctsim.sh +Makefile.in +Makefile