| /branches/dynload/uspace/app/dltest/Makefile |
|---|
| 33,7 → 33,6 |
| # |
| LIBC_PREFIX = ../../lib/libc |
| LIBCS_PREFIX = ../../lib/libc/shared |
| SOFTINT_PREFIX = ../../lib/softint |
| RTLD_PREFIX = ../../lib/rtld |
| include $(LIBC_PREFIX)/Makefile.toolchain |
| 65,7 → 64,7 |
| $(CC) $(DEFS) $(CFLAGS) -M $(SOURCES) > Makefile.depend |
| $(OUTPUT): $(OBJECTS) $(LIBS) |
| $(LD) -T $(LIBCS_PREFIX)/arch/$(ARCH)/_link.ld $(OBJECTS) $(LIBS) $(LFLAGS) -o $@ -Map $(OUTPUT).map |
| $(LD) -T $(LIBC_PREFIX)/shared/arch/$(ARCH)/_link.ld $(OBJECTS) $(LIBS) $(LFLAGS) -o $@ -Map $(OUTPUT).map |
| disasm: |
| $(OBJDUMP) -d $(OUTPUT) >$(OUTPUT).disasm |
| /branches/dynload/uspace/lib/libc/shared/Makefile |
|---|
| 26,15 → 26,16 |
| # THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
| # |
| include ../../../version |
| include ../../Makefile.config |
| include ../../../../version |
| include ../../../Makefile.config |
| ## Setup toolchain |
| # |
| LIBC_PREFIX = ../../lib/libc |
| SOFTINT_PREFIX = ../../lib/softint |
| RTLD_PREFIX = ../../lib/rtld |
| LIBC_PREFIX = ../../../lib/libc |
| APP_LIBC_PREFIX = ../../lib/libc |
| SOFTINT_PREFIX = ../../../lib/softint |
| RTLD_PREFIX = ../../../lib/rtld |
| include $(LIBC_PREFIX)/Makefile.toolchain |
| #include arch/$(ARCH)/Makefile.inc |
| ARCH_SOURCES := |
| 78,4 → 79,4 |
| $(CC) $(DEFS) $(CFLAGS) -DLIBC_PREFIX=$(LIBC_PREFIX) -E -x c $< | grep -v "^\#" > $@ |
| arch/$(ARCH)/_link.ld: arch/$(ARCH)/_link.ld.in |
| $(CC) $(DEFS) $(CFLAGS) -DLIBC_PREFIX=$(LIBC_PREFIX) -E -x c $< | grep -v "^\#" > $@ |
| $(CC) $(DEFS) $(CFLAGS) -DLIBC_PREFIX=$(APP_LIBC_PREFIX) -E -x c $< | grep -v "^\#" > $@ |
| /branches/dynload/boot/arch/ppc32/loader/Makefile |
|---|
| 108,7 → 108,7 |
| RD_LIBS = \ |
| $(USPACEDIR)/lib/rtld/rtld \ |
| $(USPACEDIR)/lib/libc-shared/libc.so.0 |
| $(USPACEDIR)/lib/libc/shared/libc.so.0 |
| OBJECTS := $(addsuffix .o,$(basename $(SOURCES))) |
| COMPONENT_OBJECTS := $(addsuffix .o,$(basename $(notdir $(COMPONENTS)))) |
| /branches/dynload/boot/arch/ia32/Makefile.inc |
|---|
| 57,7 → 57,7 |
| RD_LIBS = \ |
| $(USPACEDIR)/lib/rtld/rtld \ |
| $(USPACEDIR)/lib/libc-shared/libc.so.0 |
| $(USPACEDIR)/lib/libc/shared/libc.so.0 |
| build: $(BASE)/image.iso |