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/ladmin | |
| 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/ladmin')
| -rw-r--r-- | src/ladmin/Makefile.in | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/src/ladmin/Makefile.in b/src/ladmin/Makefile.in index 87cc2ad49..4703dded1 100644 --- a/src/ladmin/Makefile.in +++ b/src/ladmin/Makefile.in @@ -1,12 +1,12 @@ -COMMON_OBJ = ../common/obj/minicore.o ../common/obj/minisocket.o ../common/obj/timer.o \ - ../common/obj/malloc.o ../common/obj/showmsg.o ../common/obj/strlib.o \ - ../common/obj/utils.o ../common/obj/md5calc.o +COMMON_OBJ = ../common/obj_all/minicore.o ../common/obj_all/minisocket.o ../common/obj_all/timer.o \ + ../common/obj_all/malloc.o ../common/obj_all/showmsg.o ../common/obj_all/strlib.o \ + ../common/obj_all/utils.o ../common/obj_all/md5calc.o COMMON_H = ../common/core.h ../common/socket.h ../common/timer.h ../common/mmo.h \ ../common/version.h ../common/malloc.h ../common/showmsg.h ../common/strlib.h \ ../common/utils.h ../common/md5calc.h ../common/cbasetypes.h -LADMIN_OBJ = obj/ladmin.o +LADMIN_OBJ = obj_all/ladmin.o LADMIN_H = ladmin.h @SET_MAKE@ @@ -16,11 +16,11 @@ LADMIN_H = ladmin.h all: ladmin -ladmin: obj $(LADMIN_OBJ) $(COMMON_OBJ) +ladmin: obj_all $(LADMIN_OBJ) $(COMMON_OBJ) @CC@ @LDFLAGS@ -o ../../ladmin@EXEEXT@ $(LADMIN_OBJ) $(COMMON_OBJ) @LIBS@ clean: - rm -rf *.o obj ../../ladmin@EXEEXT@ + rm -rf *.o obj_all ../../ladmin@EXEEXT@ help: @echo "possible targets are 'ladmin' 'all' 'clean' 'help'" @@ -31,15 +31,15 @@ help: ##################################################################### -obj: - -mkdir obj +obj_all: + -mkdir obj_all -obj/%.o: %.c $(LADMIN_H) $(COMMON_H) +obj_all/%.o: %.c $(LADMIN_H) $(COMMON_H) @CC@ @CFLAGS@ @LDFLAGS@ @CPPFLAGS@ -c $(OUTPUT_OPTION) $< # missing common object files -../common/obj/%.o: +../common/obj_all/%.o: @$(MAKE) -C ../common txt -../common/obj/mini%.o: +../common/obj_all/mini%.o: @$(MAKE) -C ../common txt |