diff options
| author | FlavioJS <FlavioJS@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2007-09-20 11:09:36 +0000 |
|---|---|---|
| committer | FlavioJS <FlavioJS@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2007-09-20 11:09:36 +0000 |
| commit | 5245e666a09df5f401c1329bf5ee1fc1b09b1d16 (patch) | |
| tree | dcf032743e890fddd400b268b75a0868976b0a0b /src/ladmin | |
| parent | d23c508bcc38520970156e5e25f14b03714878eb (diff) | |
| download | hercules-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/ladmin')
| -rw-r--r-- | src/ladmin/Makefile | 18 | ||||
| -rw-r--r-- | src/ladmin/Makefile.in | 31 |
2 files changed, 31 insertions, 18 deletions
diff --git a/src/ladmin/Makefile b/src/ladmin/Makefile deleted file mode 100644 index c5818404b..000000000 --- a/src/ladmin/Makefile +++ /dev/null @@ -1,18 +0,0 @@ -all txt sql: ladmin - -COMMON_OBJ = ../common/obj/minicore.o ../common/obj/minisocket.o ../common/obj/timer.o \ - ../common/obj/malloc.o ../common/obj/showmsg.o ../common/obj/strlib.o \ - ../common/obj/utils.o ../common/obj/md5calc.o -COMMON_H = ../common/core.h ../common/socket.h ../common/timer.h ../common/mmo.h \ - ../common/version.h ../common/malloc.h ../common/showmsg.h ../common/strlib.h \ - ../common/utils.h ../common/md5calc.h - -ladmin: ladmin.o $(COMMON_OBJ) - $(CC) -o ../../$@ ladmin.o $(COMMON_OBJ) $(LIB_S) - -clean: - rm -f *.o ../../ladmin GNUmakefile - -# DO NOT DELETE - -ladmin.o: ladmin.c ladmin.h $(COMMON_H) diff --git a/src/ladmin/Makefile.in b/src/ladmin/Makefile.in new file mode 100644 index 000000000..f1f7bff23 --- /dev/null +++ b/src/ladmin/Makefile.in @@ -0,0 +1,31 @@ +COMMON_OBJ = ../common/obj/minicore.o ../common/obj/minisocket.o ../common/obj/timer.o \ + ../common/obj/malloc.o ../common/obj/showmsg.o ../common/obj/strlib.o \ + ../common/obj/utils.o ../common/obj/md5calc.o +COMMON_H = ../common/core.h ../common/socket.h ../common/timer.h ../common/mmo.h \ + ../common/version.h ../common/malloc.h ../common/showmsg.h ../common/strlib.h \ + ../common/utils.h ../common/md5calc.h + +##################################################################### +.PHONY : all ladmin clean help + +all: ladmin + +ladmin: ladmin.o $(COMMON_OBJ) + @CC@ @LDFLAGS@ -o ../../ladmin@EXEEXT@ ladmin.o $(COMMON_OBJ) @LIBS@ + +clean: + rm -f *.o ../../ladmin@EXEEXT@ + +help: + @echo "possible targets are 'ladmin' 'all' 'clean' 'help'" + @echo "'ladmin' - remote administration tool" + @echo "'all' - builds all above targets" + @echo "'clean' - cleans builds and objects" + @echo "'help' - outputs this message" + +##################################################################### + +# DO NOT DELETE + +ladmin.o: ladmin.c ladmin.h $(COMMON_H) + @CC@ @CFLAGS@ @LDFLAGS@ @CPPFLAGS@ -c $(OUTPUT_OPTION) $< |