From b583bb072f16546ddf72fd2771454404feb86b67 Mon Sep 17 00:00:00 2001 From: right-hearted Date: Sat, 5 Apr 2014 21:39:15 +0000 Subject: [PATCH] Some changes in paths git-svn-id: svn://kolibrios.org@4773 a494cfbc-eb01-0410-851d-a64ba20cac60 --- contrib/media/updf/Makefile | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/contrib/media/updf/Makefile b/contrib/media/updf/Makefile index 50ec04f4a8..89794b8a77 100644 --- a/contrib/media/updf/Makefile +++ b/contrib/media/updf/Makefile @@ -8,9 +8,9 @@ GEN := generated # --- Variables, Commands, etc... --- default: all -LDFLAGS = -T./include/scripts/menuetos_app_v01.ld -nostdlib -L ./include/lib -melf_i386 -CFLAGS += -Ifitz -Ipdf -Ixps -Iscripts -fno-stack-protector -nostdinc -fno-builtin -m32 -I./include -fno-pic -LIBS += -lfreetype2 -lpng -ljbig2dec -ljpeg -lopenjpeg -lz -lm -lc -m32 +LDFLAGS = -Tinclude/scripts/menuetos_app_v01.ld -nostdlib -L include/lib -melf_i386 +CFLAGS += -Ifitz -Ipdf -Ixps -Iscripts -fno-stack-protector -nostdinc -fno-builtin -m32 -I include -fno-pic +LIBS += -lfreetype2 -lpng -ljbig2dec -ljpeg -lopenjpeg -lz -lm -lc #include Makerules #include Makethird @@ -31,7 +31,7 @@ endif CC_CMD = $(QUIET_CC) $(CC) $(CFLAGS) -o $@ -c $< AR_CMD = $(QUIET_AR) $(AR) cru $@ $^ -LINK_CMD = $(QUIET_LINK) ld $(LDFLAGS) -o $@ ./stub/crt0.o $^ build/debug/snprintf.o $(LIBS) +LINK_CMD = $(QUIET_LINK) ld $(LDFLAGS) -o $@ include/crt0.o $^ build/debug/snprintf.o $(LIBS) MKDIR_CMD = $(QUIET_MKDIR) mkdir -p $@ # --- Rules --- @@ -152,10 +152,7 @@ install: $(MUXPS_LIB) $(MUPDF_LIB) $(FITZ_LIB) $(PDF_APPS) $(XPS_APPS) $(MUPDF) # --- Clean and Default --- -all: crt0 $(THIRD_LIBS) $(FITZ_LIB) $(PDF_APPS) $(XPS_APPS) $(MUPDF) - -crt0: - $(MAKE) -C ./stub +all: $(THIRD_LIBS) $(FITZ_LIB) $(PDF_APPS) $(XPS_APPS) $(MUPDF) clean: rm -rf $(OUT)