Skip to content

Commit

Permalink
Remove makefile.win32 based build system
Browse files Browse the repository at this point in the history
No more needed using MSYS2.
  • Loading branch information
techee committed Jul 21, 2016
1 parent 3b4d9fa commit f95656c
Show file tree
Hide file tree
Showing 17 changed files with 5 additions and 823 deletions.
3 changes: 0 additions & 3 deletions HACKING
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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.
Expand Down
4 changes: 1 addition & 3 deletions Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
3 changes: 0 additions & 3 deletions ctags/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,6 @@ AM_CFLAGS = \
$(GTK_CFLAGS) \
@LIBGEANY_CFLAGS@

EXTRA_DIST = \
makefile.win32

noinst_LTLIBRARIES = libctags.la

parsers = \
Expand Down
60 changes: 0 additions & 60 deletions ctags/makefile.win32

This file was deleted.

3 changes: 1 addition & 2 deletions doc/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
36 changes: 0 additions & 36 deletions doc/makefile.win32

This file was deleted.

3 changes: 1 addition & 2 deletions doc/making-a-release
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
71 changes: 0 additions & 71 deletions makefile.win32

This file was deleted.

1 change: 0 additions & 1 deletion plugins/Makefile.am
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
# Adapted from Pidgin's plugins/Makefile.am, thanks

EXTRA_DIST = \
makefile.win32 \
demoproxytest.px

plugindir = $(libdir)/geany
Expand Down
80 changes: 0 additions & 80 deletions plugins/makefile.win32

This file was deleted.

3 changes: 1 addition & 2 deletions scintilla/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -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
Loading

0 comments on commit f95656c

Please sign in to comment.