Skip to content

Commit

Permalink
dropping windows build fragments - let upstream deal with this.
Browse files Browse the repository at this point in the history
  • Loading branch information
oaken-source committed Apr 10, 2018
1 parent 1b91e73 commit 0654e1c
Show file tree
Hide file tree
Showing 52 changed files with 19 additions and 3,919 deletions.
5 changes: 1 addition & 4 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@ m4/pkg.m4

# documentation generated files
doc/*.stamp
doc/*.bak
doc/html
doc/xml
doc/rsvg-decl-list.txt
Expand All @@ -70,7 +71,3 @@ doc/rsvg.interfaces
doc/rsvg.prerequisites
doc/rsvg.signals
doc/version.xml

# windows build fragments
*.props
*.vsprops
6 changes: 6 additions & 0 deletions ChangeLog
Original file line number Diff line number Diff line change
@@ -1,4 +1,10 @@

2018-04-10 Andreas Grapentin <[email protected]>

* build: dropping win32 build fragments
* configure.ac: likewise
* Makefile.am: likewise

2018-04-10 Andreas Grapentin <[email protected]>

* configure.ac: moved aux files to build-aux
Expand Down
53 changes: 4 additions & 49 deletions Makefile.am
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
SUBDIRS = . gdk-pixbuf-loader tests tools doc build

ACLOCAL_AMFLAGS = -I m4

SUBDIRS = . gdk-pixbuf-loader tests tools doc

NULL =
BUILT_SOURCES =
Expand Down Expand Up @@ -166,8 +169,6 @@ EXTRA_DIST = \
gtk-doc.make \
Rsvg-2.0-custom.vala \
Rsvg-2.0.metadata \
config.h.win32.in \
config.h.win32 \
rsvg.symbols \
glib-tap.mk \
tap-driver.sh \
Expand Down Expand Up @@ -271,49 +272,3 @@ CLEANFILES += $(VAPIGEN_VAPIS)
endif # ENABLE_VAPIGEN

endif # HAVE_INTROSPECTION

# ------------------- MSVC Build Items ----------------

MSVCPROJS = rsvg rsvg-convert

rsvg_FILES = $(librsvg_@RSVG_API_MAJOR_VERSION@_la_SOURCES)
rsvg_EXCLUDES = dummy
rsvg_HEADERS_DIR = $(librsvgincdir)
rsvg_HEADERS_INST = $(librsvginc_HEADERS)

rsvg_HEADERS_EXCLUDES = dummy

rsvg_convert_FILES = $(rsvg_convert_SOURCES)
rsvg_convert_EXCLUDES = dummy

include $(top_srcdir)/build/Makefile.msvcproj

# autotools: Why must we do this instead of dist-hook?
MSVCPROJ_GENERATED = \
$(top_builddir)/build/win32/vs9/rsvg.vcproj \
$(top_builddir)/build/win32/vs9/rsvg-convert.vcproj

if HAVE_INTROSPECTION

MSVC_INTROSPECT_GIRS = $(INTROSPECTION_GIRS)

INTROSPECTION_INTERMEDIATE_ITEMS = \
$(top_builddir)/build/win32/Rsvg-@[email protected] \
$(top_builddir)/build/win32/Rsvg_@RSVG_API_VERSION_U@_gir_list

Rsvg_@RSVG_API_VERSION_U@_gir_MSVC_FILES = $(Rsvg_@RSVG_API_VERSION_U@_gir_FILES)
Rsvg_@RSVG_API_VERSION_U@_gir_MSVC_PACKAGES = $(Rsvg_@RSVG_API_VERSION_U@_gir_PACKAGES)
Rsvg_@RSVG_API_VERSION_U@_gir_MSVC_EXPORT_PACKAGES = $(Rsvg_@RSVG_API_VERSION_U@_gir_EXPORT_PACKAGES)
Rsvg_@RSVG_API_VERSION_U@_gir_MSVC_INCLUDE_GIRS = $(Rsvg_@RSVG_API_VERSION_U@_gir_INCLUDES)
Rsvg_@RSVG_API_VERSION_U@_gir_MSVC_LIBS = rsvg-@RSVG_API_VERSION@
Rsvg_@RSVG_API_VERSION_U@_gir_MSVC_CFLAGS = -I../.. -DRSVG_COMPILATION
Rsvg_@RSVG_API_VERSION_U@_gir_MSVC_SCANNERFLAGS = $(Rsvg_@RSVG_API_VERSION_U@_gir_SCANNERFLAGS)

MSVCPROJ_GENERATED += $(INTROSPECTION_INTERMEDIATE_ITEMS)

include $(top_srcdir)/build/Makefile.msvc-introspection
endif # HAVE_INTROSPECTION

$(MSVCPROJ_GENERATED): $(top_builddir)/build/win32/vs9/rsvg.headers

EXTRA_DIST += $(MSVCPROJ_GENERATED)
53 changes: 0 additions & 53 deletions build/Makefile-newvs.am

This file was deleted.

1 change: 0 additions & 1 deletion build/Makefile.am

This file was deleted.

126 changes: 0 additions & 126 deletions build/Makefile.msvc-introspection

This file was deleted.

116 changes: 0 additions & 116 deletions build/Makefile.msvcproj

This file was deleted.

Loading

0 comments on commit 0654e1c

Please sign in to comment.