Przeglądaj źródła

... 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
ultramage 17 lat temu
rodzic
commit
67d29ff3b7
2 zmienionych plików z 93 dodań i 93 usunięć
  1. 47 47
      src/char/Makefile.in
  2. 46 46
      src/login/Makefile.in

+ 47 - 47
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

+ 46 - 46
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