[geany/geany] f95656: Remove makefile.win32 based build system - Commits

21 Jul 2016


      Branch:      refs/heads/master
Author:      Jiří Techet techet@gmail.com
Committer:   Jiří Techet techet@gmail.com
Date:        Thu, 21 Jul 2016 11:21:32 UTC
Commit:      f95656cbe818d69bb4432d14b978ec83764872b2
             https://github.com/geany/geany/commit/f95656cbe818d69bb4432d14b978ec83764872...
Log Message:
-----------
Remove makefile.win32 based build system
No more needed using MSYS2.
Modified Paths:
--------------
    HACKING
    Makefile.am
    ctags/Makefile.am
    ctags/makefile.win32
    doc/Makefile.am
    doc/makefile.win32
    doc/making-a-release
    makefile.win32
    plugins/Makefile.am
    plugins/makefile.win32
    scintilla/Makefile.am
    scintilla/gtk/makefile.win32
    src/Makefile.am
    src/makefile.win32
    src/tagmanager/Makefile.am
    src/tagmanager/makefile.win32
    win32-config.h
Modified: HACKING
3 lines changed, 0 insertions(+), 3 deletions(-)
===================================================================
@@ -497,7 +497,6 @@ printf("Prefix: %s", GEANY_PREFIX);
 Adding a source file foo.[hc] in src/ or plugins/
 -------------------------------------------------
 * Add foo.c, foo.h to SRCS in path/Makefile.am.
-* Add foo.o to OBJS in path/makefile.win32.
 * Add path/foo.c to po/POTFILES.in (for string translation).
Adding a filetype
@@ -560,7 +559,6 @@ LexFoo.cxx. Try the official Scintilla project first.
 When adding a lexer, update:
* scintilla/Makefile.am
-* scintilla/makefile.win32
 * scintilla/src/Catalogue.cxx - add a LINK_LEXER command *manually*
For syntax highlighting, you will need to edit highlighting.c and
@@ -648,7 +646,6 @@ http://sf.net/projects/ctags - see the tracker.
 Method
 ``````
 * Add foo.c to SRCS in Makefile.am.
-* Add foo.o to OBJS in makefile.win32.
 * Add Foo to parsers.h
 * Add TM_PARSER_FOO to src/tagmanager/tm_parser.h.  The list here must follow
   exactly the order in parsers.h.
Modified: Makefile.am
4 lines changed, 1 insertions(+), 3 deletions(-)
===================================================================
@@ -10,9 +10,7 @@ AM_DISTCHECK_CONFIGURE_FLAGS = --enable-api-docs --enable-html-docs --enable-pdf
WIN32_BUILD_FILES = \
    geany_private.rc \
-	geany.exe.manifest \
-	win32-config.h \
-	makefile.win32
+	geany.exe.manifest
EXTRA_DIST = \
    autogen.sh \
Modified: ctags/Makefile.am
3 lines changed, 0 insertions(+), 3 deletions(-)
===================================================================
@@ -6,9 +6,6 @@ AM_CFLAGS = \
    $(GTK_CFLAGS) \
    @LIBGEANY_CFLAGS@
-EXTRA_DIST = \
-	makefile.win32
-
 noinst_LTLIBRARIES = libctags.la
parsers = \
Modified: ctags/makefile.win32
60 lines changed, 0 insertions(+), 60 deletions(-)
===================================================================
@@ -1,60 +0,0 @@
-
-.SUFFIXES: .cxx .c .o .h .a
-CC = gcc
-AR = ar
-RANLIB = ranlib
-PREFIX = C:/libs
-RM = del
--include ../../localwin32.mk
-
-ifdef MSYS
-RM = rm -f
-endif
-
-COMPLIB=ctags.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 . $(GTK_INCLUDES)
-
-CBASEFLAGS=-Wall -pipe -mms-bitfields -DPACKAGE="geany" -Wno-missing-braces -Wno-char-subscripts $(INCLUDEDIRS)
-ifdef DEBUG
-CFLAGS= -O0 -g $(CBASEFLAGS)
-else
-CFLAGS=-O2 $(CBASEFLAGS)
-endif
-
-.c.o:
-	$(CC) $(REGEX_DEFINES) $(CFLAGS) -c $<
-
-all: $(COMPLIB)
-
-clean:
-	-$(RM) deps.mak *.o $(COMPLIB)
-
-$(COMPLIB): abaqus.o abc.o args.o c.o cobol.o erlang.o fortran.o make.o conf.o pascal.o perl.o php.o diff.o vhdl.o verilog.o lua.o js.o json.o \
-actionscript.o nsis.o objc.o powershell.c \
-haskell.o haxe.o html.o python.o lregex.o asciidoc.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 rust.o asm.o sql.o txt2tags.o css.o \
-vstring.o r.o go.o
-	$(AR) rc $@ $^
-	$(RANLIB) $@
-
-deps.mak:
-	$(CC) -MM  $(CFLAGS) *.c >deps.mak
-
-# Generate header dependencies with "make deps.mak"
-include deps.mak
Modified: doc/Makefile.am
3 lines changed, 1 insertions(+), 2 deletions(-)
===================================================================
@@ -41,8 +41,7 @@ EXTRA_DIST = \
    geany.html \
    geany.css \
    geany.txt \
