Changeset 987 for trunk/Makefile.frag


Ignore:
Timestamp:
2012-07-18T05:19:57+02:00 (2 years ago)
Author:
moo
Message:

main/ conflict with php/main/

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/Makefile.frag

    r982 r987  
    11XCACHE_PROC_SRC=$(srcdir)/processor/main.m4 
    22XCACHE_PROC_OUT=$(builddir)/processor.out 
    3 XCACHE_PROC_C=$(builddir)/main/xc_processor_real.c 
    4 XCACHE_PROC_H=$(builddir)/main/xc_processor.h 
     3XCACHE_PROC_C=$(builddir)/xcache/xc_processor_real.c 
     4XCACHE_PROC_H=$(builddir)/xcache/xc_processor.h 
    55XCACHE_INCLUDES_SRC=$(srcdir)/includes.c 
    66XCACHE_INCLUDES_I=$(builddir)/includes.i 
     
    2626    -$(XCACHE_INDENT) < $(XCACHE_PROC_OUT) > $(XCACHE_PROC_C).tmp && mv $(XCACHE_PROC_C).tmp $(XCACHE_PROC_C) 
    2727 
    28 $(builddir)/main/xc_processor.lo: $(XCACHE_PROC_C) $(XCACHE_PROC_H) $(srcdir)/main/xc_processor.c 
     28$(builddir)/xcache/xc_processor.lo: $(XCACHE_PROC_C) $(XCACHE_PROC_H) $(srcdir)/xcache/xc_processor.c 
    2929 
    30 $(builddir)/submodules/xc_disassembler.lo: $(XCACHE_PROC_H) $(srcdir)/main/xc_processor.c 
     30$(builddir)/submodules/xc_disassembler.lo: $(XCACHE_PROC_H) $(srcdir)/xcache/xc_processor.c 
    3131 
    3232$(builddir)/xc_opcode_spec.lo: $(srcdir)/xcache.h $(srcdir)/xc_opcode_spec.c $(srcdir)/xc_opcode_spec_def.h $(srcdir)/xc_const_string.h 
    3333 
    34 $(builddir)/xcache.lo: $(XCACHE_PROC_H) $(srcdir)/main/xc_shm.h $(srcdir)/util/xc_stack.h $(srcdir)/xcache_globals.h $(srcdir)/xcache.c $(srcdir)/util/xc_foreachcoresig.h $(srcdir)/main/xc_utils.h 
     34$(builddir)/xcache.lo: $(XCACHE_PROC_H) $(srcdir)/xcache/xc_shm.h $(srcdir)/util/xc_stack.h $(srcdir)/xcache_globals.h $(srcdir)/xcache.c $(srcdir)/util/xc_foreachcoresig.h $(srcdir)/xcache/xc_utils.h 
    3535 
    3636xcachesvnclean: clean 
Note: See TracChangeset for help on using the changeset viewer.