diff options
author | ultramage <ultramage@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2008-04-12 09:19:31 +0000 |
---|---|---|
committer | ultramage <ultramage@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2008-04-12 09:19:31 +0000 |
commit | 5156c90c4d5fccf52fe42f72d143623bcd025c33 (patch) | |
tree | cf1a13958f46fc48f973128090f89d7842e296bc | |
parent | 9e63427022f055944aa16a80e57de20243bd1527 (diff) | |
download | hercules-5156c90c4d5fccf52fe42f72d143623bcd025c33.tar.gz hercules-5156c90c4d5fccf52fe42f72d143623bcd025c33.tar.bz2 hercules-5156c90c4d5fccf52fe42f72d143623bcd025c33.tar.xz hercules-5156c90c4d5fccf52fe42f72d143623bcd025c33.zip |
... but not with a buggy tool (missing svn:props)
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@12574 54d463be-8e91-2dee-dedb-b68131a5f0ec
-rw-r--r-- | src/char/Makefile.in | 94 | ||||
-rw-r--r-- | src/login/Makefile.in | 92 |
2 files changed, 93 insertions, 93 deletions
diff --git a/src/char/Makefile.in b/src/char/Makefile.in index 7835daa7f..37b464991 100644 --- a/src/char/Makefile.in +++ b/src/char/Makefile.in @@ -1,47 +1,47 @@ -
-COMMON_OBJ = ../common/obj_all/core.o ../common/obj_all/socket.o ../common/obj_all/timer.o \
- ../common/obj_all/db.o ../common/obj_all/plugins.o ../common/obj_all/lock.o \
- ../common/obj_all/malloc.o ../common/obj_all/showmsg.o ../common/obj_all/utils.o \
- ../common/obj_all/strlib.o ../common/obj_all/grfio.o \
- ../common/obj_all/mapindex.o ../common/obj_all/ers.o
-COMMON_H = ../common/core.h ../common/socket.h ../common/timer.h ../common/mmo.h \
- ../common/version.h ../common/db.h ../common/plugins.h ../common/lock.h \
- ../common/malloc.h ../common/showmsg.h ../common/utils.h \
- ../common/strlib.h ../common/grfio.h \
- ../common/mapindex.h ../common/ers.h
-
-CHAR_OBJ = obj_txt/char.o obj_txt/inter.o obj_txt/int_party.o obj_txt/int_guild.o \
- obj_txt/int_storage.o obj_txt/int_status.o obj_txt/int_pet.o obj_txt/int_homun.o
-CHAR_H = char.h inter.h int_party.h int_guild.h int_storage.h int_status.h int_pet.h int_homun.h
-
-@SET_MAKE@
-
-#####################################################################
-.PHONY : all char-server clean help
-
-all: char-server
-
-char-server: obj_txt $(CHAR_OBJ) $(COMMON_OBJ)
- @CC@ @LDFLAGS@ -o ../../char-server@EXEEXT@ $(CHAR_OBJ) $(COMMON_OBJ) @LIBS@
-
-clean:
- rm -rf *.o obj_txt ../../char-server@EXEEXT@
-
-help:
- @echo "possible targets are 'char-server' 'all' 'clean' 'help'"
- @echo "'char-server' - char server (TXT version)"
- @echo "'all' - builds all above targets"
- @echo "'clean' - cleans builds and objects"
- @echo "'help' - outputs this message"
-
-#####################################################################
-
-obj_txt:
- -mkdir obj_txt
-
-obj_txt/%.o: %.c $(CHAR_H) $(COMMON_H)
- @CC@ @CFLAGS@ $(CUSTOM_CFLAGS) -DTXT_ONLY @CPPFLAGS@ -c $(OUTPUT_OPTION) $<
-
-# missing common object files
-../common/obj_all/%.o:
- @$(MAKE) -C ../common txt
+ +COMMON_OBJ = ../common/obj_all/core.o ../common/obj_all/socket.o ../common/obj_all/timer.o \ + ../common/obj_all/db.o ../common/obj_all/plugins.o ../common/obj_all/lock.o \ + ../common/obj_all/malloc.o ../common/obj_all/showmsg.o ../common/obj_all/utils.o \ + ../common/obj_all/strlib.o ../common/obj_all/grfio.o \ + ../common/obj_all/mapindex.o ../common/obj_all/ers.o +COMMON_H = ../common/core.h ../common/socket.h ../common/timer.h ../common/mmo.h \ + ../common/version.h ../common/db.h ../common/plugins.h ../common/lock.h \ + ../common/malloc.h ../common/showmsg.h ../common/utils.h \ + ../common/strlib.h ../common/grfio.h \ + ../common/mapindex.h ../common/ers.h + +CHAR_OBJ = obj_txt/char.o obj_txt/inter.o obj_txt/int_party.o obj_txt/int_guild.o \ + obj_txt/int_storage.o obj_txt/int_status.o obj_txt/int_pet.o obj_txt/int_homun.o +CHAR_H = char.h inter.h int_party.h int_guild.h int_storage.h int_status.h int_pet.h int_homun.h + +@SET_MAKE@ + +##################################################################### +.PHONY : all char-server clean help + +all: char-server + +char-server: obj_txt $(CHAR_OBJ) $(COMMON_OBJ) + @CC@ @LDFLAGS@ -o ../../char-server@EXEEXT@ $(CHAR_OBJ) $(COMMON_OBJ) @LIBS@ + +clean: + rm -rf *.o obj_txt ../../char-server@EXEEXT@ + +help: + @echo "possible targets are 'char-server' 'all' 'clean' 'help'" + @echo "'char-server' - char server (TXT version)" + @echo "'all' - builds all above targets" + @echo "'clean' - cleans builds and objects" + @echo "'help' - outputs this message" + +##################################################################### + +obj_txt: + -mkdir obj_txt + +obj_txt/%.o: %.c $(CHAR_H) $(COMMON_H) + @CC@ @CFLAGS@ $(CUSTOM_CFLAGS) -DTXT_ONLY @CPPFLAGS@ -c $(OUTPUT_OPTION) $< + +# missing common object files +../common/obj_all/%.o: + @$(MAKE) -C ../common txt diff --git a/src/login/Makefile.in b/src/login/Makefile.in index b87bd9e70..aeb41b667 100644 --- a/src/login/Makefile.in +++ b/src/login/Makefile.in @@ -1,46 +1,46 @@ -
-COMMON_OBJ = ../common/obj_all/core.o ../common/obj_all/socket.o ../common/obj_all/timer.o \
- ../common/obj_all/db.o ../common/obj_all/plugins.o ../common/obj_all/lock.o \
- ../common/obj_all/malloc.o ../common/obj_all/showmsg.o ../common/obj_all/utils.o \
- ../common/obj_all/strlib.o ../common/obj_all/grfio.o ../common/obj_all/mapindex.o \
- ../common/obj_all/ers.o ../common/obj_all/md5calc.o
-COMMON_H = ../common/core.h ../common/socket.h ../common/timer.h ../common/mmo.h \
- ../common/version.h ../common/db.h ../common/plugins.h ../common/lock.h \
- ../common/malloc.h ../common/showmsg.h ../common/utils.h ../common/strlib.h \
- ../common/grfio.h ../common/mapindex.h \
- ../common/ers.h ../common/md5calc.h
-
-LOGIN_OBJ = obj_txt/login.o obj_txt/admin.o
-LOGIN_H = login.h
-
-@SET_MAKE@
-
-#####################################################################
-.PHONY : all login-server clean help
-
-all: login-server
-
-login-server: obj_txt $(LOGIN_OBJ) $(COMMON_OBJ)
- @CC@ @LDFLAGS@ -o ../../login-server@EXEEXT@ $(LOGIN_OBJ) $(COMMON_OBJ) @LIBS@
-
-clean:
- rm -rf *.o obj_txt ../../login-server@EXEEXT@
-
-help:
- @echo "possible targets are 'login-server' 'all' 'clean' 'help'"
- @echo "'login-server' - login server (TXT version)"
- @echo "'all' - builds all above targets"
- @echo "'clean' - cleans builds and objects"
- @echo "'help' - outputs this message"
-
-#####################################################################
-
-obj_txt:
- -mkdir obj_txt
-
-obj_txt/%.o: %.c $(LOGIN_H) $(COMMON_H)
- @CC@ @CFLAGS@ $(CUSTOM_CFLAGS) -DTXT_ONLY @CPPFLAGS@ -c $(OUTPUT_OPTION) $<
-
-# missing common object files
-../common/obj_all/%.o:
- @$(MAKE) -C ../common sql
+ +COMMON_OBJ = ../common/obj_all/core.o ../common/obj_all/socket.o ../common/obj_all/timer.o \ + ../common/obj_all/db.o ../common/obj_all/plugins.o ../common/obj_all/lock.o \ + ../common/obj_all/malloc.o ../common/obj_all/showmsg.o ../common/obj_all/utils.o \ + ../common/obj_all/strlib.o ../common/obj_all/grfio.o ../common/obj_all/mapindex.o \ + ../common/obj_all/ers.o ../common/obj_all/md5calc.o +COMMON_H = ../common/core.h ../common/socket.h ../common/timer.h ../common/mmo.h \ + ../common/version.h ../common/db.h ../common/plugins.h ../common/lock.h \ + ../common/malloc.h ../common/showmsg.h ../common/utils.h ../common/strlib.h \ + ../common/grfio.h ../common/mapindex.h \ + ../common/ers.h ../common/md5calc.h + +LOGIN_OBJ = obj_txt/login.o obj_txt/admin.o +LOGIN_H = login.h + +@SET_MAKE@ + +##################################################################### +.PHONY : all login-server clean help + +all: login-server + +login-server: obj_txt $(LOGIN_OBJ) $(COMMON_OBJ) + @CC@ @LDFLAGS@ -o ../../login-server@EXEEXT@ $(LOGIN_OBJ) $(COMMON_OBJ) @LIBS@ + +clean: + rm -rf *.o obj_txt ../../login-server@EXEEXT@ + +help: + @echo "possible targets are 'login-server' 'all' 'clean' 'help'" + @echo "'login-server' - login server (TXT version)" + @echo "'all' - builds all above targets" + @echo "'clean' - cleans builds and objects" + @echo "'help' - outputs this message" + +##################################################################### + +obj_txt: + -mkdir obj_txt + +obj_txt/%.o: %.c $(LOGIN_H) $(COMMON_H) + @CC@ @CFLAGS@ $(CUSTOM_CFLAGS) -DTXT_ONLY @CPPFLAGS@ -c $(OUTPUT_OPTION) $< + +# missing common object files +../common/obj_all/%.o: + @$(MAKE) -C ../common sql |