summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn-Mark Bell <jmb@netsurf-browser.org>2014-11-16 10:47:22 (GMT)
committer John-Mark Bell <jmb@netsurf-browser.org>2014-11-16 10:47:22 (GMT)
commit6ffc0d1ae3c24e17e3824e8814d9de3bf926ed0f (patch)
treeae948c2f2052bbc2d232c46a1cdbf4d9234e69ef
parent9392f7f5f4fd3bc246c3ec63ba22b699298f427f (diff)
downloadlibrufl-6ffc0d1ae3c24e17e3824e8814d9de3bf926ed0f.tar.gz
librufl-6ffc0d1ae3c24e17e3824e8814d9de3bf926ed0f.tar.bz2
Fix up for new buildsystem
-rw-r--r--Makefile6
1 files changed, 3 insertions, 3 deletions
diff --git a/Makefile b/Makefile
index e163122..2c54606 100644
--- a/Makefile
+++ b/Makefile
@@ -16,8 +16,8 @@ WARNFLAGS := -Wall -W -Wundef -Wpointer-arith -Wcast-align \
-Wwrite-strings -Wstrict-prototypes -Wmissing-prototypes \
-Wmissing-declarations -Wnested-externs -pedantic
# BeOS/Haiku/AmigaOS4 standard library headers create warnings
-ifneq ($(TARGET),beos)
- ifneq ($(TARGET),AmigaOS)
+ifneq ($(BUILD),i586-pc-haiku)
+ ifneq ($(findstring amigaos,$(BUILD)),amigaos)
WARNFLAGS := $(WARNFLAGS) -Werror
endif
endif
@@ -31,7 +31,7 @@ endif
# OSLib
ifneq ($(findstring clean,$(MAKECMDGOALS)),clean)
- ifeq ($(TARGET),riscos)
+ ifeq ($(TARGET),arm-unknown-riscos)
CFLAGS := $(CFLAGS) -I$(PREFIX)/include
LDFLAGS := $(LDFLAGS) -lOSLib32
endif