summaryrefslogtreecommitdiff
path: root/src/tool
diff options
context:
space:
mode:
authorFlavioJS <FlavioJS@54d463be-8e91-2dee-dedb-b68131a5f0ec>2007-09-20 11:09:36 +0000
committerFlavioJS <FlavioJS@54d463be-8e91-2dee-dedb-b68131a5f0ec>2007-09-20 11:09:36 +0000
commit5245e666a09df5f401c1329bf5ee1fc1b09b1d16 (patch)
treedcf032743e890fddd400b268b75a0868976b0a0b /src/tool
parentd23c508bcc38520970156e5e25f14b03714878eb (diff)
downloadhercules-5245e666a09df5f401c1329bf5ee1fc1b09b1d16.tar.gz
hercules-5245e666a09df5f401c1329bf5ee1fc1b09b1d16.tar.bz2
hercules-5245e666a09df5f401c1329bf5ee1fc1b09b1d16.tar.xz
hercules-5245e666a09df5f401c1329bf5ee1fc1b09b1d16.zip
* Merged the tmpsql branch:
- Abstraction for the sql code (sql.c/h). - New configure script and makefiles. - Restored txt zeny logging code. (r10814) - Rewrote mapserver's sql code - itemdb, mobdb, mapreg, logs. (r10814) - Fixed a precedence issue (&& and ) in char_sql/char.c. (r10833) - Improved db reading code a bit for consistency. (r11077) - Added separate atcommand for mail deletion. (r11077) - Corrected a few messages that said "new" instead of "unread". (r11077) - Broadcast (*) messages now use "*" as the target's name (not ""). (r11077) - Moved StringBuf code from utils.c/h to strlib.c/h. (r11084 r11117) - Some misc login server cleanups (reformatting etc). (r11136) - Corrected/modified some header entries. (r11141 r11147 11148) - Adjusted VS project files. (r11147) - Adjusted the way the sql charserver does item saving. (r11192) - Corrected usage of reserved keyword 'friend' in mmo.h. (r11192) git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@11245 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/tool')
-rw-r--r--src/tool/Makefile14
-rw-r--r--src/tool/Makefile.in28
2 files changed, 28 insertions, 14 deletions
diff --git a/src/tool/Makefile b/src/tool/Makefile
deleted file mode 100644
index fef165ba5..000000000
--- a/src/tool/Makefile
+++ /dev/null
@@ -1,14 +0,0 @@
-all: adduser convert mapcache
-
-adduser:
- $(CC) -o ../../tools/$@ adduser.c
-
-convert:
- $(CC) -o ../../tools/$@ convert.c
-
-mapcache:
- $(CC) -c -o grfio.o grfio.c
- $(CC) -o ../../$@ mapcache.c grfio.o -lz
-
-clean:
- rm -rf *.o ../../tools/adduser ../../tools/convert ../../mapcache
diff --git a/src/tool/Makefile.in b/src/tool/Makefile.in
new file mode 100644
index 000000000..7c0d1e1ee
--- /dev/null
+++ b/src/tool/Makefile.in
@@ -0,0 +1,28 @@
+#####################################################################
+.PHONY : all adduser convert mapcache clean help
+
+all: adduser convert mapcache
+
+adduser:
+ @CC@ -o ../../tools/adduser@EXEEXT@ adduser.c
+
+convert:
+ @CC@ -o ../../tools/convert@EXEEXT@ convert.c
+
+mapcache:
+ @CC@ -c -o grfio.o grfio.c
+ @CC@ -o ../../mapcache@EXEEXT@ mapcache.c grfio.o -lz
+
+clean:
+ rm -rf *.o ../../tools/adduser@EXEEXT@ ../../tools/convert@EXEEXT@ ../../mapcache@EXEEXT@
+
+help:
+ @echo "possible targets are 'adduser' 'convert' 'mapcache' 'all' 'clean' 'help'"
+ @echo "'adduser' - ???"
+ @echo "'convert' - ???"
+ @echo "'mapcache' - mapcache generator"
+ @echo "'all' - builds all above targets"
+ @echo "'clean' - cleans builds and objects"
+ @echo "'help' - outputs this message"
+
+#####################################################################