-	geany.1 \
-	makefile.win32
+	geany.1
# HTML user manual and hacking file
 if WITH_RST2HTML
Modified: doc/makefile.win32
36 lines changed, 0 insertions(+), 36 deletions(-)
===================================================================
@@ -1,36 +0,0 @@
-# Optional documentation generation.
-# localwin32.mk is an optional file to override make variables.
-# Use localwin32.mk instead of editing variables as it is included in sub
-# makefiles.
-# Use localwin32.mk to override RST2HTML, DOXYGEN
-
-RST2HTML=python rst2html.py
-SED=sed
-DOXYGEN=doxygen
-CP = copy /y
--include ../localwin32.mk
-
-ifdef MSYS
-CP = cp
-endif
-
-# no PDF rule yet
-all: html api-doc
-
-html: geany.html hacking.html
-
-geany.html: geany.txt geany.css
-	$(RST2HTML) -stg --stylesheet=geany.css $< $@
-
-hacking.html: ../HACKING geany.css
-	$(RST2HTML) -stg --stylesheet=geany.css $< $@
-
-# FIXME: we should also replace @VERSION@
-Doxyfile: Doxyfile.in
-	$(CP) $< $@
-	$(SED) -i 's/@top_builddir@/../g' $@
-	$(SED) -i 's/@top_srcdir@/../g' $@
-
-api-doc: Doxyfile
-	$(DOXYGEN)
-
Modified: doc/making-a-release
3 lines changed, 1 insertions(+), 2 deletions(-)
===================================================================
@@ -8,8 +8,7 @@ and summarize the interesting ones.  Use `git log --author='name'`
 to filter commits by a particular developer name.
Ensure version numbers are all updated in:
-	configure.ac geany_private.rc geany.exe.manifest
-	win32-config.h doc/geany.txt
+	configure.ac geany_private.rc geany.exe.manifest doc/geany.txt
 Ensure release date is updated in:
    NEWS doc/geany.txt doc/geany.1.in
 Check GEANY_CODENAME is set in src/geany.h.
