diff options
| author | Marvin Borner | 2021-04-05 19:37:28 +0200 |
|---|---|---|
| committer | Marvin Borner | 2021-04-05 19:37:28 +0200 |
| commit | ccc1dd7b4ba8ad5efe51aac32b26f0859d93fbe5 (patch) | |
| tree | df0e8330b14cea9ed0dd6546f69be24996f52a80 /libs/libtxt | |
| parent | 1f957aafa4423c1579627a279d861d03d76f3dbb (diff) | |
Restructured make layout and cleaned some apps
Diffstat (limited to 'libs/libtxt')
| -rw-r--r-- | libs/libtxt/Makefile | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/libs/libtxt/Makefile b/libs/libtxt/Makefile index 38fe01f..d073711 100644 --- a/libs/libtxt/Makefile +++ b/libs/libtxt/Makefile @@ -1,11 +1,8 @@ # MIT License, Copyright (c) 2020 Marvin Borner COBJS = keymap.o #xml.o html.o -CC = ccache ../../cross/opt/bin/i686-elf-gcc -LD = ccache ../../cross/opt/bin/i686-elf-ld -AR = ccache ../../cross/opt/bin/i686-elf-ar -CFLAGS = $(CFLAGS_DEFAULT) -I../ -I../libc/inc/ -pie -fPIE -fPIC -DUSER +CFLAGS = $(CFLAGS_DEFAULT) -I$(LIBS) -I$(LIBS)/libc/inc/ -pie -fPIE -fPIC -DUSER all: libtxt @@ -13,8 +10,8 @@ all: libtxt @$(CC) -c $(CFLAGS) $< -o $@ libtxt: $(COBJS) - @mkdir -p ../../build/ - @$(AR) rcs ../../build/libtxt.a $+ + @mkdir -p $(BUILD) + @$(AR) rcs $(BUILD)/libtxt.a $+ clean: @find . -name "*.o" -type f -delete |