diff --git a/.gitignore b/.gitignore index 4ebd6e7d3..d5f013cb1 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ +Makefile config.php .index logs diff --git a/Makefile b/Makefile deleted file mode 100644 index 4ad69d63d..000000000 --- a/Makefile +++ /dev/null @@ -1,30 +0,0 @@ -GIT=git -SYNC=rsync -rtvx --cvs-exclude --exclude '.*.swp' -TEST_DEST=librenms:/opt/librenms/ - -default: check - $(GIT) merge master - $(SYNC) html includes $(TEST_DEST) - -test t: merge check push-testing gc - -dev d: merge check push-dev gc - -check: - for i in `$(GIT) diff --name-only`; do php -l $$i; done - -gc: - $(GIT) gc - -merge: - $(GIT) merge master - -pull: - $(GIT) pull - -push-dev: - $(GIT) push - -push-testing: - $(GIT) push testing -