diff options
| author | Ted Trask <ttrask01@yahoo.com> | 2014-10-28 19:03:59 +0000 |
|---|---|---|
| committer | Ted Trask <ttrask01@yahoo.com> | 2014-10-28 19:03:59 +0000 |
| commit | 282d068aced3f88956af4182a353f8ea150caa2b (patch) | |
| tree | 38d80a55c555482d65f19e9fb50e7a2b7c87e5b9 | |
| parent | b9926ecbe8279f60d7dfe7648c7c0851cb0aaabc (diff) | |
| download | acf-db-282d068aced3f88956af4182a353f8ea150caa2b.tar.bz2 acf-db-282d068aced3f88956af4182a353f8ea150caa2b.tar.xz | |
Move the lib files into a subdirectory in preparation for creating a generic controller/model
| -rw-r--r-- | Makefile | 39 | ||||
| -rw-r--r-- | README | 1 | ||||
| -rw-r--r-- | lib/Makefile | 29 | ||||
| -rw-r--r-- | lib/db-listdatabases-html.lsp (renamed from db-listdatabases-html.lsp) | 0 | ||||
| -rw-r--r-- | lib/db-listtables-html.lsp (renamed from db-listtables-html.lsp) | 0 | ||||
| -rw-r--r-- | lib/db-viewtable-html.lsp (renamed from db-viewtable-html.lsp) | 0 | ||||
| -rw-r--r-- | lib/dbcontrollerfunctions.lua (renamed from dbcontrollerfunctions.lua) | 0 | ||||
| -rw-r--r-- | lib/dbmodelfunctions.lua (renamed from dbmodelfunctions.lua) | 0 |
8 files changed, 47 insertions, 22 deletions
@@ -1,14 +1,14 @@ -include config.mk +APP_NAME=db +PACKAGE=acf-$(APP_NAME) +VERSION=0.1.0 -LIB_DIST=dbcontrollerfunctions.lua\ - dbmodelfunctions.lua\ - db-*-html.lsp\ +APP_DIST=db* \ -EXTRA_DIST=README Makefile -DISTFILES=$(LIB_DIST) $(EXTRA_DIST) +SUBDIRS=lib +EXTRA_DIST=README Makefile config.mk +DISTFILES=$(APP_DIST) $(EXTRA_DIST) -install_dir=$(DESTDIR)/$(acflibdir) -dist_dir=$(DISTDIR)/$(notdir $(PWD)) +install_dir=$(DESTDIR)/$(appdir)/$(APP_NAME) phony+=all all: @@ -16,23 +16,18 @@ all: phony+=clean clean: -phony+=distdir -distdir: $(DISTFILES) - mkdir -p "$(dist_dir)" - for i in $(DISTFILES); do\ - dest=`dirname "$(dist_dir)/$$i"`;\ - mkdir -p "$$dest";\ - cp "$$i" "$$dest";\ +export DISTDIR DESTDIR +phony+=install-recursive +install-recursive: + for dir in $(SUBDIRS); do\ + ( cd $$dir && $(MAKE) install ) || exit 1;\ done phony+=install -install: - mkdir -p $(install_dir) - for i in $(LIB_DIST); do\ - dest=`dirname "$(install_dir)/$$i"`;\ - mkdir -p "$$dest";\ - cp "$$i" "$$dest";\ - done +install: install-recursive $(SUBDIRS) + mkdir -p "$(install_dir)" + cp -a $(APP_DIST) "$(install_dir)" +include config.mk .PHONY: $(phony) @@ -0,0 +1 @@ +ACF library for editing databases diff --git a/lib/Makefile b/lib/Makefile new file mode 100644 index 0000000..b128d6f --- /dev/null +++ b/lib/Makefile @@ -0,0 +1,29 @@ +include ../config.mk + +LIB_DIST=dbcontrollerfunctions.lua\ + dbmodelfunctions.lua\ + db-*-html.lsp\ + +EXTRA_DIST=Makefile +DISTFILES=$(LIB_DIST) $(EXTRA_DIST) + +install_dir=$(DESTDIR)/$(acflibdir) +dist_dir=$(DISTDIR)/$(notdir $(PWD)) + +phony+=all +all: + +phony+=clean +clean: + +phony+=distdir +distdir: $(DISTFILES) + mkdir -p "$(dist_dir)" + cp -a $(DISTFILES) "$(dist_dir)" + +phony+=install +install: + mkdir -p "$(install_dir)" + cp -a $(LIB_DIST) "$(install_dir)" + +.PHONY: $(phony) diff --git a/db-listdatabases-html.lsp b/lib/db-listdatabases-html.lsp index dcc9dcf..dcc9dcf 100644 --- a/db-listdatabases-html.lsp +++ b/lib/db-listdatabases-html.lsp diff --git a/db-listtables-html.lsp b/lib/db-listtables-html.lsp index f0db6b7..f0db6b7 100644 --- a/db-listtables-html.lsp +++ b/lib/db-listtables-html.lsp diff --git a/db-viewtable-html.lsp b/lib/db-viewtable-html.lsp index 3bde35e..3bde35e 100644 --- a/db-viewtable-html.lsp +++ b/lib/db-viewtable-html.lsp diff --git a/dbcontrollerfunctions.lua b/lib/dbcontrollerfunctions.lua index 913919e..913919e 100644 --- a/dbcontrollerfunctions.lua +++ b/lib/dbcontrollerfunctions.lua diff --git a/dbmodelfunctions.lua b/lib/dbmodelfunctions.lua index d9c8689..d9c8689 100644 --- a/dbmodelfunctions.lua +++ b/lib/dbmodelfunctions.lua |