benn/lumiera_documentation
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

gui Makefile rework, remove _DEPENDENCIES vars

Browse source 
_DEPENDENCIES supresses all automatic generated dependencies which is not
what we wanted here, instead use dist_pkgdata_DATA which looks right.

Add some clean rules to cleanup generated/copied data.

I am not sure if this is completely right now, but looks (and works) much
better than before.
This commit is contained in:
Christian Thaeter 2008-12-23 07:24:55 +01:00
parent 7db0ba61d8
commit 8e1f64a284
3 changed files with 24 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Makefile.am
View file

@ -27,9 +27,11 @@ check_LTLIBRARIES =
pkglib_LTLIBRARIES = pkglib_LTLIBRARIES =
noinst_LTLIBRARIES = noinst_LTLIBRARIES =
noinst_HEADERS = noinst_HEADERS =
dist_pkgdata_DATA =
BUILT_SOURCES = BUILT_SOURCES =
EXTRA_DIST = EXTRA_DIST =
SUBDIRS = SUBDIRS =
CLEANFILES =
# global pre-processor flags. Per-target variables should include # global pre-processor flags. Per-target variables should include
# these at the front (if possible) for consistency # these at the front (if possible) for consistency

22
icons/Makefile.am
View file

@ -32,17 +32,19 @@ iconcommand = python $(top_srcdir)/admin/render-icon.py
32x32pre = $(prerendereddir)/32x32 32x32pre = $(prerendereddir)/32x32
48x48pre = $(prerendereddir)/48x48 48x48pre = $(prerendereddir)/48x48
lumigui_DEPENDENCIES += \ dist_pkgdata_DATA += \
$(16x16)/tool-arrow.png $(22x22)/tool-arrow.png $(24x24)/tool-arrow.png $(32x32)/tool-arrow.png $(48x48)/tool-arrow.png \ $(16x16)/tool-arrow.png $(22x22)/tool-arrow.png $(24x24)/tool-arrow.png $(32x32)/tool-arrow.png $(48x48)/tool-arrow.png \
$(16x16)/tool-i-beam.png $(22x22)/tool-i-beam.png $(24x24)/tool-i-beam.png $(32x32)/tool-i-beam.png $(48x48)/tool-i-beam.png \ $(16x16)/tool-i-beam.png $(22x22)/tool-i-beam.png $(24x24)/tool-i-beam.png $(32x32)/tool-i-beam.png $(48x48)/tool-i-beam.png \
$(16x16)/track-disabled.png \ $(16x16)/track-disabled.png \
$(16x16)/track-enabled.png \ $(16x16)/track-enabled.png \
$(16x16)/track-locked.png \ $(16x16)/track-locked.png \
$(16x16)/track-unlocked.png \ $(16x16)/track-unlocked.png \
$(16x16)/panel-assets.png $(22x22)/panel-assets.png $(32x32)/panel-assets.png \ $(16x16)/panel-assets.png $(22x22)/panel-assets.png $(32x32)/panel-assets.png \
$(16x16)/panel-timeline.png \ $(16x16)/panel-timeline.png \
$(16x16)/panel-viewer.png $(22x22)/panel-viewer.png $(32x32)/panel-viewer.png $(16x16)/panel-viewer.png $(22x22)/panel-viewer.png $(32x32)/panel-viewer.png
clean-local:
rm -rf $(16x16) $(22x22) $(24x24) $(32x32) $(48x48)
# ========== SVG Icons ========== # ========== SVG Icons ==========
@ -73,7 +75,7 @@ $(22x22)/panel-assets.png:
cp $(22x22pre)/panel-assets.png $(22x22) cp $(22x22pre)/panel-assets.png $(22x22)
$(32x32)/panel-assets.png: $(32x32)/panel-assets.png:
cp $(32x32pre)/panel-assets.png $(32x32) cp $(32x32pre)/panel-assets.png $(32x32)
$(16x16)/panel-timeline.png: $(16x16)/panel-timeline.png:
cp $(16x16pre)/panel-timeline.png $(16x16) cp $(16x16pre)/panel-timeline.png $(16x16)

22
src/gui/Makefile.am
View file

@ -46,17 +46,20 @@ lumigui_SOURCES = \
$(lumigui_srcdir)/gtk-lumiera.cpp \ $(lumigui_srcdir)/gtk-lumiera.cpp \
$(lumigui_srcdir)/gtk-lumiera.hpp $(lumigui_srcdir)/gtk-lumiera.hpp
lumigui_DEPENDENCIES = \
$(top_builddir)/lumiera_ui.rc \ #
$(top_builddir)/liblumieracommon.la \ # themes, locales and other supplemental data
$(top_builddir)/liblumiera.la \ #
$(top_builddir)/liblumierabackend.la \ dist_pkgdata_DATA += lumiera_ui.rc
$(top_builddir)/liblumieraproc.la CLEANFILES += lumiera_ui.rc
lumiera_ui.rc:
cp $(lumigui_srcdir)/lumiera_ui.rc $(top_builddir)
# #
# gtk_gui.lum becomes the pluginized gui # gtk_gui.lum becomes the pluginized gui
# #
pkglib_LTLIBRARIES += gtk_gui.la pkglib_LTLIBRARIES += gtk_gui.la
gtk_gui_la_CFLAGS = $(AM_CFLAGS) -std=gnu99 -Wall -Wextra -Werror gtk_gui_la_CFLAGS = $(AM_CFLAGS) -std=gnu99 -Wall -Wextra -Werror
@ -169,9 +172,4 @@ libgui_la_LIBADD = \
$(NOBUGMT_LUMIERA_LIBS) $(NOBUGMT_LUMIERA_LIBS)
#
# themes, locales and other supplemental data
#
$(top_builddir)/lumiera_ui.rc:
cp $(lumigui_srcdir)/lumiera_ui.rc $(top_builddir)