summaryrefslogtreecommitdiff
path: root/src/char
diff options
context:
space:
mode:
authorFlavioJS <FlavioJS@54d463be-8e91-2dee-dedb-b68131a5f0ec>2007-11-30 00:17:26 +0000
committerFlavioJS <FlavioJS@54d463be-8e91-2dee-dedb-b68131a5f0ec>2007-11-30 00:17:26 +0000
commitd157481db8a77069628b6186b9a31ea6267854ee (patch)
tree53c49ca6ad0be53d230ccdc2ed54c95d38b7f54d /src/char
parent5740884867c926482c52ce81fa1490500a365bfd (diff)
downloadhercules-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/char')
-rw-r--r--src/char/Makefile.in26
1 files changed, 13 insertions, 13 deletions
diff --git a/src/char/Makefile.in b/src/char/Makefile.in
index 334265819..359e19b01 100644
--- a/src/char/Makefile.in
+++ b/src/char/Makefile.in
@@ -1,17 +1,17 @@
-COMMON_OBJ = ../common/obj/core.o ../common/obj/socket.o ../common/obj/timer.o \
- ../common/obj/db.o ../common/obj/plugins.o ../common/obj/lock.o \
- ../common/obj/malloc.o ../common/obj/showmsg.o ../common/obj/utils.o \
- ../common/obj/strlib.o ../common/obj/grfio.o \
- ../common/obj/mapindex.o ../common/obj/ers.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/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/char.o obj/inter.o obj/int_party.o obj/int_guild.o \
- obj/int_storage.o obj/int_status.o obj/int_pet.o obj/int_homun.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
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@
@@ -21,11 +21,11 @@ CHAR_H = char.h inter.h int_party.h int_guild.h int_storage.h int_status.h int_p
all: char-server
-char-server: obj $(CHAR_OBJ) $(COMMON_OBJ)
+char-server: obj_txt $(CHAR_OBJ) $(COMMON_OBJ)
@CC@ @LDFLAGS@ -o ../../char-server@EXEEXT@ $(CHAR_OBJ) $(COMMON_OBJ) @LIBS@
clean:
- rm -rf *.o obj ../../char-server@EXEEXT@
+ rm -rf *.o obj_txt ../../char-server@EXEEXT@
help:
@echo "possible targets are 'char-server' 'all' 'clean' 'help'"
@@ -36,12 +36,12 @@ help:
#####################################################################
-obj:
- -mkdir obj
+obj_txt:
+ -mkdir obj_txt
-obj/%.o: %.c $(CHAR_H) $(COMMON_H)
+obj_txt/%.o: %.c $(CHAR_H) $(COMMON_H)
@CC@ @CFLAGS@ -DTXT_ONLY @CPPFLAGS@ -c $(OUTPUT_OPTION) $<
# missing common object files
-../common/obj/%.o:
+../common/obj_all/%.o:
@$(MAKE) -C ../common txt