Reorganise luacurses

14 files changed, 1 insertions, 16 deletions

diff --git a/contrib/luacurses/Makefile b/contrib/luacurses/Makefile
index d044c38fa3..2be19c5113 100644
--- 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
index b4dd7529d3..b4dd7529d3 100644
--- a/contrib/luacurses/src/doc/curses.pdf
+++ b/contrib/luacurses/doc/curses.pdf
diff --git a/contrib/luacurses/src/doc/curses.ps.gz b/contrib/luacurses/doc/curses.ps.gz
index 72a20abac2..72a20abac2 100644
--- a/contrib/luacurses/src/doc/curses.ps.gz
+++ b/contrib/luacurses/doc/curses.ps.gz
diff --git a/contrib/luacurses/src/Makefile b/contrib/luacurses/src/Makefile
deleted file mode 100644
index 1dd108f497..0000000000
--- 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
index 9e6760a9fb..9e6760a9fb 100644
--- a/contrib/luacurses/src/src/curses.c
+++ b/contrib/luacurses/src/curses.c
diff --git a/contrib/luacurses/src/src/luacurses.c b/contrib/luacurses/src/luacurses.c
index 0cbd2fe6a4..0cbd2fe6a4 100644
--- a/contrib/luacurses/src/src/luacurses.c
+++ b/contrib/luacurses/src/luacurses.c
diff --git a/contrib/luacurses/src/src/luacurses.h b/contrib/luacurses/src/luacurses.h
index 2dc426c93f..2dc426c93f 100644
--- a/contrib/luacurses/src/src/luacurses.h
+++ b/contrib/luacurses/src/luacurses.h
diff --git a/contrib/luacurses/src/test/filter.lua b/contrib/luacurses/test/filter.lua
index f8f6ef5824..f8f6ef5824 100644
--- a/contrib/luacurses/src/test/filter.lua
+++ b/contrib/luacurses/test/filter.lua
diff --git a/contrib/luacurses/src/test/getnstr.lua b/contrib/luacurses/test/getnstr.lua
index 172365ea90..172365ea90 100644
--- a/contrib/luacurses/src/test/getnstr.lua
+++ b/contrib/luacurses/test/getnstr.lua
diff --git a/contrib/luacurses/src/test/getyx.lua b/contrib/luacurses/test/getyx.lua
index 4600236bb1..4600236bb1 100644
--- a/contrib/luacurses/src/test/getyx.lua
+++ b/contrib/luacurses/test/getyx.lua
diff --git a/contrib/luacurses/src/test/hello.lua b/contrib/luacurses/test/hello.lua
index 6a1d28a216..6a1d28a216 100644
--- a/contrib/luacurses/src/test/hello.lua
+++ b/contrib/luacurses/test/hello.lua
diff --git a/contrib/luacurses/src/test/mouse.lua b/contrib/luacurses/test/mouse.lua
index 0129cd8c42..0129cd8c42 100644
--- a/contrib/luacurses/src/test/mouse.lua
+++ b/contrib/luacurses/test/mouse.lua
diff --git a/contrib/luacurses/src/test/pair.lua b/contrib/luacurses/test/pair.lua
index f269800613..f269800613 100644
--- a/contrib/luacurses/src/test/pair.lua
+++ b/contrib/luacurses/test/pair.lua
diff --git a/contrib/luacurses/src/test/rain.lua b/contrib/luacurses/test/rain.lua
index 35e4691021..35e4691021 100644
--- a/contrib/luacurses/src/test/rain.lua
+++ b/contrib/luacurses/test/rain.lua