... but not with a buggy tool (missing svn:props)

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@12574 54d463be-8e91-2dee-dedb-b68131a5f0ec
This commit is contained in:
ultramage 2008-04-12 09:19:31 +00:00
parent 0c69d0879c
commit 67d29ff3b7
2 changed files with 93 additions and 93 deletions

View File

@ -1,47 +1,47 @@
COMMON_OBJ = ../common/obj_all/core.o ../common/obj_all/socket.o ../common/obj_all/timer.o \ 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/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/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/strlib.o ../common/obj_all/grfio.o \
../common/obj_all/mapindex.o ../common/obj_all/ers.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_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/version.h ../common/db.h ../common/plugins.h ../common/lock.h \
../common/malloc.h ../common/showmsg.h ../common/utils.h \ ../common/malloc.h ../common/showmsg.h ../common/utils.h \
../common/strlib.h ../common/grfio.h \ ../common/strlib.h ../common/grfio.h \
../common/mapindex.h ../common/ers.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 \ 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 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 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@ @SET_MAKE@
##################################################################### #####################################################################
.PHONY : all char-server clean help .PHONY : all char-server clean help
all: char-server all: char-server
char-server: obj_txt $(CHAR_OBJ) $(COMMON_OBJ) char-server: obj_txt $(CHAR_OBJ) $(COMMON_OBJ)
@CC@ @LDFLAGS@ -o ../../char-server@EXEEXT@ $(CHAR_OBJ) $(COMMON_OBJ) @LIBS@ @CC@ @LDFLAGS@ -o ../../char-server@EXEEXT@ $(CHAR_OBJ) $(COMMON_OBJ) @LIBS@
clean: clean:
rm -rf *.o obj_txt ../../char-server@EXEEXT@ rm -rf *.o obj_txt ../../char-server@EXEEXT@
help: help:
@echo "possible targets are 'char-server' 'all' 'clean' 'help'" @echo "possible targets are 'char-server' 'all' 'clean' 'help'"
@echo "'char-server' - char server (TXT version)" @echo "'char-server' - char server (TXT version)"
@echo "'all' - builds all above targets" @echo "'all' - builds all above targets"
@echo "'clean' - cleans builds and objects" @echo "'clean' - cleans builds and objects"
@echo "'help' - outputs this message" @echo "'help' - outputs this message"
##################################################################### #####################################################################
obj_txt: obj_txt:
-mkdir obj_txt -mkdir obj_txt
obj_txt/%.o: %.c $(CHAR_H) $(COMMON_H) obj_txt/%.o: %.c $(CHAR_H) $(COMMON_H)
@CC@ @CFLAGS@ $(CUSTOM_CFLAGS) -DTXT_ONLY @CPPFLAGS@ -c $(OUTPUT_OPTION) $< @CC@ @CFLAGS@ $(CUSTOM_CFLAGS) -DTXT_ONLY @CPPFLAGS@ -c $(OUTPUT_OPTION) $<
# missing common object files # missing common object files
../common/obj_all/%.o: ../common/obj_all/%.o:
@$(MAKE) -C ../common txt @$(MAKE) -C ../common txt

View File

@ -1,46 +1,46 @@
COMMON_OBJ = ../common/obj_all/core.o ../common/obj_all/socket.o ../common/obj_all/timer.o \ 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/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/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/strlib.o ../common/obj_all/grfio.o ../common/obj_all/mapindex.o \
../common/obj_all/ers.o ../common/obj_all/md5calc.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_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/version.h ../common/db.h ../common/plugins.h ../common/lock.h \
../common/malloc.h ../common/showmsg.h ../common/utils.h ../common/strlib.h \ ../common/malloc.h ../common/showmsg.h ../common/utils.h ../common/strlib.h \
../common/grfio.h ../common/mapindex.h \ ../common/grfio.h ../common/mapindex.h \
../common/ers.h ../common/md5calc.h ../common/ers.h ../common/md5calc.h
LOGIN_OBJ = obj_txt/login.o obj_txt/admin.o LOGIN_OBJ = obj_txt/login.o obj_txt/admin.o
LOGIN_H = login.h LOGIN_H = login.h
@SET_MAKE@ @SET_MAKE@
##################################################################### #####################################################################
.PHONY : all login-server clean help .PHONY : all login-server clean help
all: login-server all: login-server
login-server: obj_txt $(LOGIN_OBJ) $(COMMON_OBJ) login-server: obj_txt $(LOGIN_OBJ) $(COMMON_OBJ)
@CC@ @LDFLAGS@ -o ../../login-server@EXEEXT@ $(LOGIN_OBJ) $(COMMON_OBJ) @LIBS@ @CC@ @LDFLAGS@ -o ../../login-server@EXEEXT@ $(LOGIN_OBJ) $(COMMON_OBJ) @LIBS@
clean: clean:
rm -rf *.o obj_txt ../../login-server@EXEEXT@ rm -rf *.o obj_txt ../../login-server@EXEEXT@
help: help:
@echo "possible targets are 'login-server' 'all' 'clean' 'help'" @echo "possible targets are 'login-server' 'all' 'clean' 'help'"
@echo "'login-server' - login server (TXT version)" @echo "'login-server' - login server (TXT version)"
@echo "'all' - builds all above targets" @echo "'all' - builds all above targets"
@echo "'clean' - cleans builds and objects" @echo "'clean' - cleans builds and objects"
@echo "'help' - outputs this message" @echo "'help' - outputs this message"
##################################################################### #####################################################################
obj_txt: obj_txt:
-mkdir obj_txt -mkdir obj_txt
obj_txt/%.o: %.c $(LOGIN_H) $(COMMON_H) obj_txt/%.o: %.c $(LOGIN_H) $(COMMON_H)
@CC@ @CFLAGS@ $(CUSTOM_CFLAGS) -DTXT_ONLY @CPPFLAGS@ -c $(OUTPUT_OPTION) $< @CC@ @CFLAGS@ $(CUSTOM_CFLAGS) -DTXT_ONLY @CPPFLAGS@ -c $(OUTPUT_OPTION) $<
# missing common object files # missing common object files
../common/obj_all/%.o: ../common/obj_all/%.o:
@$(MAKE) -C ../common sql @$(MAKE) -C ../common sql