From ba088eb351a96a3e6c3dd5659ffd38b7e4fbf8f3 Mon Sep 17 00:00:00 2001 From: Krzysztof Kosi??ski Date: Fri, 20 Feb 2009 22:15:27 +0000 Subject: Only build static libraries for subdirs than actually contain libraries, rather than for every subdirectory. (bzr r7336) --- src/ui/Makefile_insert | 8 ++------ src/ui/cache/Makefile_insert | 7 +------ src/ui/dialog/Makefile_insert | 7 +------ src/ui/view/Makefile_insert | 7 +------ src/ui/widget/Makefile_insert | 7 +------ 5 files changed, 6 insertions(+), 30 deletions(-) (limited to 'src/ui') diff --git a/src/ui/Makefile_insert b/src/ui/Makefile_insert index 94c003584..e91c22025 100644 --- a/src/ui/Makefile_insert +++ b/src/ui/Makefile_insert @@ -1,13 +1,9 @@ ## Makefile.am fragment sourced by src/Makefile.am. -ui/all: ui/libui.a ui/view/all ui/widget/all ui/dialog/all ui/cache/all - -ui/clean: ui/widget/clean ui/dialog/clean ui/cache/clean - rm -f ui/libui.a $(ui_libui_a_OBJECTS) - -ui_libui_a_SOURCES = \ +ink_common_sources += \ ui/clipboard.cpp \ ui/clipboard.h \ + ui/icon-names.h \ ui/previewable.h \ ui/previewfillable.h \ ui/previewholder.cpp \ diff --git a/src/ui/cache/Makefile_insert b/src/ui/cache/Makefile_insert index cb82280a8..c648777f8 100644 --- a/src/ui/cache/Makefile_insert +++ b/src/ui/cache/Makefile_insert @@ -1,11 +1,6 @@ ## Makefile.am fragment sourced by src/Makefile.am. -ui/cache/all: ui/cache/libuicache.a - -ui/cache/clean: - rm -f ui/cache/libuicache.a $(ui_libuicache_a_OBJECTS) - -ui_cache_libuicache_a_SOURCES = \ +ink_common_sources += \ ui/cache/svg_preview_cache.h \ ui/cache/svg_preview_cache.cpp diff --git a/src/ui/dialog/Makefile_insert b/src/ui/dialog/Makefile_insert index 190118946..bf3b6baeb 100644 --- a/src/ui/dialog/Makefile_insert +++ b/src/ui/dialog/Makefile_insert @@ -1,11 +1,6 @@ ## Makefile.am fragment sourced by src/Makefile.am. -ui/dialog/all: ui/dialog/libuidialog.a - -ui/dialog/clean: - rm -f ui/dialog/libuidialog.a $(ui_libuidialog_a_OBJECTS) - -ui_dialog_libuidialog_a_SOURCES = \ +ink_common_sources += \ ui/dialog/aboutbox.cpp \ ui/dialog/aboutbox.h \ ui/dialog/align-and-distribute.cpp \ diff --git a/src/ui/view/Makefile_insert b/src/ui/view/Makefile_insert index bca346b76..812ce21ca 100644 --- a/src/ui/view/Makefile_insert +++ b/src/ui/view/Makefile_insert @@ -1,11 +1,6 @@ ## Makefile.am fragment sourced by src/Makefile.am. -ui/view/all: ui/view/libuiview.a - -ui/view/clean: - rm -f ui/view/libuiview.a $(ui_libuiview_a_OBJECTS) - -ui_view_libuiview_a_SOURCES = \ +ink_common_sources += \ ui/view/edit.h \ ui/view/edit.cpp \ ui/view/edit-widget.h \ diff --git a/src/ui/widget/Makefile_insert b/src/ui/widget/Makefile_insert index a1af8a161..9b4048ea9 100644 --- a/src/ui/widget/Makefile_insert +++ b/src/ui/widget/Makefile_insert @@ -1,11 +1,6 @@ ## Makefile.am fragment sourced by src/Makefile.am. -ui/widget/all: ui/widget/libuiwidget.a - -ui/widget/clean: - rm -f ui/widget/libuiwidget.a $(ui_libuiwidget_a_OBJECTS) - -ui_widget_libuiwidget_a_SOURCES = \ +ink_common_sources += \ ui/widget/attr-widget.h \ ui/widget/button.h \ ui/widget/button.cpp \ -- cgit v1.2.3