From 53aa40198fa0fcf4627f8cb7d8a7f9eb2048f5ab Mon Sep 17 00:00:00 2001 From: woro Date: Fri, 8 Feb 2008 16:52:11 +0000 Subject: put mg_db.o into DB_OBJ, otherwise the include path for postresql is missing for compiling mg_db.c git-svn-id: https://vdr-muggle.svn.sourceforge.net/svnroot/vdr-muggle/trunk/muggle-plugin@1004 e10066b5-e1e2-0310-b819-94efdf66514b --- Makefile | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index f17f4aa..7363469 100644 --- a/Makefile +++ b/Makefile @@ -84,7 +84,7 @@ DEFINES += -DMUSICDIR='"$(MUSICDIR)"' ### The object files (add further files here): -OBJS = $(PLUGIN).o i18n.o mg_valmap.o mg_db.o mg_thread_sync.o \ +OBJS = $(PLUGIN).o i18n.o mg_valmap.o mg_thread_sync.o \ mg_item.o mg_item_gd.o mg_listitem.o mg_selection.o mg_sel_gd.o vdr_actions.o vdr_menu.o mg_tools.o \ vdr_decoder_mp3.o vdr_stream.o vdr_decoder.o vdr_player.o \ vdr_setup.o mg_setup.o mg_incremental_search.o mg_image_provider.o @@ -118,6 +118,8 @@ SQLLIBS = -L$(shell pg_config --libdir) -lpq DEFINES += -DHAVE_PG endif +DB_OBJ += mg_db.o + ifdef HAVE_VORBISFILE DEFINES += -DHAVE_VORBISFILE OBJS += vdr_decoder_ogg.o @@ -166,7 +168,7 @@ libvdr-$(PLUGIN).so: $(OBJS) $(CXX) $(CXXFLAGS) -shared $(OBJS) $(PLAYLIBS) $(SQLLIBS) -o $@ @cp --remove-destination $@ $(LIBDIR)/$@.$(APIVERSION) -mugglei: mg_tools.o mugglei.o mg_db.o $(DB_OBJ) mg_listitem.o mg_item.o mg_item_gd.o mg_valmap.o mg_setup.o +mugglei: mg_tools.o mugglei.o $(DB_OBJ) mg_listitem.o mg_item.o mg_item_gd.o mg_valmap.o mg_setup.o $(CXX) $(CXXFLAGS) $^ $(MILIBS) $(SQLLIBS) -o $@ install: all -- cgit v1.2.3