From b3b973a1309feb725802ecaa4cb77c9cd03fb2a5 Mon Sep 17 00:00:00 2001 From: lvw Date: Sun, 12 Sep 2004 22:36:05 +0000 Subject: Integrated patch from eloy for building mugglei git-svn-id: https://vdr-muggle.svn.sourceforge.net/svnroot/vdr-muggle/trunk/muggle-plugin@162 e10066b5-e1e2-0310-b819-94efdf66514b --- Makefile | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index d9bf48c..df90d7e 100644 --- a/Makefile +++ b/Makefile @@ -40,11 +40,12 @@ PACKAGE = vdr-$(ARCHIVE) ### Includes and Defines (add further entries here): -INCLUDES += -I$(VDRDIR) -I$(VDRDIR)/include -I$(DVBDIR)/include -I/usr/include/mysql/ +INCLUDES += -I$(VDRDIR) -I$(VDRDIR)/include -I$(DVBDIR)/include \ + -I/usr/include/mysql/ -I/usr/include/taglib DEFINES += -DPLUGIN_NAME_I18N='"$(PLUGIN)"' -DHAVE_VORBISFILE -MIFLAGS += -I/usr/include/taglib -ltag -lmysqlclient +MIFLAGS += -I/usr/include/taglib -lmysqlclient ### The object files (add further files here): OBJS = $(PLUGIN).o i18n.o vdr_menu.o mg_database.o mg_content_interface.o gd_content_interface.o mg_tools.o mg_media.o mg_filters.o mg_playlist.o vdr_decoder_mp3.o vdr_stream.o vdr_decoder.o vdr_player.o vdr_setup.o vdr_decoder_ogg.o @@ -53,7 +54,7 @@ LIBS = -lmad -lmysqlclient -lvorbisfile -lvorbis ### Targets: -all: libvdr-$(PLUGIN).so +all: libvdr-$(PLUGIN).so mugglei # Dependencies: @@ -67,14 +68,14 @@ $(DEPFILE): Makefile ### Implicit rules: %.o: %.c %.h - $(CXX) $(CXXFLAGS) -c $(DEFINES) $(INCLUDES) $< + $(CXX) $(CXXFLAGS) $(DEFINES) $(INCLUDES) -c $< libvdr-$(PLUGIN).so: $(OBJS) $(CXX) $(CXXFLAGS) -shared $(OBJS) $(LIBS) -o $@ @cp $@ $(LIBDIR)/$@.$(VDRVERSION) mugglei: mg_tools.o mugglei.o - $(CXX) $(CXXFLAGS) $(MIFLAGS) -o $^ + $(CXX) $(CXXFLAGS) $(LIBS) -ltag -o $@ $^ dist: clean @-rm -rf $(TMPDIR)/$(ARCHIVE) @@ -86,3 +87,4 @@ dist: clean clean: @-rm -f $(OBJS) $(BINOBJS) $(DEPFILE) *.so *.tgz core* *~ + -- cgit v1.2.3