From 31bcd5562693aec52a09d7f0d7ecae0b1a7ae9e4 Mon Sep 17 00:00:00 2001 From: Ben Burdette Date: Fri, 8 Apr 2022 15:53:24 -0600 Subject: [PATCH] clean up makefiles --- Makefile | 3 +-- doc/manual/manual.is-valid | 0 src/libcmd/local.mk | 2 -- 3 files changed, 1 insertion(+), 4 deletions(-) delete mode 100644 doc/manual/manual.is-valid diff --git a/Makefile b/Makefile index 02228910a..5040d2884 100644 --- a/Makefile +++ b/Makefile @@ -18,7 +18,7 @@ makefiles = \ misc/systemd/local.mk \ misc/launchd/local.mk \ misc/upstart/local.mk \ - # doc/manual/local.mk \ + doc/manual/local.mk \ tests/local.mk \ tests/plugins/local.mk @@ -34,5 +34,4 @@ endif include mk/lib.mk -# GLOBAL_CXXFLAGS += -g -Wall -include config.h -std=c++17 -fstack-usage GLOBAL_CXXFLAGS += -g -Wall -include config.h -std=c++17 -I src diff --git a/doc/manual/manual.is-valid b/doc/manual/manual.is-valid deleted file mode 100644 index e69de29bb..000000000 diff --git a/src/libcmd/local.mk b/src/libcmd/local.mk index a12837ce5..73a1a1086 100644 --- a/src/libcmd/local.mk +++ b/src/libcmd/local.mk @@ -8,9 +8,7 @@ libcmd_SOURCES := $(wildcard $(d)/*.cc) libcmd_CXXFLAGS += -I src/libutil -I src/libstore -I src/libexpr -I src/libmain -I src/libfetchers -I src/nix -# libcmd_LDFLAGS += -llowdown -pthread libcmd_LDFLAGS = $(EDITLINE_LIBS) -llowdown -pthread -# libcmd_LDFLAGS += $(LOWDOWN_LIBS) -pthread libcmd_LIBS = libstore libutil libexpr libmain libfetchers libnix