From 8d3cfc8a051b9c8a1378b03c8068612e031d7855 Mon Sep 17 00:00:00 2001 From: Andrew Pamment Date: Mon, 20 Mar 2017 22:54:05 +1000 Subject: [PATCH] Oops --- Makefile.freebsd | 4 ---- Makefile.freebsd.WWW | 4 ---- Makefile.netbsd | 4 ---- Makefile.netbsd.WWW | 4 ---- 4 files changed, 16 deletions(-) diff --git a/Makefile.freebsd b/Makefile.freebsd index 1f90295..c42496a 100644 --- a/Makefile.freebsd +++ b/Makefile.freebsd @@ -26,11 +26,7 @@ $(JSMN): cd deps/jsmn/ && $(MAKE) $(CDK): -<<<<<<< HEAD cd deps/cdk-5.0-20161210/ && export CPPFLAGS=-I/usr/local/include ./configure --with-ncurses -======= - cd deps/cdk-5.0-20161210/ && ./configure ->>>>>>> 1f0a635cdf2a7776adc1af2f770ac4cffb297034 cd deps/cdk-5.0-20161210/ && $(MAKE) OBJ = inih/ini.o bbs.o main.o users.o main_menu.o mail_menu.o doors.o bbs_list.o chat_system.o email.o files.o settings.o lua_glue.o strings.o bluewave.o hashmap/hashmap.o diff --git a/Makefile.freebsd.WWW b/Makefile.freebsd.WWW index fa46ee4..87186dc 100644 --- a/Makefile.freebsd.WWW +++ b/Makefile.freebsd.WWW @@ -31,11 +31,7 @@ $(JSMN): cd deps/jsmn/ && $(MAKE) $(CDK): -<<<<<<< HEAD cd deps/cdk-5.0-20161210/ && export CPPFLAGS=-I/usr/local/include ./configure --with-ncurses -======= - cd deps/cdk-5.0-20161210/ && ./configure ->>>>>>> 1f0a635cdf2a7776adc1af2f770ac4cffb297034 cd deps/cdk-5.0-20161210/ && $(MAKE) OBJ = inih/ini.o bbs.o main.o users.o main_menu.o mail_menu.o doors.o bbs_list.o chat_system.o email.o files.o settings.o lua_glue.o strings.o bluewave.o www.o www_email.o www_msgs.o www_last10.o hashmap/hashmap.o diff --git a/Makefile.netbsd b/Makefile.netbsd index cd810ad..8168e93 100644 --- a/Makefile.netbsd +++ b/Makefile.netbsd @@ -26,11 +26,7 @@ $(JSMN): cd deps/jsmn/ && $(MAKE) $(CDK): -<<<<<<< HEAD cd deps/cdk-5.0-20161210/ && export CPPFLAGS=-I/usr/pkg/include ./configure --with-ncurses -======= - cd deps/cdk-5.0-20161210/ && ./configure ->>>>>>> 1f0a635cdf2a7776adc1af2f770ac4cffb297034 cd deps/cdk-5.0-20161210/ && $(MAKE) OBJ = inih/ini.o bbs.o main.o users.o main_menu.o mail_menu.o doors.o bbs_list.o chat_system.o email.o files.o settings.o lua_glue.o strings.o bluewave.o hashmap/hashmap.o diff --git a/Makefile.netbsd.WWW b/Makefile.netbsd.WWW index 36e7d47..a857bdf 100644 --- a/Makefile.netbsd.WWW +++ b/Makefile.netbsd.WWW @@ -31,11 +31,7 @@ $(JSMN): cd deps/jsmn/ && $(MAKE) $(CDK): -<<<<<<< HEAD cd deps/cdk-5.0-20161210/ && export CPPFLAGS=-I/usr/pkg/include ./configure --with-ncurses -======= - cd deps/cdk-5.0-20161210/ && ./configure ->>>>>>> 1f0a635cdf2a7776adc1af2f770ac4cffb297034 cd deps/cdk-5.0-20161210/ && $(MAKE) OBJ = inih/ini.o bbs.o main.o users.o main_menu.o mail_menu.o doors.o bbs_list.o chat_system.o email.o files.o settings.o lua_glue.o strings.o bluewave.o www.o www_email.o www_msgs.o www_last10.o hashmap/hashmap.o