diff options
| author | Raimo Niskanen <[email protected]> | 2012-01-11 18:33:19 +0100 |
|---|---|---|
| committer | Raimo Niskanen <[email protected]> | 2012-01-23 16:58:41 +0100 |
| commit | ec052cc7adda144d6233f38e665850bb20ff0e0e (patch) | |
| tree | df019abe9b5c0b4714775de24cfc0fb62d363540 /erts/emulator/pcre | |
| parent | 6fafcdcbe96d1f67d57715011acd1bb0ca858949 (diff) | |
| download | otp-ec052cc7adda144d6233f38e665850bb20ff0e0e.tar.gz otp-ec052cc7adda144d6233f38e665850bb20ff0e0e.tar.bz2 otp-ec052cc7adda144d6233f38e665850bb20ff0e0e.zip | |
erts: Fix dependencies between targets generate and depend
* Make generate and depend.mk automatically.
* Do not make depend.mk for targets clean and generate.
* Remove old replaced CREATE_DIRS cruft.
* Fiercer remove by target clean.
* Move depend.mk to Target/Type/Flavor directory.
Diffstat (limited to 'erts/emulator/pcre')
| -rw-r--r-- | erts/emulator/pcre/pcre.mk | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/erts/emulator/pcre/pcre.mk b/erts/emulator/pcre/pcre.mk index 1aad98ff04..352137b341 100644 --- a/erts/emulator/pcre/pcre.mk +++ b/erts/emulator/pcre/pcre.mk @@ -41,7 +41,7 @@ pcre_xclass.o PCRE_OBJS = $(PCRE_O:%=$(PCRE_OBJDIR)/%) -GENINC = pcre/pcre_exec_loop_break_cases.inc +PCRE_GENINC = $(ERL_TOP)/erts/emulator/pcre/pcre_exec_loop_break_cases.inc PCRE_OBJDIR = $(ERL_TOP)/erts/emulator/pcre/obj/$(TARGET)/$(TYPE) @@ -59,12 +59,12 @@ endif $(PCRE_OBJDIR)/%.o: pcre/%.c $(CC) -c $(PCRE_CFLAGS) -o $@ $< -$(GENINC): pcre/pcre_exec.c +$(PCRE_GENINC): pcre/pcre_exec.c for x in `grep -n COST_CHK pcre/pcre_exec.c | grep -v 'COST_CHK(N)' | awk -F: '{print $$1}'`; \ do \ N=`expr $$x + 100`; \ echo "case $$N: goto L_LOOP_COUNT_$${x};"; \ - done > $(GENINC) + done > $(PCRE_GENINC) # Dependencies. @@ -77,7 +77,7 @@ $(PCRE_OBJDIR)/pcre_config.o: pcre/pcre_config.c pcre/pcre_internal.h \ $(PCRE_OBJDIR)/pcre_dfa_exec.o: pcre/pcre_dfa_exec.c pcre/pcre_internal.h \ pcre/local_config.h pcre/pcre.h pcre/ucp.h $(PCRE_OBJDIR)/pcre_exec.o: pcre/pcre_exec.c pcre/pcre_internal.h \ - pcre/local_config.h pcre/pcre.h pcre/ucp.h $(GENINC) + pcre/local_config.h pcre/pcre.h pcre/ucp.h $(PCRE_GENINC) $(PCRE_OBJDIR)/pcre_fullinfo.o: pcre/pcre_fullinfo.c pcre/pcre_internal.h \ pcre/local_config.h pcre/pcre.h pcre/ucp.h $(PCRE_OBJDIR)/pcre_get.o: pcre/pcre_get.c pcre/pcre_internal.h \ |