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

further Makefile.am tweaks to make it compile again

Browse source 
explanation: via the unresolved problems with the hig-level model,
probably a dependency to AssetManager and from there to the core systems
"bubbled" into the liblumiera.so, forcing us to link these things for now
This commit is contained in:
Fischlurch 2008-12-18 06:47:54 +01:00
parent fcfc80182a
commit 598994c0cb
4 changed files with 32 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
admin/Makefile.am
View file

@ -17,10 +17,10 @@
admin_srcdir = $(top_srcdir)/admin admin_srcdir = $(top_srcdir)/admin
noinst_PROGRAMS += vgsuppression #noinst_PROGRAMS += vgsuppression
vgsuppression_SOURCES = $(admin_srcdir)/vgsuppression.c #vgsuppression_SOURCES = $(admin_srcdir)/vgsuppression.c
vgsuppression_CPPFLAGS = $(AM_CPPFLAGS) -std=gnu99 -Wall -Werror #vgsuppression_CPPFLAGS = $(AM_CPPFLAGS) -std=gnu99 -Wall -Werror
vgsuppression_LDADD = liblumiera.la $(NOBUGMT_LUMIERA_LIBS) -ldl #vgsuppression_LDADD = liblumiera.la $(NOBUGMT_LUMIERA_LIBS) -ldl
noinst_PROGRAMS += rsvg-convert noinst_PROGRAMS += rsvg-convert
rsvg_convert_SOURCES = $(admin_srcdir)/rsvg-convert.c rsvg_convert_SOURCES = $(admin_srcdir)/rsvg-convert.c

17
src/gui/Makefile.am
View file

@ -24,6 +24,7 @@ lumigui_CPPFLAGS = $(AM_CPPFLAGS) \
-DPACKAGE_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \ -DPACKAGE_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
-DPACKAGE_SRC_DIR=\""$(srcdir)"\" \ -DPACKAGE_SRC_DIR=\""$(srcdir)"\" \
-DPACKAGE_DATA_DIR=\""$(datadir)"\" \ -DPACKAGE_DATA_DIR=\""$(datadir)"\" \
-DLUMIERA_CONFIG_PATH="\"$(pkgdatadir)/config\"" \
$(LUMIERA_GUI_CFLAGS) $(LUMIERA_GUI_CFLAGS)
bin_PROGRAMS += lumigui bin_PROGRAMS += lumigui
@ -100,13 +101,25 @@ lumigui_SOURCES = \
$(lumigui_srcdir)/output/xvdisplayer.cpp \ $(lumigui_srcdir)/output/xvdisplayer.cpp \
$(lumigui_srcdir)/output/xvdisplayer.hpp $(lumigui_srcdir)/output/xvdisplayer.hpp
lumigui_SOURCES += \
$(lumiera_srcdir)/lumiera/guifacade.cpp \
$(lumiera_srcdir)/lumiera/configfacade.cpp \
$(lumiera_srcdir)/lumiera/appstate.cpp \
$(lumiera_srcdir)/lumiera/option.cpp \
$(lumiera_srcdir)/lumiera/subsys.cpp \
$(lumiera_srcdir)/lumiera/interfaceproxy.cpp \
$(lumiera_srcdir)/lumiera/nobugcfg.cpp
lumigui_LDFLAGS = lumigui_LDFLAGS =
# $(LIBS) $(X_PRE_LIBS) $(X_LIBS) $(X_EXTRA_LIBS) # $(LIBS) $(X_PRE_LIBS) $(X_LIBS) $(X_EXTRA_LIBS)
lumigui_LDADD = $(LUMIERA_GUI_LIBS) liblumiera.la $(NOBUGMT_LUMIERA_LIBS) lumigui_LDADD = liblumierabackend.la liblumieraproc.la liblumiera.la \
$(LUMIERA_GUI_LIBS) $(NOBUGMT_LUMIERA_LIBS) -lboost_program_options-mt -lboost_regex-mt
lumigui_DEPENDENCIES = \ lumigui_DEPENDENCIES = \
$(top_builddir)/lumiera_ui.rc \ $(top_builddir)/lumiera_ui.rc \
$(top_builddir)/liblumiera.la $(top_builddir)/liblumiera.la \
$(top_builddir)/liblumierabackend.la \
$(top_builddir)/liblumieraproc.la
$(top_builddir)/lumiera_ui.rc: $(top_builddir)/lumiera_ui.rc:
cp $(lumigui_srcdir)/lumiera_ui.rc $(top_builddir) cp $(lumigui_srcdir)/lumiera_ui.rc $(top_builddir)

16
src/tool/Makefile.am
View file

@ -20,8 +20,16 @@ lumitool_srcdir = $(top_srcdir)/src/tool
noinst_PROGRAMS += luidgen noinst_PROGRAMS += luidgen
luidgen_CFLAGS = $(CFLAGS) -std=gnu99 -Wall -Werror luidgen_CFLAGS = $(CFLAGS) -std=gnu99 -Wall -Werror
luidgen_CPPFLAGS = -I$(top_srcdir)/src/ luidgen_CPPFLAGS = -I$(top_srcdir)/src/ \
luidgen_SOURCES = \ -DLUMIERA_CONFIG_PATH="\"$(pkgdatadir)/config\""
$(lumitool_srcdir)/luidgen.c luidgen_SOURCES = \
$(lumitool_srcdir)/luidgen.c
luidgen_LDADD = liblumiera.la $(NOBUGMT_LUMIERA_LIBS) luidgen_SOURCES += \
$(lumiera_srcdir)/lumiera/appstate.cpp \
$(lumiera_srcdir)/lumiera/configfacade.cpp \
$(lumiera_srcdir)/lumiera/subsys.cpp \
$(lumiera_srcdir)/lumiera/nobugcfg.cpp
luidgen_LDADD = liblumiera.la liblumieraproc.la -lboost_regex-mt -ldl $(NOBUGMT_LUMIERA_LIBS)

2
tests/lib/Makefile.am
View file

@ -34,7 +34,7 @@ test_lib_LDADD = \
liblumiera.a \ liblumiera.a \
$(NOBUGMT_LUMIERA_LIBS) -ldl -lboost_program_options-mt -lboost_regex-mt $(NOBUGMT_LUMIERA_LIBS) -ldl -lboost_program_options-mt -lboost_regex-mt
test_common_SOURCES = \ test_lib_SOURCES = \
$(testlib_srcdir)/allocationclustertest.cpp \ $(testlib_srcdir)/allocationclustertest.cpp \
$(testlib_srcdir)/appconfigtest.cpp \ $(testlib_srcdir)/appconfigtest.cpp \
$(testlib_srcdir)/customsharedptrtest.cpp \ $(testlib_srcdir)/customsharedptrtest.cpp \