switch to c++

diff --git a/Makefile b/Makefile
index 95697c9..78268cb 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,17 +1,17 @@
 TARGET := ircd
 SOURCES := \
-       src/main.c       \
-       src/admin.c      \
-       src/irc.c        \
-       src/ircfmt.c     \
-       src/job.c        \
-       src/net.c        \
-       src/netpoll.c    \
-       src/netsock.c    \
-       src/passwd.c     \
-       src/map.c        \
-       src/util.c       \
-       src/crypt_blowfish.c
+       src/main.cpp     \
+       src/admin.cpp    \
+       src/irc.cpp      \
+       src/ircfmt.cpp   \
+       src/job.cpp      \
+       src/net.cpp      \
+       src/netpoll.cpp  \
+       src/netsock.cpp  \
+       src/passwd.cpp   \
+       src/map.cpp      \
+       src/util.cpp     \
+       src/crypt_blowfish.cpp
 HEADERS := \
        src/common.h     \
        src/config.h     \
@@ -30,19 +30,16 @@ HEADERS := \
 -include config.mk
 
 ifdef USE_TLS
-CFLAGS += -DHAS_TLS
 CXXFLAGS += -DHAS_TLS
 WANTLIBS += libtls
 endif
 
 ifdef USE_LUA
-CFLAGS += -DHAS_LUA
 CXXFLAGS += -DHAS_LUA
 WANTLIBS += lua5.4
 endif
 
 ifdef WANTLIBS
-CFLAGS += $(shell pkg-config --cflags $(WANTLIBS))
 CXXFLAGS += $(shell pkg-config --cflags $(WANTLIBS))
 LDLIBS += $(shell pkg-config --libs $(WANTLIBS))
 endif
@@ -53,8 +50,6 @@ clean:
        $(RM) $(TARGET) setpass
 
 $(TARGET): $(SOURCES) $(HEADERS)
-       $(CC) $(CFLAGS) $(LDFLAGS) $(SOURCES) $(LDLIBS) -o $@
-$(TARGET)-cxx: $(SOURCES) $(HEADERS)
-       $(CXX) -x c++ $(CXXFLAGS) $(LDFLAGS) $(SOURCES) $(LDLIBS) -o $@
-setpass: src/setpass.c src/passwd.c src/crypt_blowfish.c src/passwd.h src/netsock.h
-       $(CC) $(CFLAGS) $(LDFLAGS) src/setpass.c src/passwd.c src/crypt_blowfish.c $(LDLIBS) -o $@
+       $(CXX) $(CXXFLAGS) $(LDFLAGS) $(SOURCES) $(LDLIBS) -o $@
+setpass: src/setpass.cpp src/passwd.cpp src/crypt_blowfish.cpp src/passwd.h src/netsock.h
+       $(CXX) $(CXXFLAGS) $(LDFLAGS) src/setpass.cpp src/passwd.cpp src/crypt_blowfish.cpp $(LDLIBS) -o $@

diff --git a/config.example.mk b/config.example.mk
index 8049e1d..38237b0 100644 (file)
--- a/config.example.mk
+++ b/config.example.mk
@@ -1,9 +1,7 @@
 HEADERS+=config.mk
-CC=clang
+CXX=clang++
 WARNS=-Wall -Wextra -Wstrict-prototypes -Wold-style-definition -Wmissing-prototypes
 #-Wmissing-variable-declarations
-WARNSXX=-Wall -Wextra -Wstrict-prototypes -Wold-style-definition -Wmissing-prototypes
-CFLAGS=$(WARNS) -DNETPOLL_USE_POLL -D_GNU_SOURCE
-CXXFLAGS=$(WARNSXX) -DNETPOLL_USE_POLL -D_GNU_SOURCE
+CXXFLAGS=$(WARNS) -DNETPOLL_USE_POLL -D_GNU_SOURCE
 USE_TLS=1
 USE_LUA=1

diff --git a/src/admin.c b/src/admin.cpp
similarity index 100%
rename from src/admin.c
rename to src/admin.cpp

diff --git a/src/crypt_blowfish.c b/src/crypt_blowfish.cpp
similarity index 100%
rename from src/crypt_blowfish.c
rename to src/crypt_blowfish.cpp

diff --git a/src/irc.c b/src/irc.cpp
similarity index 100%
rename from src/irc.c
rename to src/irc.cpp

diff --git a/src/ircfmt.c b/src/ircfmt.cpp
similarity index 100%
rename from src/ircfmt.c
rename to src/ircfmt.cpp

diff --git a/src/job.c b/src/job.cpp
similarity index 100%
rename from src/job.c
rename to src/job.cpp

diff --git a/src/main.c b/src/main.cpp
similarity index 100%
rename from src/main.c
rename to src/main.cpp

diff --git a/src/map.c b/src/map.cpp
similarity index 100%
rename from src/map.c
rename to src/map.cpp

diff --git a/src/net.c b/src/net.cpp
similarity index 100%
rename from src/net.c
rename to src/net.cpp

diff --git a/src/netpoll.c b/src/netpoll.cpp
similarity index 100%
rename from src/netpoll.c
rename to src/netpoll.cpp

diff --git a/src/netsock.c b/src/netsock.cpp
similarity index 100%
rename from src/netsock.c
rename to src/netsock.cpp

diff --git a/src/passwd.c b/src/passwd.cpp
similarity index 100%
rename from src/passwd.c
rename to src/passwd.cpp

diff --git a/src/setpass.c b/src/setpass.cpp
similarity index 100%
rename from src/setpass.c
rename to src/setpass.cpp

diff --git a/src/util.c b/src/util.cpp
similarity index 100%
rename from src/util.c
rename to src/util.cpp