Modified: makefile.win32
71 lines changed, 0 insertions(+), 71 deletions(-)
===================================================================
@@ -1,71 +0,0 @@
-# See http://www.geany.org/Support/BuildingOnWin32
-# Running make creates config.h then calls the sub makefiles.
-#
-# Other targets are:
-#	clean: clean all generated files
-#	install: install to DESTDIR
-#
-# localwin32.mk is an optional file to override make variables.
-# Use localwin32.mk instead of editing variables as it is included in sub
-# makefiles.
-# For MSYS set MSYS=1.
-# By default this should work in a Windows command prompt (cmd.exe).
-
-WINDRES = windres.exe
-CC = gcc
-CXX = g++
-CP = copy /y
-RM = del
-MKDIR = mkdir
-# $/ is used as a portable directory separator
-# strip is used to prevent line wrap
-/ := $(strip )
-DESTDIR = C:/Program Files/Geany
--include localwin32.mk
-
-ifdef MSYS
-CP = cp
-RM = rm -f
-/ = /
-endif
-
-all: config.h
-	$(MAKE) -C tagmanager/ctags -f makefile.win32
-	$(MAKE) -C tagmanager/mio -f makefile.win32
-	$(MAKE) -C tagmanager/src -f makefile.win32
-	$(MAKE) -C scintilla/gtk -f makefile.win32
-	$(MAKE) -C plugins -f makefile.win32
-	$(MAKE) -C src -f makefile.win32
-
-config.h: win32-config.h
-	$(CP) $< $@
-
-# used by src/makefile.win32 to avoid del ../file which is an error
-clean-local:
-	-$(RM) geany_private.res geany.exe
-
-clean:
-	$(MAKE) -C tagmanager/ctags -f makefile.win32 clean
-	$(MAKE) -C tagmanager/mio -f makefile.win32 clean
-	$(MAKE) -C tagmanager/src -f makefile.win32 clean
-	$(MAKE) -C scintilla/gtk -f makefile.win32 clean
-	$(MAKE) -C plugins -f makefile.win32 clean
-	$(MAKE) -C src -f makefile.win32 clean
-
-.PHONY: all clean clean-local install
-
-# likely requires admin privileges
-# mkdir output is ignored in case dir exists
-# 'copy' seems to only accept / in the destination
-install:
-	-$(MKDIR) "$(DESTDIR)"
-	-$(MKDIR) "$(DESTDIR)/bin"
-	$(CP) geany.exe "$(DESTDIR)/bin"
-	-$(MKDIR) "$(DESTDIR)/lib"
-	$(CP) plugins$/*.dll "$(DESTDIR)/lib"
-	-$(MKDIR) "$(DESTDIR)/data"
-ifdef MSYS
-	cp -r data "$(DESTDIR)"
-else
-	xcopy /s /y data "$(DESTDIR)/data"
-endif
Modified: plugins/Makefile.am
1 lines changed, 0 insertions(+), 1 deletions(-)
===================================================================
@@ -1,7 +1,6 @@
 # Adapted from Pidgin's plugins/Makefile.am, thanks
EXTRA_DIST = \
-	makefile.win32 \
    demoproxytest.px
plugindir = $(libdir)/geany
Modified: plugins/makefile.win32
80 lines changed, 0 insertions(+), 80 deletions(-)
===================================================================
@@ -1,80 +0,0 @@
-# Adapted from Pidgin's plugins/Makefile.am, thanks
-
-CC = gcc
-CXX = g++
-PREFIX = C:/libs
-RM = del
--include ../localwin32.mk
-
-ifdef MSYS
-RM = rm -f
-endif
-
-.SUFFIXES: .c .o .dll
-
-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../src \
-              -I../scintilla/include \
-              -I../tagmanager/src \
-              $(GTK_INCLUDES)
-
-ALL_GTK_LIBS= \
-	-L"$(PREFIX)/lib" \
-	-lgtk-win32-2.0 -lgdk-win32-2.0 -latk-1.0 -lgdk_pixbuf-2.0 -lpangowin32-1.0 -lgdi32 \
-	-lpango-1.0 -lgobject-2.0 -lgmodule-2.0 -lgthread-2.0 -lglib-2.0 -lintl
-
-CBASEFLAGS=-Wall -pipe -mms-bitfields -DHAVE_CONFIG_H
-ifdef DEBUG
-CFLAGS=-O0 -g $(CBASEFLAGS)
-else
-CFLAGS=-O2 $(CBASEFLAGS)
-endif
-CFLAGS += -DGTK
-
-ifndef GTK210
-ALL_GTK_LIBS += -liconv
-endif
-
-.PHONY: all clean plugins
-
-all: plugins
-
-.c.o:
-	$(CC) $(CFLAGS) $(DEFINES) $(INCLUDEDIRS) -o $@ -c $<
-
-.o.dll:
-	$(CC) -shared $< $(ALL_GTK_LIBS) $(DLL_LD_FLAGS) -o $@
-
-plugins: \
-		htmlchars.dll \
-		demoplugin.dll \
-		classbuilder.dll \
-		export.dll \
-		saveactions.dll \
-		splitwindow.dll \
-		filebrowser.dll
-
-
-clean:
-	-$(RM) deps.mak *.o *.dll
-
-deps.mak:
-	$(CC) -MM $(CFLAGS) $(DEFINES) $(INCLUDEDIRS) *.c >deps.mak
-
-# Generate header dependencies with "make deps.mak"
-include deps.mak
-
-..\localwin32.mk:
-	echo # Set local variables here >$@
Modified: scintilla/Makefile.am
3 lines changed, 1 insertions(+), 2 deletions(-)
===================================================================
@@ -153,5 +153,4 @@ marshallers: gtk/scintilla-marshal.list
    glib-genmarshal --prefix scintilla_marshal gtk/scintilla-marshal.list --header > gtk/scintilla-marshal.h
    glib-genmarshal --prefix scintilla_marshal gtk/scintilla-marshal.list --body > gtk/scintilla-marshal.c
-EXTRA_DIST=gtk/scintilla-marshal.list License.txt README version.txt \
-	gtk/makefile.win32
+EXTRA_DIST=gtk/scintilla-marshal.list License.txt README version.txt
Modified: scintilla/gtk/makefile.win32
80 lines changed, 0 insertions(+), 80 deletions(-)
===================================================================
@@ -1,80 +0,0 @@
-# Make file for Scintilla on Linux or compatible OS
-# Copyright 1998-2010 by Neil Hodgson neilh@scintilla.org
-# The License.txt file describes the conditions under which this software may be distributed.
-# This makefile assumes GCC 4.3 is used and changes will be needed to use other compilers.
-# GNU make does not like \r\n line endings so should be saved to CVS in binary form.
-# Builds for GTK+ 2 and no longer supports GTK+ 1.
-# Also works with ming32-make on Windows.
-
-.SUFFIXES: .cxx .c .o .h .a
-CXX = g++
-CC = gcc
-AR = ar
-
-ifdef GTK3
-GTKVERSION=gtk+-3.0
-else
-GTKVERSION=gtk+-2.0
-endif
-
-RANLIB = ranlib
-PREFIX = C:/libs
-RM = del
--include ../../localwin32.mk
-
-ifdef MSYS
-RM = rm -f
-endif
-
-COMPLIB=../scintilla.a
-
-vpath %.h ../src ../include ../lexlib
-vpath %.cxx ../src ../lexlib ../lexers
-
-INCLUDEDIRS=-I ../include -I ../src -I ../lexlib
-CXXBASEFLAGS=-Wall -Wno-missing-braces -Wno-char-subscripts \
-	-DGTK -DSCI_LEXER -DNO_CXX11_REGEX \
-	$(INCLUDEDIRS) \
-	-DGEANY_EXPORT_SYMBOL="__declspec(dllexport)" \
-	-DGEANY_API_SYMBOL=GEANY_EXPORT_SYMBOL
-
-
-ifdef DEBUG
-CTFLAGS=-DDEBUG -g -O0 $(CXXBASEFLAGS)
-else
-CTFLAGS=-DNDEBUG -Os $(CXXBASEFLAGS)
-endif
-
-CFLAGS:=$(CTFLAGS)
-CXXTFLAGS:=--std=c++0x $(CTFLAGS) $(REFLAGS)
-
-CONFIGFLAGS:=$(shell pkg-config --cflags $(GTKVERSION))
-MARSHALLER=scintilla-marshal.o
-
-.cxx.o:
-	$(CXX) $(CONFIGFLAGS) $(CXXTFLAGS) $(CXXFLAGS) -c $<
-.c.o:
-	$(CC) $(CONFIGFLAGS) $(CFLAGS) -w -c $<
-
-LEXOBJS:=$(addsuffix .o,$(basename $(notdir $(wildcard ../lexers/Lex*.cxx))))
-
-all: $(COMPLIB)
-
-clean:
-	-$(RM) deps.mak *.o $(COMPLIB) *.plist
-
-deps.mak:
-	$(CXX) -MM $(CONFIGFLAGS) $(CXXTFLAGS) *.cxx ../src/*.cxx ../lexlib/*.cxx ../lexers/*.cxx >deps.mak
-
-$(COMPLIB): Accessor.o CharacterSet.o LexerBase.o LexerModule.o LexerSimple.o StyleContext.o WordList.o \
-	CharClassify.o Decoration.o Document.o PerLine.o Catalogue.o CallTip.o CaseConvert.o CaseFolder.o \
-	ScintillaBase.o ContractionState.o EditModel.o Editor.o EditView.o ExternalLexer.o MarginView.o \
-	PropSetSimple.o PlatGTK.o \
-	KeyMap.o LineMarker.o PositionCache.o ScintillaGTK.o CellBuffer.o CharacterCategory.o ViewStyle.o \
-	RESearch.o RunStyles.o Selection.o Style.o Indicator.o AutoComplete.o UniConversion.o XPM.o \
-	$(MARSHALLER) $(LEXOBJS)
-	$(AR) rc $@ $^
-	$(RANLIB) $@
-
-# Generate header dependencies with "make deps.mak"
-include deps.mak
Modified: src/Makefile.am
3 lines changed, 1 insertions(+), 2 deletions(-)
===================================================================
@@ -10,8 +10,7 @@ EXTRA_DIST = \
    filetypesprivate.h \
    keybindingsprivate.h \
    pluginprivate.h \
-	projectprivate.h \
-	makefile.win32
+	projectprivate.h
AM_CPPFLAGS = \
    -I$(top_srcdir) \
Modified: src/makefile.win32
99 lines changed, 0 insertions(+), 99 deletions(-)
===================================================================
@@ -1,99 +0,0 @@
-# Note: PACKAGE_DATA_DIR and PACKAGE_LOCALE_DIR are no longer used on Windows.
-
-DEFINES = -DHAVE_CONFIG_H \
-	-DGEANY_PRIVATE \
-	-DGEANY_DATADIR="data" \
-	-DGEANY_LOCALEDIR="" \
-	-DGEANY_LIBDIR="" \
-	-DGEANY_PREFIX="" \
-	-DGTK \
-	-DGEANY_EXPORT_SYMBOL="__declspec(dllexport)" \
-	-DGEANY_API_SYMBOL=GEANY_EXPORT_SYMBOL
-
-.SUFFIXES: .c .o .h .a
-WINDRES = windres.exe
-CC = gcc
-CXX = g++
-RES = ../geany_private.res
-TARGET = ../geany.exe
-PREFIX = C:/libs
-RM = del
--include ../localwin32.mk
-
-ifdef MSYS
-RM = rm -f
-endif
-
-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../scintilla/include \
-              -I../tagmanager/mio \
-              -I../tagmanager/src \
-              $(GTK_INCLUDES)
-
-ALL_GTK_LIBS= \
-	-L"$(PREFIX)/lib" \
-	-lgtk-win32-2.0 -lgdk-win32-2.0 -latk-1.0 -lgdk_pixbuf-2.0 -lpangowin32-1.0 -lgdi32 \
-	-lpango-1.0 -lgobject-2.0 -lgmodule-2.0 -lgthread-2.0 -lglib-2.0 -lgthread-2.0 -lintl \
-	-lcairo -lpangocairo-1.0 -lgio-2.0
-	# these things are for GTK >= 2.8
-	# (should be same as with MSYS: pkg-config --libs gtk+-2.0 gthread-2.0)
-	#"$(PREFIX)/lib/libcairo.dll.a" \
-	#"$(PREFIX)/lib/asprintf.lib" \
-	#"$(PREFIX)/lib/charset.lib" \
-
-WIN_LIBS=-mwindows -lole32 -luuid -lwsock32
-
-CBASEFLAGS=-Wall -pipe -mms-bitfields $(DEFINES) $(INCLUDEDIRS)
-ifdef DEBUG
-CFLAGS=-O0 -g $(CBASEFLAGS)
-DEFINES += -DGEANY_DEBUG
-else
-CFLAGS=-O2 $(CBASEFLAGS)
-endif
-
-OBJS =	about.o build.o callbacks.o dialogs.o document.o editor.o encodings.o filetypes.o \
-		geanyentryaction.o geanymenubuttonaction.o geanyobject.o geanywraplabel.o highlighting.o \
-		keybindings.o keyfile.o log.o main.o msgwindow.o navqueue.o notebook.o \
-		plugins.o pluginutils.o prefs.o printing.o project.o sciwrappers.o search.o \
-		socket.o spawn.o stash.o symbols.o templates.o toolbar.o tools.o sidebar.o \
-		ui_utils.o utils.o win32.o
-
-.c.o:
-	$(CC) $(CFLAGS) -c $<
-
-all: $(TARGET)
-
-$(RES): ../geany_private.rc ../icons/geany.ico
-	$(WINDRES) -i $< --input-format=rc -o $@ -O coff
-
-# this calls parent clean-local target because del ../file won't work
-clean:
-	-$(RM) deps.mak *.o
-	$(MAKE) -C .. -f makefile.win32 clean-local
-
-STLIBS = ../scintilla/scintilla.a ../tagmanager/ctags/ctags.a \
-	../tagmanager/mio/mio.a ../tagmanager/src/tagmanager.a
-
-$(TARGET): $(OBJS) $(RES) $(STLIBS)
-	$(CXX) $(OBJS) $(RES) -o $(TARGET) $(STLIBS) $(ALL_GTK_LIBS) $(WIN_LIBS)
-
-deps.mak:
-	$(CC) -MM  $(CFLAGS) *.c >deps.mak
-
-# Generate header dependencies with "make deps.mak"
-include deps.mak
-
-..\localwin32.mk:
-	echo # Set local variables here >$@
Modified: src/tagmanager/Makefile.am
3 lines changed, 0 insertions(+), 3 deletions(-)
===================================================================
@@ -7,9 +7,6 @@ AM_CFLAGS = \
    $(GTK_CFLAGS) \
    @LIBGEANY_CFLAGS@
-EXTRA_DIST = \
-	makefile.win32
-
 noinst_LTLIBRARIES = libtagmanager.la
tagmanager_includedir = $(includedir)/geany/tagmanager
Modified: src/tagmanager/makefile.win32
57 lines changed, 0 insertions(+), 57 deletions(-)
===================================================================
@@ -1,57 +0,0 @@
-
-.SUFFIXES: .cxx .c .o .h .a
-CC = gcc
-AR = ar
-RANLIB = ranlib
-PREFIX = C:/libs
-RM = del
--include ../../localwin32.mk
-
-ifdef MSYS
-RM = rm -f
-endif
-
-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 ../ctags -I ../ -I . $(GTK_INCLUDES)
-
-CBASEFLAGS=-Wall -pipe -mms-bitfields -DGEANY_PRIVATE -DPACKAGE="geany" -Wno-missing-braces -Wno-char-subscripts $(INCLUDEDIRS) \
-	-DGEANY_EXPORT_SYMBOL="__declspec(dllexport)" \
-	-DGEANY_API_SYMBOL=GEANY_EXPORT_SYMBOL
-ifdef DEBUG
-CFLAGS= -O0 -g $(CBASEFLAGS)
-else
-CFLAGS=-O2 $(CBASEFLAGS)
-endif
-
-.c.o:
-	$(CC) $(REGEX_DEFINES) $(CFLAGS) -c $<
-
-all: $(COMPLIB)
-
-clean:
-	-$(RM) deps.mak *.o $(COMPLIB)
-
-$(COMPLIB): tm_workspace.o tm_source_file.o tm_tag.o 
-	$(AR) rc $@ $^
-	$(RANLIB) $@
-
-deps.mak:
-	$(CC) -MM  $(CFLAGS) *.c >deps.mak
-
-# Generate header dependencies with "make deps.mak"
-include deps.mak
Modified: win32-config.h
319 lines changed, 0 insertions(+), 319 deletions(-)
===================================================================
@@ -1,319 +0,0 @@
-/* config.h.  Generated by configure.  */
-/* config.h.in.  Generated from configure.in by autoheader.  */
-
-/* Define to 1 if the `closedir' function returns void instead of `int'. */
-/* #undef CLOSEDIR_VOID */
-
-/* Define to one of `_getb67', `GETB67', `getb67' for Cray-2 and Cray-YMP
-   systems. This function is required for `alloca.c' support on those systems.
-   */
-/* #undef CRAY_STACKSEG_END */
-
-/* Define to 1 if using `alloca.c'. */
-/* #undef C_ALLOCA */
-
-/* always defined to indicate that i18n is enabled */
-#define ENABLE_NLS 1
-
-/* Gettext package. */
-#define GETTEXT_PACKAGE "geany"
-
-/* Define to 1 if you have `alloca', as a function or macro. */
-#define HAVE_ALLOCA 1
-
-/* Define to 1 if you have <alloca.h> and it should be used (not on Ultrix).
-   */
-#define HAVE_ALLOCA_H 1
-
-/* Define to 1 if you have the `bind_textdomain_codeset' function. */
-#define HAVE_BIND_TEXTDOMAIN_CODESET 1
-
-/* Define to 1 if you have the `btowc' function. */
-/* #undef HAVE_BTOWC */
-
-/* Define to 1 if you have the `dcgettext' function. */
-#define HAVE_DCGETTEXT 1
-
-/* Define to 1 if you have the declaration of `getenv', and to 0 if you don't.
-   */
-/* #undef HAVE_DECL_GETENV */
-
-/* Define to 1 if you have the <dirent.h> header file, and it defines `DIR'.
-   */
-#define HAVE_DIRENT_H 1
-
-/* Define to 1 if you don't have `vprintf' but do have `_doprnt.' */
-/* #undef HAVE_DOPRNT */
-
-/* Define to 1 if you have the <fcntl.h> header file. */
-//#define HAVE_FCNTL_H 1
-
-/* Define to 1 if you have the `fgetpos' function. */
-#define HAVE_FGETPOS 1
-
-/* Define if you want to detect a running instance */
-//#define HAVE_FIFO 1
-
-/* Define to 1 if you have the <fnmatch.h> header file. */
-#define HAVE_FNMATCH_H 1
-
-/* Define to 1 if you have the `ftruncate' function. */
-#define HAVE_FTRUNCATE 1
-
-/* Define to 1 if you have the `getcwd' function. */
-#define HAVE_GETCWD 1
-
-/* Define to 1 if you have the `getpagesize' function. */
-#define HAVE_GETPAGESIZE 1
-
-/* Define if the GNU gettext() function is already present or preinstalled. */
-#define HAVE_GETTEXT 1
-
-/* Define to 1 if you have the `gettimeofday' function. */
-#define HAVE_GETTIMEOFDAY 1
-
-/* Define to 1 if you have the <glob.h> header file. */
-#define HAVE_GLOB_H 1
-
-/* Define to 1 if you have the <inttypes.h> header file. */
-#define HAVE_INTTYPES_H 1
-
-/* Define to 1 if you have the `isascii' function. */
-#define HAVE_ISASCII 1
-
-/* Define if your <locale.h> file defines LC_MESSAGES. */
-#define HAVE_LC_MESSAGES 1
-
-/* Define to 1 if you have the <libintl.h> header file. */
-#define HAVE_LIBINTL_H 1
-
-/* Define to 1 if you have the <limits.h> header file. */
-#define HAVE_LIMITS_H 1
-
-/* Define to 1 if you have the <locale.h> header file. */
-#define HAVE_LOCALE_H 1
-
-/* Define to 1 if `lstat' has the bug that it succeeds when given the
-   zero-length file name argument. */
-/* #undef HAVE_LSTAT_EMPTY_STRING_BUG */
-
-/* Define to 1 if your system has a GNU libc compatible `malloc' function, and
-   to 0 otherwise. */
-#define HAVE_MALLOC 1
-
-/* Define to 1 if you have the `mblen' function. */
-#define HAVE_MBLEN 1
-
-/* Define to 1 if you have the `mbsrtowcs' function. */
-/* #undef HAVE_MBSRTOWCS */
-
-/* Define to 1 if <wchar.h> declares mbstate_t. */
-#define HAVE_MBSTATE_T 1
-
-/* Define to 1 if you have the <memory.h> header file. */
-#define HAVE_MEMORY_H 1
-
-/* Define to 1 if you have the `mempcpy' function. */
-/* #undef HAVE_MEMPCPY */
-
-/* Define to 1 if you have the `memset' function. */
-#define HAVE_MEMSET 1
-
-/* Define to 1 if you have a working `mmap' system call. */
-//#define HAVE_MMAP 1
-
-/* Define to 1 if you have the `munmap' function. */
-//#define HAVE_MUNMAP 1
-
-/* Define to 1 if you have the <ndir.h> header file, and it defines `DIR'. */
-/* #undef HAVE_NDIR_H */
-
-/* Define if plugins are enabled. */
-#define HAVE_PLUGINS 1
-
-/* Define to 1 if you have the `putenv' function. */
-#define HAVE_PUTENV 1
-
-/* Define to 1 if your system has a GNU libc compatible `realloc' function,
-   and to 0 otherwise. */
-#define HAVE_REALLOC 1
-
-/* Define to 1 if you have the `realpath' function. */
-#define HAVE_REALPATH 1
-
-/* Should always be 1, required for CTags. */
-#define HAVE_REGCOMP 1
-
-/* Define to 1 if you have the `setenv' function. */
-#define HAVE_SETENV 1
-
-/* Define to 1 if `stat' has the bug that it succeeds when given the
-   zero-length file name argument. */
-/* #undef HAVE_STAT_EMPTY_STRING_BUG */
-
-/* Define to 1 if stdbool.h conforms to C99. */
-#define HAVE_STDBOOL_H 1
-
-/* Define to 1 if you have the <stddef.h> header file. */
-#define HAVE_STDDEF_H 1
-
-/* Define to 1 if you have the <stdint.h> header file. */
-#define HAVE_STDINT_H 1
-
-/* Define to 1 if you have the <stdlib.h> header file. */
-#define HAVE_STDLIB_H 1
-
-/* Define to 1 if you have the `strcasecmp' function. */
-#define HAVE_STRCASECMP 1
-
-/* Define to 1 if you have the `strchr' function. */
-#define HAVE_STRCHR 1
-
-/* Define to 1 if you have the `strdup' function. */
-#define HAVE_STRDUP 1
-
-/* Define to 1 if you have the `strerror' function. */
-#define HAVE_STRERROR 1
-
-/* Define to 1 if you have the <strings.h> header file. */
-#define HAVE_STRINGS_H 1
-
-/* Define to 1 if you have the <string.h> header file. */
-#define HAVE_STRING_H 1
-
-/* Define to 1 if you have the `strrchr' function. */
-#define HAVE_STRRCHR 1
-
-/* Define to 1 if you have the `strspn' function. */
-#define HAVE_STRSPN 1
-
-/* Define to 1 if you have the `strstr' function. */
-#define HAVE_STRSTR 1
-
-/* Define to 1 if you have the `strtol' function. */
-#define HAVE_STRTOL 1
-
-/* Define to 1 if you have the <sys/dir.h> header file, and it defines `DIR'.
-   */
-/* #undef HAVE_SYS_DIR_H */
-
-/* Define to 1 if you have the <sys/ndir.h> header file, and it defines `DIR'.
-   */
-/* #undef HAVE_SYS_NDIR_H */
-
-/* Define to 1 if you have the <sys/stat.h> header file. */
-#define HAVE_SYS_STAT_H 1
-
-/* Define to 1 if you have the <sys/time.h> header file. */
-#define HAVE_SYS_TIME_H 1
-
-/* Define to 1 if you have the <sys/types.h> header file. */
-#define HAVE_SYS_TYPES_H 1
-
-/* Define to 1 if you have <sys/wait.h> that is POSIX.1 compatible. */
-#define HAVE_SYS_WAIT_H 1
-
-/* Define to 1 if you have the <unistd.h> header file. */
-#define HAVE_UNISTD_H 1
-
-/* Define to 1 if you have the `vprintf' function. */
-#define HAVE_VPRINTF 1
-
-/* Define if you want VTE support */
-//#define HAVE_VTE 1
-
-/* Define to 1 if you have the <wchar.h> header file. */
-/* #undef HAVE_WCHAR_H */
-
-/* Define to 1 if you have the <wctype.h> header file. */
-/* #undef HAVE_WCTYPE_H */
-
-/* Define to 1 if you have the `wmempcpy' function. */
-/* #undef HAVE_WMEMPCPY */
-
-/* Define to 1 if the system has the type `_Bool'. */
-#define HAVE__BOOL 1
-
-/* Define to 1 if `lstat' dereferences a symlink specified with a trailing
-   slash. */
-#define LSTAT_FOLLOWS_SLASHED_SYMLINK 1
-
-/* Name of package */
-#define PACKAGE "geany"
-
-/* Define to the address where bug reports for this package should be sent. */
-#define PACKAGE_BUGREPORT ""
-
-/* Define to the full name of this package. */
-#define PACKAGE_NAME ""
-
-/* Define to the full name and version of this package. */
-#define PACKAGE_STRING ""
-
-/* Define to the one symbol short name of this package. */
-#define PACKAGE_TARNAME ""
-
-/* Define to the version of this package. */
-#define PACKAGE_VERSION ""
-
-/* Define as the return type of signal handlers (`int' or `void'). */
-#define RETSIGTYPE void
-
-/* If using the C implementation of alloca, define if you know the
-   direction of stack growth for your system; otherwise it will be
-   automatically deduced at run-time.
-	STACK_DIRECTION > 0 => grows toward higher addresses
-	STACK_DIRECTION < 0 => grows toward lower addresses
-	STACK_DIRECTION = 0 => direction of growth unknown */
-/* #undef STACK_DIRECTION */
-
-/* Define to 1 if the `S_IS*' macros in <sys/stat.h> do not work properly. */
-/* #undef STAT_MACROS_BROKEN */
-
-/* Define to 1 if you have the ANSI C header files. */
-#define STDC_HEADERS 1
-
-/* Define to 1 if you can safely include both <sys/time.h> and <time.h>. */
-#define TIME_WITH_SYS_TIME 1
-
-/* Define to 1 if your <sys/time.h> declares `struct tm'. */
-/* #undef TM_IN_SYS_TIME */
-
-/* Define to empty if `const' does not conform to ANSI C. */
-/* #undef const */
-
-/* Define to rpl_fnmatch if the replacement function should be used. */
-/* #undef fnmatch */
-
-/* Define to `__inline__' or `__inline' if that's what the C compiler
-   calls it, or to nothing if 'inline' is not supported under any name.  */
-#ifndef __cplusplus
-/* #undef inline */
-#endif
-
-/* Define to rpl_malloc if the replacement function should be used. */
-/* #undef malloc */
-
-/* Define to a type if <wchar.h> does not define. */
-/* #undef mbstate_t */
-
-/* Define to `long' if <sys/types.h> does not define. */
-/* #undef off_t */
-
-/* Define to rpl_realloc if the replacement function should be used. */
-/* #undef realloc */
-
-/* Define to `unsigned' if <sys/types.h> does not define. */
-/* #undef size_t */
-
-/* Define to empty if the keyword `volatile' does not work. Warning: valid
-   code using `volatile' can become incorrect without. Disable with care. */
-/* #undef volatile */
-
-/* Version number of package */
-#define VERSION "1.29"
-
-#define REVISION "-1"
-
-/* Define if you want to detect a running instance */
-#define HAVE_SOCKET 1
--------------
This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

    