diff options
| author | shennetsind <ind@henn.et> | 2013-09-25 09:07:33 -0300 |
|---|---|---|
| committer | shennetsind <ind@henn.et> | 2013-09-25 09:07:33 -0300 |
| commit | 13afb7e0bf35bacc9c90c7dffe34120ddd2fd099 (patch) | |
| tree | 180c739ac69aceab8ce4cc6151030539a32ac8c3 /3rdparty/libconfig/Makefile.in | |
| parent | 1114eb3da58b078258a824424fef687a1ccee90c (diff) | |
| parent | 66979ef89363c03e3cc02d63feb5248836daff4e (diff) | |
| download | hercules-13afb7e0bf35bacc9c90c7dffe34120ddd2fd099.tar.gz hercules-13afb7e0bf35bacc9c90c7dffe34120ddd2fd099.tar.bz2 hercules-13afb7e0bf35bacc9c90c7dffe34120ddd2fd099.tar.xz hercules-13afb7e0bf35bacc9c90c7dffe34120ddd2fd099.zip | |
Merge branch 'master' of https://github.com/HerculesWS/Hercules
Conflicts:
src/map/chrif.c
src/map/clif.c
src/map/homunculus.c
src/map/pet.c
src/map/script.c
src/map/skill.c
src/map/status.c
All clear.
Diffstat (limited to '3rdparty/libconfig/Makefile.in')
| -rw-r--r-- | 3rdparty/libconfig/Makefile.in | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/3rdparty/libconfig/Makefile.in b/3rdparty/libconfig/Makefile.in index f3c6e986d..048a1b3b7 100644 --- a/3rdparty/libconfig/Makefile.in +++ b/3rdparty/libconfig/Makefile.in @@ -8,7 +8,7 @@ CC = @CC@ export CC ##################################################################### -.PHONY : all clean help +.PHONY: all clean help all: $(LIBCONFIG_OBJ) @@ -24,6 +24,9 @@ help: ##################################################################### -%.o: %.c $(LIBCONFIG_H) +Makefile: Makefile.in + @$(MAKE) -C ../.. 3rdparty/libconfig/Makefile + +%.o: %.c $(LIBCONFIG_H) Makefile @echo " CC $<" @$(CC) @CFLAGS@ @DEFS@ @CPPFLAGS@ -c $(OUTPUT_OPTION) $< |