diff --git a/.travis.yml b/.travis.yml index 2b0d5170..4bc7ac28 100644 --- a/.travis.yml +++ b/.travis.yml @@ -27,12 +27,9 @@ matrix: compiler: clang script: - export CFLAGS=-Werror; - make clean; - make; - make clean; - make -f scripts/make_native/Makefile.native; - make clean; + - export CFLAGS=-Werror; + - make clean; make; + - make clean; before_deploy: - unset CFLAGS diff --git a/scripts/make_native/Makefile.native b/scripts/make_native/Makefile.native deleted file mode 100644 index 5cfa3ee9..00000000 --- a/scripts/make_native/Makefile.native +++ /dev/null @@ -1,55 +0,0 @@ -# This Makefile optimizes native builds. It -# - builds for native architecture (-march=native) -# - does not have debug build option -# -# NOTE: This file is used in Travis CI for stricter test builds - -VERSION = 1.6 - -PREFIX ?= /usr/local -MANPREFIX = $(PREFIX)/share/man - -CFLAGS += -O3 -march=native -Wall -Wextra -Wno-unused-parameter -LDLIBS = -lreadline - -ifeq ($(shell pkg-config ncursesw && echo 1),1) - CFLAGS += $(shell pkg-config --cflags ncursesw) - LDLIBS += $(shell pkg-config --libs ncursesw) -else - LDLIBS += -lncurses -endif - -DISTFILES = nlay nnn.c nnn.h nnn.1 Makefile README.md LICENSE -SRC = nnn.c -BIN = nnn -PLAYER = nlay - -all: $(BIN) $(PLAYER) - -$(SRC): nnn.h - -$(BIN): $(SRC) - $(CC) $(CFLAGS) -o $@ $^ $(LDFLAGS) $(LDLIBS) - strip $@ - -install: all - mkdir -p $(DESTDIR)$(PREFIX)/bin - cp -f $(BIN) $(DESTDIR)$(PREFIX)/bin - cp -f $(PLAYER) $(DESTDIR)$(PREFIX)/bin - mkdir -p $(DESTDIR)$(MANPREFIX)/man1 - cp -f $(BIN).1 $(DESTDIR)$(MANPREFIX)/man1 - -uninstall: - rm -f $(DESTDIR)$(PREFIX)/bin/$(BIN) - rm -f $(DESTDIR)$(PREFIX)/bin/$(PLAYER) - rm -f $(DESTDIR)$(MANPREFIX)/man1/$(BIN).1 - -dist: - mkdir -p nnn-$(VERSION) - cp $(DISTFILES) nnn-$(VERSION) - tar -cf nnn-$(VERSION).tar nnn-$(VERSION) - gzip nnn-$(VERSION).tar - rm -rf nnn-$(VERSION) - -clean: - rm -f $(BIN) nnn-$(VERSION).tar.gz