From 7a290431cf56a54886888d90c9b0aea65a7940de Mon Sep 17 00:00:00 2001 From: Bent Bisballe Nyeng Date: Wed, 4 Jun 2014 10:46:41 +0200 Subject: Move all pixmaps into qrc. --- src/Makefile.am | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) (limited to 'src/Makefile.am') diff --git a/src/Makefile.am b/src/Makefile.am index ac0545c..91ca228 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -12,11 +12,11 @@ endif AM_CXXFLAGS = $(QT_CFLAGS) miav_CXXFLAGS = $(SDL_CFLAGS) $(DV_CFLAGS) $(IEC61883_CFLAGS) $(QT_CFLAGS) \ - -I../include -DPIXMAPS=\"$(datadir)/pixmaps\" \ - -DETC=\"$(prefix)/etc/miav\" -I$(top_srcdir)/hugin + -I../include -DETC=\"$(prefix)/etc/miav\" -I$(top_srcdir)/hugin \ + -DPIXMAPS=\":/pixmaps\" miav_LDADD = $(shell ../tools/MocList o) $(QT_LIBS) $(IEC61883_LIBS) \ - $(SDL_LIBS) $(DV_LIBS) + $(SDL_LIBS) $(DV_LIBS) qrc_miav.o miav_SOURCES = \ aa_socket.cc \ @@ -141,14 +141,18 @@ EXTRA_DIST = \ threadsafe_queue_priority.h \ util.h \ videowidget.h \ - yuv_draw.h + yuv_draw.h \ + miav.qrc miav_MOC = $(shell if [ $QT_CXXFLAGS ] ; then ../tools/MocList cc; fi ) -BUILT_SOURCES = $(miav_MOC) +BUILT_SOURCES = $(miav_MOC) qrc_miav.cc CLEANFILES = $(BUILT_SOURCES) +qrc_%.cc: %.qrc + rcc $< > $@ + %.moc.cc: %.h $(QT_MOC) -o $@ $< -- cgit v1.2.3