Separate ctags into parsers and main sources

configure.ac

@@ -148,7 +148,6 @@ AC_CONFIG_FILES([
 		icons/tango/48x48/Makefile
 		icons/tango/scalable/Makefile
 		ctags/Makefile
-		ctags/main/Makefile
 		scintilla/Makefile
 		scintilla/include/Makefile
 		src/Makefile

ctags/Makefile.am

@@ -1,3 +1,89 @@
-## Process this file with automake to produce Makefile.in
+AM_CPPFLAGS = \
+	-I$(srcdir)/main \
+	-I$(srcdir)/parsers \
+	-DG_LOG_DOMAIN=\"CTags\"
+AM_CFLAGS = \
+	$(GTK_CFLAGS) \
+	@LIBGEANY_CFLAGS@
 
-SUBDIRS = main
+EXTRA_DIST = \
+	makefile.win32
+
+noinst_LTLIBRARIES = libctags.la
+
+parsers = \
+	parsers/abaqus.c \
+	parsers/abc.c \
+	parsers/actionscript.c \
+	parsers/asciidoc.c \
+	parsers/asm.c \
+	parsers/basic.c \
+	parsers/c.c \
+	parsers/cobol.c \
+	parsers/conf.c \
+	parsers/css.c \
+	parsers/diff.c \
+	parsers/docbook.c \
+	parsers/erlang.c \
+	parsers/fortran.c \
+	parsers/go.c \
+	parsers/haskell.c \
+	parsers/haxe.c \
+	parsers/html.c \
+	parsers/js.c \
+	parsers/json.c \
+	parsers/latex.c \
+	parsers/lua.c \
+	parsers/make.c \
+	parsers/markdown.c \
+	parsers/matlab.c \
+	parsers/nsis.c \
+	parsers/objc.c \
+	parsers/pascal.c \
+	parsers/perl.c \
+	parsers/php.c \
+	parsers/powershell.c \
+	parsers/python.c \
+	parsers/r.c \
+	parsers/rest.c \
+	parsers/ruby.c \
+	parsers/rust.c \
+	parsers/sh.c \
+	parsers/sql.c \
+	parsers/tcl.c \
+	parsers/txt2tags.c \
+	parsers/verilog.c \
+	parsers/vhdl.c
+
+libctags_la_SOURCES = \
+	main/args.c \
+	main/args.h \
+	main/ctags.c \
+	main/ctags.h \
+	main/entry.c \
+	main/entry.h \
+	main/general.h \
+	main/get.c \
+	main/get.h \
+	main/keyword.c \
+	main/keyword.h \
+	main/lregex.c \
+	main/main.h \
+	main/mio.c \
+	main/mio.h \
+	main/nestlevel.c \
+	main/nestlevel.h \
+	main/options.c \
+	main/options.h \
+	main/parse.c \
+	main/parse.h \
+	main/parsers.h \
+	main/read.c \
+	main/read.h \
+	main/sort.c \
+	main/sort.h \
+	main/strlist.c \
+	main/strlist.h \
+	main/vstring.c \
+	main/vstring.h \
+	$(parsers)

ctags/main/Makefile.am

@@ -1,89 +0,0 @@
-AM_CPPFLAGS = \
-	-I$(srcdir) \
-	-I$(srcdir)/.. \
-	-DG_LOG_DOMAIN=\"CTags\"
-AM_CFLAGS = \
-	$(GTK_CFLAGS) \
-	@LIBGEANY_CFLAGS@
-
-EXTRA_DIST = \
-	makefile.win32
-
-noinst_LTLIBRARIES = libctags.la
-
-parsers = \
-	abaqus.c \
-	abc.c \
-	actionscript.c \
-	asciidoc.c \
-	asm.c \
-	basic.c \
-	c.c \
-	cobol.c \
-	conf.c \
-	css.c \
-	diff.c \
-	docbook.c \
-	erlang.c \
-	fortran.c \
-	go.c \
-	haskell.c \
-	haxe.c \
-	html.c \
-	js.c \
-	json.c \
-	latex.c \
-	lregex.c \
-	lua.c \
-	make.c \
-	markdown.c \
-	matlab.c \
-	nsis.c \
-	objc.c \
-	pascal.c \
-	perl.c \
-	php.c \
-	powershell.c \
-	python.c \
-	r.c \
-	rest.c \
-	ruby.c \
-	rust.c \
-	sh.c \
-	sql.c \
-	tcl.c \
-	txt2tags.c \
-	verilog.c \
-	vhdl.c
-
-libctags_la_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 \
-	mio.c \
-	mio.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)

src/tagmanager/Makefile.am

@@ -1,6 +1,5 @@
 AM_CPPFLAGS = \
 	-I$(srcdir) \
-	-I$(top_srcdir)/ctags \
 	-I$(top_srcdir)/ctags/main \
 	-DGEANY_PRIVATE \
 	-DG_LOG_DOMAIN=\"Tagmanager\"
@@ -33,4 +32,4 @@ libtagmanager_la_SOURCES =\
 	tm_ctags_wrappers.h \
 	tm_ctags_wrappers.c
 
-libtagmanager_la_LIBADD = $(top_builddir)/ctags/main/libctags.la $(GTK_LIBS)
+libtagmanager_la_LIBADD = $(top_builddir)/ctags/libctags.la $(GTK_LIBS)