Merge branch 'automake0'

MobiusHorizons · Apr 7, 2015 · d904527 · d904527
2 parents 86aa38f + 59d38df
commit d904527
Show file tree

Hide file tree

Showing 50 changed files with 1,928 additions and 15,160 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,7 +1,7 @@
 *.orig 
 *.swp
 *.bak
-sync
+syncd
 *.bak
 *.lo
 *.wo
@@ -15,7 +15,7 @@ token_store.txt
 Makefile.in
 Makefile
 # http://www.gnu.org/software/autoconf
-/autom4te.cache
+/autom4te.cache/
 /aclocal.m4
 /compile
 /configure
@@ -24,7 +24,14 @@ Makefile
 /missing
 /stamp-h1
 /config.h
+/config.sub
+/config.guess
 /config.h.in
+/config.log
+/config.status
+/m4
+/ltmain.sh
+/depcomp
 #libtool
 *.la
 .deps

diff --git a/Makefile.am b/Makefile.am
@@ -1,4 +1,4 @@
 # AM_CFLAGS=-Wall # -I/usr/local/include -DVERSION=\"$(VERSION)\" -DPROG="\"$(PACKAGE)\""
 # AM_LDFLAGS=-L/usr/local/lib -lcurl -lpthread -ldl
 
-SUBDIRS = libltdl librest libdropbox src libexec
+SUBDIRS = libltdl librest libdropbox libgdrive src libexec