diff options
| author | FlavioJS <FlavioJS@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2007-11-30 00:17:26 +0000 |
|---|---|---|
| committer | FlavioJS <FlavioJS@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2007-11-30 00:17:26 +0000 |
| commit | d157481db8a77069628b6186b9a31ea6267854ee (patch) | |
| tree | 53c49ca6ad0be53d230ccdc2ed54c95d38b7f54d /src/txt-converter | |
| parent | 5740884867c926482c52ce81fa1490500a365bfd (diff) | |
| download | hercules-d157481db8a77069628b6186b9a31ea6267854ee.tar.gz hercules-d157481db8a77069628b6186b9a31ea6267854ee.tar.bz2 hercules-d157481db8a77069628b6186b9a31ea6267854ee.tar.xz hercules-d157481db8a77069628b6186b9a31ea6267854ee.zip | |
* Random cleanup/documentation.
* Made common/Makefile get the svn version from the src directory, not src/common.
* Added a warning message to the install and uninstall targets.
* Renamed all obj directories to obj_all, obj_txt or obj_sql in the makefiles (if an obj/ directory exists, BSD make enters it before reading the makefile)
(run ./configure to update your makefiles, and don't forget to do 'make clean' before updating)
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@11844 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/txt-converter')
| -rw-r--r-- | src/txt-converter/Makefile.in | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/src/txt-converter/Makefile.in b/src/txt-converter/Makefile.in index 59d3a6641..c90a6a4b2 100644 --- a/src/txt-converter/Makefile.in +++ b/src/txt-converter/Makefile.in @@ -1,7 +1,7 @@ -LOGIN_CONVERTER_OBJ = obj_login/login-converter.o ../common/obj/minicore.o \ - ../common/obj/malloc.o ../common/obj/strlib.o ../common/obj/showmsg.o \ - ../common/obj/utils.o ../common/obj/ers.o ../common/obj/db.o \ +LOGIN_CONVERTER_OBJ = obj_login/login-converter.o ../common/obj_all/minicore.o \ + ../common/obj_all/malloc.o ../common/obj_all/strlib.o ../common/obj_all/showmsg.o \ + ../common/obj_all/utils.o ../common/obj_all/ers.o ../common/obj_all/db.o \ ../common/obj_sql/sql.o LOGIN_CONVERTER_H = ../common/cbasetypes.h ../common/mmo.h ../common/core.h \ ../common/malloc.h ../common/strlib.h ../common/showmsg.h \ @@ -13,9 +13,9 @@ CHAR_CONVERTER_OBJ = obj_char/char-converter.o \ obj_char/txt-int_party.o obj_char/txt-int_guild.o \ obj_char/sql-char.o obj_char/sql-int_pet.o obj_char/sql-int_storage.o \ obj_char/sql-inter.o obj_char/sql-int_party.o obj_char/sql-int_guild.o \ - ../common/obj/minicore.o \ - ../common/obj/malloc.o ../common/obj/strlib.o ../common/obj/showmsg.o \ - ../common/obj/utils.o ../common/obj/ers.o ../common/obj/mapindex.o \ + ../common/obj_all/minicore.o \ + ../common/obj_all/malloc.o ../common/obj_all/strlib.o ../common/obj_all/showmsg.o \ + ../common/obj_all/utils.o ../common/obj_all/ers.o ../common/obj_all/mapindex.o \ ../common/obj_sql/sql.o CHAR_CONVERTER_H = ../char/char.h ../char/int_pet.h ../char/int_storage.h ../char/inter.h \ ../char/int_party.h ../char/int_guild.h \ @@ -84,5 +84,8 @@ obj_char/sql-%.o: ../char_sql/%.c $(CHAR_CONVERTER_H) @CC@ @CFLAGS@ @MYSQL_CFLAGS@ @CPPFLAGS@ -DTXT_SQL_CONVERT -c $(OUTPUT_OPTION) $< # missing common object files -../common/obj/%.o: +../common/obj_all/%.o: + @$(MAKE) -C ../common sql + +../common/obj_sql/%.o: @$(MAKE) -C ../common sql |