diff options
| author | Krzysztof Kosi??ski <tweenk.pl@gmail.com> | 2009-02-20 22:15:27 +0000 |
|---|---|---|
| committer | tweenk <tweenk@users.sourceforge.net> | 2009-02-20 22:15:27 +0000 |
| commit | ba088eb351a96a3e6c3dd5659ffd38b7e4fbf8f3 (patch) | |
| tree | 89f91e684b0b9177c502d2b152a21c9a73026466 /src/extension | |
| parent | The snap indicator's tooltip now displays "A to B", whereas before it only di... (diff) | |
| download | inkscape-ba088eb351a96a3e6c3dd5659ffd38b7e4fbf8f3.tar.gz inkscape-ba088eb351a96a3e6c3dd5659ffd38b7e4fbf8f3.zip | |
Only build static libraries for subdirs than actually contain libraries,
rather than for every subdirectory.
(bzr r7336)
Diffstat (limited to 'src/extension')
| -rw-r--r-- | src/extension/Makefile_insert | 8 | ||||
| -rw-r--r-- | src/extension/implementation/Makefile_insert | 8 | ||||
| -rw-r--r-- | src/extension/internal/Makefile_insert | 14 | ||||
| -rw-r--r-- | src/extension/script/Makefile_insert | 9 |
4 files changed, 6 insertions, 33 deletions
diff --git a/src/extension/Makefile_insert b/src/extension/Makefile_insert index bb0dc9cef..1965dfa9a 100644 --- a/src/extension/Makefile_insert +++ b/src/extension/Makefile_insert @@ -1,11 +1,6 @@ ## Makefile.am fragment sourced by src/Makefile.am. -extension/all: extension/libextension.a extension/implementation/all extension/internal/all - -extension/clean: extension/implementation/clean extension/internal/clean - rm -f extension/libextension.a $(extension_libextension_a_OBJECTS) - -extension_libextension_a_SOURCES = \ +ink_common_sources += \ extension/extension.cpp \ extension/extension.h \ extension/extension-forward.h \ @@ -45,7 +40,6 @@ extension_libextension_a_SOURCES = \ extension/system.h \ extension/timer.cpp \ extension/timer.h \ - \ extension/input.h \ extension/input.cpp \ extension/output.h \ diff --git a/src/extension/implementation/Makefile_insert b/src/extension/implementation/Makefile_insert index 0600c05f2..1b9080f1a 100644 --- a/src/extension/implementation/Makefile_insert +++ b/src/extension/implementation/Makefile_insert @@ -1,12 +1,6 @@ ## Makefile.am fragment sourced by src/Makefile.am. -extension/implementation/all: extension/implementation/libimplementation.a - -extension/implementation/clean: - rm -f extension/implementation/libimplementation.a \ - $(extension_implementation_libimplementation_a_OBJECTS) - -extension_implementation_libimplementation_a_SOURCES = \ +ink_common_sources += \ extension/implementation/implementation.cpp \ extension/implementation/implementation.h \ extension/implementation/script.cpp \ diff --git a/src/extension/internal/Makefile_insert b/src/extension/internal/Makefile_insert index 6620a1228..d2ba9b3eb 100644 --- a/src/extension/internal/Makefile_insert +++ b/src/extension/internal/Makefile_insert @@ -1,19 +1,14 @@ ## Makefile.am fragment sourced by src/Makefile.am. -extension/internal/all: extension/internal/libinternal.a - -extension/internal/clean: - rm -f extension/internal/libinternal.a $(extension_internal_libinternal_OBJECTS) - if WITH_LIBWPG -extension_internal_libwpg = \ +ink_common_sources += \ extension/internal/wpg-input.cpp \ extension/internal/wpg-input.h endif if USE_IMAGE_MAGICK -extension_internal_image_magick_sources = \ +ink_common_sources += \ extension/internal/bitmap/imagemagick.cpp \ extension/internal/bitmap/imagemagick.h \ extension/internal/bitmap/adaptiveThreshold.cpp \ @@ -86,7 +81,7 @@ extension_internal_image_magick_sources = \ extension/internal/bitmap/wave.h endif -extension_internal_libinternal_a_SOURCES = \ +ink_common_sources += \ extension/internal/bluredge.h \ extension/internal/bluredge.cpp \ extension/internal/clear-n_.h \ @@ -128,8 +123,6 @@ extension_internal_libinternal_a_SOURCES = \ extension/internal/latex-pstricks.h \ extension/internal/latex-pstricks-out.cpp \ extension/internal/latex-pstricks-out.h \ - $(extension_internal_libwpg) \ - $(extension_internal_image_magick_sources) \ extension/internal/filter/filter-all.cpp \ extension/internal/filter/filter-file.cpp \ extension/internal/filter/filter.cpp \ @@ -142,4 +135,3 @@ extension_internal_libinternal_a_SOURCES = \ extension/internal/emf-win32-print.cpp \ extension/internal/emf-win32-inout.h \ extension/internal/emf-win32-inout.cpp - diff --git a/src/extension/script/Makefile_insert b/src/extension/script/Makefile_insert index e9edddee3..c0bd91e81 100644 --- a/src/extension/script/Makefile_insert +++ b/src/extension/script/Makefile_insert @@ -1,13 +1,6 @@ ## Makefile.am fragment sourced by src/Makefile.am. -extension/script/all: extension/script/libscript.a - -extension/script/clean: - rm -f extension/script/libscript.a - rm -f $(extension_script_libscript_a_OBJECTS) - - -extension_script_libscript_a_SOURCES = \ +ink_common_sources += \ extension/script/InkscapeScript.h \ extension/script/InkscapeScript.cpp |