Update makefile.win32 build system

makefile.win32

@@ -22,8 +22,9 @@ MAKE = make
 # Note: && is needed after cd because each line is executed in a different
 # shell. (cd .. is just for clarity).
 all: config.h
+	cd tagmanager/ctags && $(MAKE) -f makefile.win32 && cd ../..
 	cd tagmanager/mio && $(MAKE) -f makefile.win32 && cd ../..
-	cd tagmanager && $(MAKE) -f makefile.win32 && cd ..
+	cd tagmanager/src && $(MAKE) -f makefile.win32 && cd ../..
 	cd scintilla && $(MAKE) -f makefile.win32 && cd ..
 	cd plugins && $(MAKE) -f makefile.win32 && cd ..
 	cd src && $(MAKE) -f makefile.win32 && cd ..
@@ -32,15 +33,16 @@ config.h: win32-config.h
 	$(CP) $< $@
 
 deps:
-	-$(RM) tagmanager/mio/deps.mak tagmanager/deps.mak scintilla/deps.mak plugins/deps.mak src/deps.mak
+	-$(RM) tagmanager/ctags/deps.mak tagmanager/mio/deps.mak tagmanager/src/deps.mak scintilla/deps.mak plugins/deps.mak src/deps.mak
 
 # used by src/makefile.win32 to avoid del ../file which is an error
 clean-local:
 	-$(RM) geany_private.res geany.exe
 
 clean: deps
+	cd tagmanager/ctags && $(MAKE) -f makefile.win32 clean && cd ../..
 	cd tagmanager/mio && $(MAKE) -f makefile.win32 clean && cd ../..
-	cd tagmanager && $(MAKE) -f makefile.win32 clean && cd ..
+	cd tagmanager/src && $(MAKE) -f makefile.win32 clean && cd ../..
 	cd scintilla && $(MAKE) -f makefile.win32 clean && cd ..
 	cd plugins && $(MAKE) -f makefile.win32 clean && cd ..
 	cd src && $(MAKE) -f makefile.win32 clean && cd ..

src/makefile.win32

@@ -85,9 +85,9 @@ exec:
 binclean:
 	$(RM) $(TARGET)
 
-$(TARGET): $(OBJS) $(RES) ../scintilla/scintilla.a ../tagmanager/mio/mio.a ../tagmanager/tagmanager.a
+$(TARGET): $(OBJS) $(RES) ../scintilla/scintilla.a ../tagmanager/ctags/ctags.a ../tagmanager/mio/mio.a ../tagmanager/src/tagmanager.a
 	$(CXX) $(OBJS) $(RES) -o $(TARGET) \
-	../scintilla/scintilla.a ../tagmanager/tagmanager.a ../tagmanager/mio/mio.a \
+	../scintilla/scintilla.a ../tagmanager/ctags/ctags.a ../tagmanager/src/tagmanager.a ../tagmanager/mio/mio.a \
 	$(ALL_GTK_LIBS) $(WIN_LIBS)
 
 deps.mak:

tagmanager/Makefile.am

 ## Process this file with automake to produce Makefile.in
 
 SUBDIRS = ctags mio src
-
-EXTRA_DIST = \
-	makefile.win32

tagmanager/makefile.win32 → tagmanager/ctags/makefile.win32

@@ -5,9 +5,9 @@ AR = ar
 RANLIB = ranlib
 PREFIX = C:/libs
 RM = del
--include ../localwin32.mk
+-include ../../localwin32.mk
 
-COMPLIB=tagmanager.a
+COMPLIB=ctags.a
 
 REGEX_DEFINES = -DHAVE_REGCOMP -DSTDC_HEADERS=1
 
@@ -23,7 +23,7 @@ GTK_INCLUDES= \
 	-I$(PREFIX)/include \
 	-I$(PREFIX)/include/gettext
 
-INCLUDEDIRS=-I include -I mio -I . $(GTK_INCLUDES)
+INCLUDEDIRS=-I ../ -I . $(GTK_INCLUDES)
 
 CBASEFLAGS=-Wall -pipe -mms-bitfields -DPACKAGE=\"geany\" -DG_OS_WIN32 -Wno-missing-braces -Wno-char-subscripts $(INCLUDEDIRS)
 ifdef DEBUG
@@ -45,8 +45,7 @@ actionscript.o nsis.o objc.o \
 haskell.o haxe.o html.o python.o lregex.o rest.o sh.o ctags.o entry.o get.o keyword.o nestlevel.o \
 options.o \
 parse.o basic.o read.o sort.o strlist.o latex.o markdown.o matlab.o docbook.o tcl.o ruby.o asm.o sql.o txt2tags.o css.o \
-vstring.o tm_workspace.o tm_work_object.o tm_source_file.o tm_project.o tm_tag.o \
-tm_symbol.o tm_file_entry.o tm_tagmanager.o r.o
+vstring.o r.o
 	$(AR) rc $@ $^
 	$(RANLIB) $@
 

tagmanager/mio/makefile.win32

@@ -3,7 +3,7 @@
 CC = gcc
 AR = ar
 RANLIB = ranlib
-PREFIX = C:\libs
+PREFIX = C:/libs
 RM = del
 -include ../../localwin32.mk
 

tagmanager/src/makefile.win32

+
+.SUFFIXES: .cxx .c .o .h .a
+CC = gcc
+AR = ar
+RANLIB = ranlib
+PREFIX = C:/libs
+RM = del
+-include ../../localwin32.mk
+
+COMPLIB=tagmanager.a
+
+REGEX_DEFINES = -DHAVE_REGCOMP -DSTDC_HEADERS=1
+
+GTK_INCLUDES= \
+	-I$(PREFIX)/include/gtk-2.0 \
+	-I$(PREFIX)/lib/gtk-2.0/include \
+	-I$(PREFIX)/include/atk-1.0 \
+	-I$(PREFIX)/include/cairo \
+	-I$(PREFIX)/include/gdk-pixbuf-2.0 \
+	-I$(PREFIX)/include/pango-1.0 \
+	-I$(PREFIX)/include/glib-2.0 \
+	-I$(PREFIX)/lib/glib-2.0/include \
+	-I$(PREFIX)/include \
+	-I$(PREFIX)/include/gettext
+
+INCLUDEDIRS=-I ../ -I ../mio -I . $(GTK_INCLUDES)
+
+CBASEFLAGS=-Wall -pipe -mms-bitfields -DPACKAGE=\"geany\" -DG_OS_WIN32 -Wno-missing-braces -Wno-char-subscripts $(INCLUDEDIRS)
+ifdef DEBUG
+CFLAGS= -O0 -g $(CBASEFLAGS)
+else
+CFLAGS=-O2 $(CBASEFLAGS)
+endif
+
+.c.o:
+	$(CC) $(REGEX_DEFINES) $(CFLAGS) -w -c $<
+
+all: $(COMPLIB)
+
+clean:
+	-$(RM) deps.mak *.o $(COMPLIB)
+
+$(COMPLIB): tm_workspace.o tm_work_object.o tm_source_file.o tm_project.o tm_tag.o \
+tm_symbol.o tm_file_entry.o tm_tagmanager.o
+	$(AR) rc $@ $^
+	$(RANLIB) $@
+
+deps.mak:
+	$(CC) -MM  $(CFLAGS) *.c >deps.mak
+
+# Generate header dependencies with "make deps.mak"
+include deps.mak