Reorganise luacurses

diff --git a/contrib/luacurses/Makefile b/contrib/luacurses/Makefile
index d044c38fa3c0ddd3e1ab00a19977f97159e85f3c..2be19c51135b9205d808af049d5161b67301d21f 100644 (file)
--- a/contrib/luacurses/Makefile
+++ b/contrib/luacurses/Makefile
@@ -5,4 +5,4 @@ include ../../build/gccconfig.mk
 compile:
        mkdir -p dist$(LUA_LIBRARYDIR)
        $(CC) $(CPPFLAGS) $(CFLAGS) $(EXTRA_CFLAGS) $(SHLIB_FLAGS) -pedantic \
-       -Wall $(FPIC) $(LUA_CFLAGS) -o dist$(LUA_LIBRARYDIR)/curses.so src/src/curses.c src/src/luacurses.c
+       -Wall $(FPIC) $(LUA_CFLAGS) -o dist$(LUA_LIBRARYDIR)/curses.so src/curses.c src/luacurses.c

diff --git a/contrib/luacurses/src/doc/curses.pdf b/contrib/luacurses/doc/curses.pdf
similarity index 100%
rename from contrib/luacurses/src/doc/curses.pdf
rename to contrib/luacurses/doc/curses.pdf

diff --git a/contrib/luacurses/src/doc/curses.ps.gz b/contrib/luacurses/doc/curses.ps.gz
similarity index 100%
rename from contrib/luacurses/src/doc/curses.ps.gz
rename to contrib/luacurses/doc/curses.ps.gz

diff --git a/contrib/luacurses/src/Makefile b/contrib/luacurses/src/Makefile
deleted file mode 100644 (file)
index 1dd108f..0000000
--- a/contrib/luacurses/src/Makefile
+++ /dev/null
@@ -1,15 +0,0 @@
-
-SRC=src/curses.c src/luacurses.c
-INCLUDE=/usr/include/lua5.1
-CFLAGS=-shared -ansi -Wall -O2 -I$(INCLUDE) -fpic
-
-all: lib/curses.so
-
-lib/curses.so: $(SRC)
-       if ! [ -d lib ]; then mkdir lib; fi
-       gcc $(CFLAGS) -o lib/curses.so $(SRC)
-
-clean:
-       rm -Rf lib
-       
-       

diff --git a/contrib/luacurses/src/src/curses.c b/contrib/luacurses/src/curses.c
similarity index 100%
rename from contrib/luacurses/src/src/curses.c
rename to contrib/luacurses/src/curses.c

diff --git a/contrib/luacurses/src/src/luacurses.c b/contrib/luacurses/src/luacurses.c
similarity index 100%
rename from contrib/luacurses/src/src/luacurses.c
rename to contrib/luacurses/src/luacurses.c

diff --git a/contrib/luacurses/src/src/luacurses.h b/contrib/luacurses/src/luacurses.h
similarity index 100%
rename from contrib/luacurses/src/src/luacurses.h
rename to contrib/luacurses/src/luacurses.h

diff --git a/contrib/luacurses/src/test/filter.lua b/contrib/luacurses/test/filter.lua
similarity index 100%
rename from contrib/luacurses/src/test/filter.lua
rename to contrib/luacurses/test/filter.lua

diff --git a/contrib/luacurses/src/test/getnstr.lua b/contrib/luacurses/test/getnstr.lua
similarity index 100%
rename from contrib/luacurses/src/test/getnstr.lua
rename to contrib/luacurses/test/getnstr.lua

diff --git a/contrib/luacurses/src/test/getyx.lua b/contrib/luacurses/test/getyx.lua
similarity index 100%
rename from contrib/luacurses/src/test/getyx.lua
rename to contrib/luacurses/test/getyx.lua

diff --git a/contrib/luacurses/src/test/hello.lua b/contrib/luacurses/test/hello.lua
similarity index 100%
rename from contrib/luacurses/src/test/hello.lua
rename to contrib/luacurses/test/hello.lua

diff --git a/contrib/luacurses/src/test/mouse.lua b/contrib/luacurses/test/mouse.lua
similarity index 100%
rename from contrib/luacurses/src/test/mouse.lua
rename to contrib/luacurses/test/mouse.lua

diff --git a/contrib/luacurses/src/test/pair.lua b/contrib/luacurses/test/pair.lua
similarity index 100%
rename from contrib/luacurses/src/test/pair.lua
rename to contrib/luacurses/test/pair.lua

diff --git a/contrib/luacurses/src/test/rain.lua b/contrib/luacurses/test/rain.lua
similarity index 100%
rename from contrib/luacurses/src/test/rain.lua
rename to contrib/luacurses/test/rain.lua