Refactor tagmanager source files architecture

Split ctags and tagmanager sources, as follows:

tagmanager/ctags: the parsers, more or less upstream CTags;
tagmanager/mio: local MIO library copy;
tagmanager/src: actual tagmanager sources.

configure.ac

@@ -105,8 +105,9 @@ AC_CONFIG_FILES([
 		icons/48x48/Makefile
 		icons/scalable/Makefile
 		tagmanager/Makefile
-		tagmanager/include/Makefile
+		tagmanager/ctags/Makefile
 		tagmanager/mio/Makefile
+		tagmanager/src/Makefile
 		scintilla/Makefile
 		scintilla/include/Makefile
 		src/Makefile

plugins/Makefile.am

@@ -38,7 +38,7 @@ MINGW_CFLAGS = \
 			-DGTK \
 			-I$(top_srcdir) \
 			-I$(top_srcdir)/src \
-			-I$(top_srcdir)/tagmanager/include \
+			-I$(top_srcdir)/tagmanager/src \
 			-I$(top_srcdir)/scintilla/include \
 			$(GTK_CFLAGS) \
 			$(PLUGIN_CFLAGS)
@@ -106,7 +106,7 @@ AM_CPPFLAGS = \
 	-DDATADIR=\"$(datadir)\" \
 	-DGTK \
 	-I$(top_srcdir)/src \
-	-I$(top_srcdir)/tagmanager/include \
+	-I$(top_srcdir)/tagmanager/src \
 	-I$(top_srcdir)/scintilla/include \
 	$(GTK_CFLAGS) \
 	$(PLUGIN_CFLAGS)

src/Makefile.am

@@ -74,8 +74,11 @@ geany_include_HEADERS = \
 	utils.h
 
 
-INCLUDES = -I$(top_srcdir) -I$(srcdir)/../scintilla/include -I$(srcdir)/../tagmanager/include \
+INCLUDES = \
-			-I$(topsrcdir)/tagmanager/mio @GTK_CFLAGS@ @GTHREAD_CFLAGS@
+	-I$(top_srcdir) \
+	-I$(top_srcdir)/scintilla/include \
+	-I$(top_srcdir)/tagmanager/src \
+	@GTK_CFLAGS@ @GTHREAD_CFLAGS@
 
 # tell automake we have a C++ file so it uses the C++ linker we need for Scintilla
 nodist_EXTRA_geany_SOURCES = dummy.cxx
@@ -86,9 +89,16 @@ if MINGW
 
 geany_SOURCES = $(SRCS) win32.c win32.h
 
-geany_LDADD = ../scintilla/libscintilla.a ../tagmanager/libtagmanager.a ../tagmanager/mio/libmio.a \
+geany_LDADD = \
-				@GTK_LIBS@ @GTHREAD_LIBS@ $(INTLLIBS) -lole32 -luuid -liberty -lwsock32 \
+	$(top_builddir)/scintilla/libscintilla.a \
-				geany_private.res
+	$(top_builddir)/tagmanager/ctags/libctags.a \
+	$(top_builddir)/tagmanager/mio/libmio.a \
+	$(top_builddir)/tagmanager/src/libtagmanager.a \
+	@GTK_LIBS@ \
+	@GTHREAD_LIBS@ \
+	$(INTLLIBS) \
+	-lole32 -luuid -liberty -lwsock32 \
+	geany_private.res
 
 AM_CFLAGS = -DGEANY_DATADIR=\"data\" \
 			-DGEANY_DOCDIR=\"\" \
@@ -114,8 +124,14 @@ else
 
 geany_SOURCES = $(SRCS) vte.c vte.h
 
-geany_LDADD = ../scintilla/libscintilla.a ../tagmanager/libtagmanager.a ../tagmanager/mio/libmio.a \
+geany_LDADD = \
-				@GTK_LIBS@ @GTHREAD_LIBS@ $(INTLLIBS)
+	$(top_builddir)/scintilla/libscintilla.a \
+	$(top_builddir)/tagmanager/ctags/libctags.a \
+	$(top_builddir)/tagmanager/mio/libmio.a \
+	$(top_builddir)/tagmanager/src/libtagmanager.a \
+	@GTK_LIBS@ \
+	@GTHREAD_LIBS@ \
+	$(INTLLIBS)
 
 AM_CFLAGS = -DGEANY_DATADIR=\""$(datadir)"\" \
 			-DGEANY_DOCDIR=\""$(docdir)"\" \

tagmanager/Makefile.am

@@ -1,85 +1,6 @@
 ## Process this file with automake to produce Makefile.in
 
-SUBDIRS = mio include
+SUBDIRS = ctags mio src
-INCLUDES = -I$(srcdir)/include $(GTK_CFLAGS) -I$(srcdir)/mio -I$(srcdir)
 
-AM_CFLAGS = -DG_LOG_DOMAIN=\""Tagmanager"\"
+EXTRA_DIST = \
-
-EXTRA_DIST =\
 	makefile.win32
-
-noinst_LIBRARIES = libtagmanager.a
-
-libtagmanager_a_SOURCES =\
-	general.h\
-	keyword.h\
-	parsers.h\
-	sort.h\
-	vstring.h\
-	ctags.h\
-	entry.h\
-	get.h\
-	main.h\
-	nestlevel.h\
-	read.h\
-	parse.h\
-	strlist.h\
-	args.c\
-	args.h\
-	abc.c\
-	basic.c\
-	c.c\
-	cobol.c\
-	conf.c\
-	css.c\
-	diff.c\
-	docbook.c\
-	fortran.c\
-	haskell.c\
-	haxe.c\
-	html.c\
-	js.c\
-	lua.c\
-	make.c\
-	asm.c\
-	latex.c\
-	lregex.c\
-	matlab.c\
-	markdown.c\
-	objc.c\
-	pascal.c\
-	perl.c\
-	rest.c\
-	ruby.c\
-	sql.c\
-	php.c\
-	python.c\
-	tcl.c\
-	sh.c\
-	txt2tags.c\
-	vhdl.c\
-	verilog.c\
-	actionscript.c\
-	nsis.c\
-	r.c \
-	ctags.c\
-	entry.c\
-	get.c\
-	keyword.c\
-	nestlevel.c\
-	options.h\
-	options.c\
-	parse.c\
-	read.c\
-	sort.c\
-	strlist.c\
-	vstring.c\
-	tm_workspace.c\
-	tm_work_object.c\
-	tm_source_file.c\
-	tm_project.c\
-	tm_tag.c\
-	tm_symbol.c\
-	tm_file_entry.c\
-	tm_tagmanager.c
-

tagmanager/ctags/Makefile.am

@@ -0,0 +1,80 @@
+AM_CPPFLAGS = \
+	-I$(srcdir) \
+	-I$(srcdir)/.. \
+	-DG_LOG_DOMAIN=\"CTags\"
+AM_CFLAGS = \
+	$(GTK_CFLAGS)
+
+EXTRA_DIST = \
+	makefile.win32
+
+noinst_LIBRARIES = libctags.a
+
+parsers = \
+	abc.c \
+	actionscript.c \
+	asm.c \
+	basic.c \
+	c.c \
+	cobol.c \
+	conf.c \
+	css.c \
+	diff.c \
+	docbook.c \
+	fortran.c \
+	haskell.c \
+	haxe.c \
+	html.c \
+	js.c \
+	latex.c \
+	lregex.c \
+	lua.c \
+	make.c \
+	markdown.c \
+	matlab.c \
+	nsis.c \
+	objc.c \
+	pascal.c \
+	perl.c \
+	php.c \
+	python.c \
+	r.c \
+	rest.c \
+	ruby.c \
+	sh.c \
+	sql.c \
+	tcl.c \
+	txt2tags.c \
+	verilog.c \
+	vhdl.c
+
+libctags_a_SOURCES = \
+	args.c \
+	args.h \
+	ctags.c \
+	ctags.h \
+	entry.c \
+	entry.h \
+	general.h \
+	get.c \
+	get.h \
+	keyword.c \
+	keyword.h \
+	main.h \
+	nestlevel.c \
+	nestlevel.h \
+	options.c \
+	options.h \
+	parse.c \
+	parse.h \
+	parsers.h \
+	read.c \
+	read.h \
+	sort.c \
+	sort.h \
+	strlist.c \
+	strlist.h \
+	vstring.c \
+	vstring.h \
+	$(parsers)
+

tagmanager/include/Makefile.am

@@ -1,10 +0,0 @@
-tagmanager_includedir = $(includedir)/geany/tagmanager
-tagmanager_include_HEADERS = \
-	tm_project.h \
-	tm_source_file.h \
-	tm_tag.h \
-	tm_work_object.h \
-	tm_workspace.h \
-	tm_symbol.h \
-	tm_tagmanager.h \
-	tm_file_entry.h

tagmanager/mio/Makefile.am

@@ -1,5 +1,3 @@
-# $id$
-
 noinst_LIBRARIES = libmio.a
 
 AM_CPPFLAGS = -DG_LOG_DOMAIN=\"MIO\" #-DMIO_DEBUG

tagmanager/src/Makefile.am

@@ -0,0 +1,34 @@
+AM_CPPFLAGS = \
+	-I$(srcdir) \
+	-I$(srcdir)/.. \
+	-I$(srcdir)/../ctags \
+	-DG_LOG_DOMAIN=\"Tagmanager\"
+AM_CFLAGS = \
+	$(GTK_CFLAGS)
+
+EXTRA_DIST = \
+	makefile.win32
+
+noinst_LIBRARIES = libtagmanager.a
+
+tagmanager_includedir = $(includedir)/geany/tagmanager
+tagmanager_include_HEADERS = \
+	tm_file_entry.h \
+	tm_project.h \
+	tm_source_file.h \
+	tm_symbol.h \
+	tm_tag.h \
+	tm_tagmanager.h \
+	tm_work_object.h \
+	tm_workspace.h
+
+
+libtagmanager_a_SOURCES =\
+	tm_file_entry.c \
+	tm_project.c \
+	tm_source_file.c \
+	tm_symbol.c \
+	tm_tag.c \
+	tm_tagmanager.c \
+	tm_work_object.c \
+	tm_workspace.c