diff options
| author | Markus Engel <markus.engel@tum.de> | 2013-07-25 19:06:28 +0000 |
|---|---|---|
| committer | Markus Engel <markus.engel@tum.de> | 2013-07-25 19:06:28 +0000 |
| commit | 73e263588ca2ca99ea7cac8bbf274695dcd0bec6 (patch) | |
| tree | 75a0b4cbc426c1c21671ee784c0230b09ffd4fc4 /src/Makefile.am | |
| parent | Merged from trunk (r12419). (diff) | |
| parent | Remove unnecessary variable from the GMarkup-based unit parser (diff) | |
| download | inkscape-73e263588ca2ca99ea7cac8bbf274695dcd0bec6.tar.gz inkscape-73e263588ca2ca99ea7cac8bbf274695dcd0bec6.zip | |
Merge from trunk (r12439).
(bzr r11608.1.108)
Diffstat (limited to 'src/Makefile.am')
| -rw-r--r-- | src/Makefile.am | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index aecd79170..cff9ac69f 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -81,8 +81,6 @@ AM_CPPFLAGS = \ $(INKSCAPE_CFLAGS) \ -I$(top_srcdir)/cxxtest \ $(WIN32_CFLAGS) \ - -I$(srcdir)/bind/javainc \ - -I$(srcdir)/bind/javainc/linux \ -I$(builddir)/extension/dbus \ $(X11_CFLAGS) @@ -106,7 +104,6 @@ endif # Include all partial makefiles from subdirectories include Makefile_insert -include bind/Makefile_insert include dialogs/Makefile_insert include display/Makefile_insert include dom/Makefile_insert @@ -114,7 +111,6 @@ include extension/Makefile_insert include extension/dbus/Makefile_insert include extension/implementation/Makefile_insert include extension/internal/Makefile_insert -include extension/script/Makefile_insert include filters/Makefile_insert include helper/Makefile_insert include io/Makefile_insert @@ -146,7 +142,6 @@ EXTRA_DIST += \ $(top_srcdir)/Doxyfile \ sp-skeleton.cpp sp-skeleton.h \ util/makefile.in \ - bind/makefile.in \ debug/makefile.in \ dialogs/makefile.in \ display/makefile.in \ @@ -154,7 +149,6 @@ EXTRA_DIST += \ extension/implementation/makefile.in \ extension/internal/makefile.in \ extension/makefile.in \ - extension/script/makefile.in \ filters/makefile.in \ helper/makefile.in \ io/makefile.in \ |