Adding LuaRegex.

3 files changed, 19 insertions, 12 deletions

diff --git a/compile/Makefile b/compile/Makefile
index 31a2883..3c505fd 100644
--- a/compile/Makefile
+++ b/compile/Makefile
@@ -1,3 +1,6 @@
+HOSTNAME = sumarit.nobis-crew.org
+WEBPATH = /var/www/softwares
+
 all:
 	make -C win32 dist
 	make -C linux dist
@@ -10,11 +13,11 @@ clean:
 rebuild: clean all
 
 release: all
-	-ssh sumarit rm /var/www/cd-tool/*
-	-ssh sumarit rm /var/www/luapatch/*
-	scp cd-tool*.zip sumarit:/var/www/cd-tool
-	scp ../FAQ-cd.txt sumarit:/var/www/cd-tool/README.txt
-	scp ../COPYING sumarit:/var/www/cd-tool
-	scp *.lua sumarit:/var/www/cd-tool
-	scp luapatch* sumarit:/var/www/luapatch
-	scp ../README-LuaPatch.txt sumarit:/var/www/luapatch/README.txt
+	-ssh $(HOSTNAME) rm $(WEBPATH)/cd-tool/*
+	-ssh $(HOSTNAME) rm $(WEBPATH)/luapatch/*
+	scp cd-tool*.zip $(HOSTNAME):$(WEBPATH)/cd-tool
+	scp ../FAQ-cd.txt $(HOSTNAME):$(WEBPATH)/cd-tool/README.txt
+	scp ../COPYING $(HOSTNAME):$(WEBPATH)/cd-tool
+	scp *.lua $(HOSTNAME):$(WEBPATH)/cd-tool
+	scp luapatch* $(HOSTNAME):$(WEBPATH)/luapatch
+	scp ../README-LuaPatch.txt $(HOSTNAME):$(WEBPATH)/luapatch/README.txt
diff --git a/compile/linux/Makefile b/compile/linux/Makefile
index 4f60ab8..8c5632d 100644
--- a/compile/linux/Makefile
+++ b/compile/linux/Makefile
@@ -35,7 +35,7 @@ BALTISOT_SOURCES = \
 ../../generic/lib/Input.cc       ../../generic/lib/fileutils.cc \
 ../../generic/lib/LuaHandle.cc   ../../generic/lib/generic.cc \
 ../../generic/lib/checkargs.c    ../../generic/lib/datecalc.c \
-../../generic/lib/LuaConfigFile.cc
+../../generic/lib/LuaRegex.cc    ../../generic/lib/LuaConfigFile.cc
 
 ZLIB_SOURCES = \
 ../../generic/lib/zlib/src/adler32.c   ../../generic/lib/zlib/src/inffast.c \
@@ -90,7 +90,7 @@ DALOS_OBJECTS = $(addsuffix .o, $(notdir $(basename $(COMMON_SOURCES) $(MOGLTK_S
 
 CD_TOOL_OBJECTS = $(addsuffix .o, $(notdir $(basename $(COMMON_SOURCES)))) cd-tool.o
 
-all: cd-tool cd-tool-static Dalos
+all: cd-tool cd-tool-static
 
 stats:
 	@wc $(WHOLE_SOURCES)
diff --git a/compile/win32/Makefile b/compile/win32/Makefile
index c4f7bdb..f26829a 100644
--- a/compile/win32/Makefile
+++ b/compile/win32/Makefile
@@ -16,7 +16,7 @@ CPPFLAGS = $(INCLUDES) -O4 -march=i686 -DSTDC_HEADERS -DREADLINE_STATIC -fexcept
 LDFLAGS = -march=i586 -O4
 
 SOURCES = \
-../../Dalos/Dalos.cc ../../cd-tool.cpp ../../luapatch.cpp
+../../cd-tool.cpp ../../luapatch.cpp
 
 MOGLTK_SOURCES = \
 ../../mogltk/lib/base.cc      ../../mogltk/lib/glwidgets.cc \
@@ -36,7 +36,7 @@ BALTISOT_SOURCES = \
 ../../generic/lib/Input.cc       ../../generic/lib/fileutils.cc \
 ../../generic/lib/LuaHandle.cc   ../../generic/lib/generic.cc \
 ../../generic/lib/checkargs.c    ../../generic/lib/datecalc.c \
-../../generic/lub/LuaConfigFile.cc
+../../generic/lib/LuaRegex.cc    ../../generic/lib/LuaConfigFile.cc
 
 ZLIB_SOURCES = \
 ../../generic/lib/zlib/src/adler32.c   ../../generic/lib/zlib/src/inffast.c \
@@ -151,11 +151,15 @@ source: dep $(COMMON_SOURCES) ../../cd-tool.cpp
 define OBJECT_C_template
  $(addsuffix .o, $(notdir $(basename $(1)))): $(src)
 	$$(CC) $$(CPPFLAGS) $$(CFLAGS) -c $(src)
+ $(addsuffix .dep, $(notdir $(basename $(1)))): $(src)
+	$$(CC) $$(CPPFLAGS) $$(CFLAGS) -MM $(src) -o $$@
 endef
 
 define OBJECT_CXX_template
  $(addsuffix .o, $(notdir $(basename $(1)))): $(src)
 	$$(CXX) $$(CPPFLAGS) $$(CXXFLAGS) -c $(src)
+ $(addsuffix .dep, $(notdir $(basename $(1)))): $(src)
+	$$(CXX) $$(CPPFLAGS) $$(CXXFLAGS) -MM $(src) -o $$@
 endef
 
 $(foreach src, $(WHOLE_SOURCES), $(if $(filter %.c, $(src)), $(eval $(call OBJECT_C_template, $(src))), $(eval $(call OBJECT_CXX_template, $(src)))))