summaryrefslogtreecommitdiff
path: root/src/common
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/common
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/common')
-rw-r--r--src/common/Makefile.in22
1 files changed, 11 insertions, 11 deletions
diff --git a/src/common/Makefile.in b/src/common/Makefile.in
index 89bb8a75a..bda9e1911 100644
--- a/src/common/Makefile.in
+++ b/src/common/Makefile.in
@@ -1,8 +1,8 @@
-COMMON_OBJ = obj/core.o obj/socket.o obj/timer.o obj/db.o obj/plugins.o obj/lock.o \
- obj/nullpo.o obj/malloc.o obj/showmsg.o obj/strlib.o obj/utils.o \
- obj/grfio.o obj/mapindex.o obj/ers.o obj/md5calc.o \
- obj/minicore.o obj/minisocket.o obj/minimalloc.o
+COMMON_OBJ = obj_all/core.o obj_all/socket.o obj_all/timer.o obj_all/db.o obj_all/plugins.o obj_all/lock.o \
+ obj_all/nullpo.o obj_all/malloc.o obj_all/showmsg.o obj_all/strlib.o obj_all/utils.o \
+ obj_all/grfio.o obj_all/mapindex.o obj_all/ers.o obj_all/md5calc.o \
+ obj_all/minicore.o obj_all/minisocket.o obj_all/minimalloc.o
COMMON_H = svnversion.h mmo.h plugin.h version.h \
core.h socket.h timer.h db.h plugins.h lock.h \
nullpo.h malloc.h showmsg.h strlib.h utils.h \
@@ -32,7 +32,7 @@ txt: common
sql: $(SQL_DEPENDS)
clean:
- rm -rf *.o obj obj_sql svnversion.h
+ rm -rf *.o obj_all obj_sql svnversion.h
help:
@echo "possible targets are 'txt' 'sql' 'all' 'clean' 'help'"
@@ -48,21 +48,21 @@ needs_mysql:
@echo "MySQL not found or disabled by the configure script"
@exit 1
-obj:
- -mkdir obj
+obj_all:
+ -mkdir obj_all
obj_sql:
-mkdir obj_sql
-common: obj $(COMMON_OBJ)
+common: obj_all $(COMMON_OBJ)
common_sql: obj_sql $(COMMON_SQL_OBJ)
-obj/%.o: %.c $(COMMON_H)
+obj_all/%.o: %.c $(COMMON_H)
@CC@ @CFLAGS@ @LDFLAGS@ @CPPFLAGS@ -c $(OUTPUT_OPTION) $<
-obj/mini%.o: %.c $(COMMON_H)
+obj_all/mini%.o: %.c $(COMMON_H)
@CC@ @CFLAGS@ -DMINICORE @LDFLAGS@ @CPPFLAGS@ -c $(OUTPUT_OPTION) $<
obj_sql/%.o: %.c $(COMMON_H) $(COMMON_SQL_H)
@@ -74,7 +74,7 @@ HAVESVN = $(shell which svnversion)
ifeq ($(findstring /,$(HAVESVN)), /)
svnversion.h:
@printf "#define SVNVERSION " > svnversion.h
- @svnversion . >> svnversion.h
+ @svnversion .. >> svnversion.h
@printf "\n" >> svnversion.h
else
svnversion.h: