Move core .cpp files to src/

Makefile.in

@@ -15,7 +15,7 @@ includedir  := @includedir@
 sbindir     := @sbindir@
 localstatedir := @localstatedir@
 CXX      := @CXX@
-CXXFLAGS := @CPPFLAGS@ @CXXFLAGS@ -I$(srcdir)/headers -Iheaders
+CXXFLAGS := @CPPFLAGS@ @CXXFLAGS@ -I$(srcdir)/include -Iinclude
 LDFLAGS  := @LDFLAGS@
 LIBS     := @LIBS@
 LIBZNC   := @LIBZNC@
@@ -32,10 +32,11 @@ LIB_SRCS  := ZNCString.cpp Csocket.cpp znc.cpp IRCNetwork.cpp User.cpp IRCSock.c
 	Client.cpp Chan.cpp Nick.cpp Server.cpp Modules.cpp MD5.cpp Buffer.cpp Utils.cpp \
 	FileUtils.cpp HTTPSock.cpp Template.cpp ClientCommand.cpp Socket.cpp SHA256.cpp \
 	WebModules.cpp Listener.cpp Config.cpp ZNCDebug.cpp
-BIN_SRCS  := main.cpp
+LIB_SRCS  := $(addprefix src/,$(LIB_SRCS))
+BIN_SRCS  := src/main.cpp
 LIB_OBJS  := $(patsubst %cpp,%o,$(LIB_SRCS))
 BIN_OBJS  := $(patsubst %cpp,%o,$(BIN_SRCS))
-CLEAN     := znc *.o core core.*
+CLEAN     := znc src/*.o core core.*
 DISTCLEAN := Makefile config.log config.status znc-config znc-buildmod .depend \
 	modules/.depend modules/Makefile man/Makefile znc.pc znc-uninstalled.pc
 
@@ -96,10 +97,10 @@ clean:
 distclean: clean
 	rm -rf $(DISTCLEAN)
 
-%.o: %.cpp Makefile
-	@mkdir -p .depend
-	$(E) Building $@...
-	$(Q)$(CXX) $(CXXFLAGS) -c -o $@ $< -MMD -MF .depend/$@.dep
+src/%.o: src/%.cpp Makefile
+	@mkdir -p .depend src
+	$(E) Building core object $*...
+	$(Q)$(CXX) $(CXXFLAGS) -c -o $@ $< -MMD -MF .depend/$*.dep
 
 install: znc $(LIBZNC)
 	mkdir -p $(DESTDIR)$(bindir)
@@ -113,8 +114,8 @@ install: znc $(LIBZNC)
 	$(INSTALL_PROGRAM) znc $(DESTDIR)$(bindir)
 	$(INSTALL_SCRIPT) znc-config $(DESTDIR)$(bindir)
 	$(INSTALL_SCRIPT) znc-buildmod $(DESTDIR)$(bindir)
-	$(INSTALL_DATA) $(srcdir)/headers/znc/*.h $(DESTDIR)$(includedir)/znc
-	$(INSTALL_DATA) headers/znc/zncconfig.h $(DESTDIR)$(includedir)/znc
+	$(INSTALL_DATA) $(srcdir)/include/znc/*.h $(DESTDIR)$(includedir)/znc
+	$(INSTALL_DATA) include/znc/zncconfig.h $(DESTDIR)$(includedir)/znc
 	$(INSTALL_DATA) znc.pc $(DESTDIR)$(PKGCONFIGDIR)
 	@$(MAKE) -C modules install DESTDIR=$(DESTDIR);
 	if test -n "$(LIBZNC)"; then \

configure.ac

@@ -9,9 +9,9 @@ AC_PREREQ([2.62])
 dnl Keep the version number in sync with main.h!
 AC_INIT([znc], [0.203])
 AC_CONFIG_MACRO_DIR([m4])
-AC_CONFIG_SRCDIR([znc.cpp])
+AC_CONFIG_SRCDIR([src/znc.cpp])
 AC_LANG([C++])
-AC_CONFIG_HEADERS([headers/znc/zncconfig.h])
+AC_CONFIG_HEADERS([include/znc/zncconfig.h])
 AH_TOP([#ifndef ZNCCONFIG_H
 #define ZNCCONFIG_H])
 AH_BOTTOM([#endif /* ZNCCONFIG_H */])