X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=Makefile;h=e20d8c400302600f3b642a75b025b4d294b2bd9d;hb=5a15c27d8333ea167ffd41aa6017bcb7a10b1be8;hp=e001b0a9783505a7e36f1a983478e9208c67b021;hpb=df5fd006468fed2f1c10e949993fe849d4fb453e;p=videolink.git diff --git a/Makefile b/Makefile index e001b0a..e20d8c4 100644 --- a/Makefile +++ b/Makefile @@ -27,7 +27,7 @@ CFLAGS := -ansi -Wall -Wunused -Wno-unused-parameter CPPFLAGS := -D_REENTRANT CXXFLAGS := -ansi -Wall -Wunused LDFLAGS := -lpthread \ - $(shell pkg-config --libs gtkmm-2.0 $(mozilla)-gtkmozembed) \ + $(shell pkg-config --libs gtkmm-2.4 $(mozilla)-gtkmozembed) \ -Wl,-rpath -Wl,$(moz_lib_dir) -lexpat ifdef NDEBUG @@ -41,8 +41,8 @@ endif cxxsources := \ auto_proc.cpp browser_widget.cpp child_iterator.cpp generate_dvd.cpp \ link_iterator.cpp null_prompt_service.cpp pixbufs.cpp style_sheets.cpp \ - temp_file.cpp video.cpp vob_list.cpp videolink.cpp x_frame_buffer.cpp \ - xml_utils.cpp xpcom_support.cpp + temp_file.cpp video.cpp vob_list.cpp videolink.cpp warp_pointer.cpp \ + x_frame_buffer.cpp xml_utils.cpp xpcom_support.cpp csources := jquant2.c videolink : $(cxxsources:%.cpp=.objs/%.o) $(csources:%.c=.objs/%.o) @@ -63,7 +63,7 @@ install : gzip -c9 videolink.1 >$(DESTDIR)$(mandir)/man1/videolink.1.gz chmod 644 $(DESTDIR)$(mandir)/man1/videolink.1.gz mkdir -p -m 755 $(DESTDIR)$(sharedir)/videolink - install -m 644 videolink.css $(DESTDIR)$(sharedir)/videolink + install -m 644 *.css $(DESTDIR)$(sharedir)/videolink .PHONY : clean install @@ -72,9 +72,9 @@ install : .objs/videolink.% \ : CPPFLAGS += -DVIDEOLINK_SHARE_DIR='"$(sharedir)/videolink"' -.objs/browser_widget.% .objs/generate_dvd.% .objs/pixbufs.% \ -.objs/temp_file.% .objs/vob_list.% .objs/videolink.% \ - : CPPFLAGS += $(shell pkg-config --cflags gtkmm-2.0) +.objs/browser_widget.% .objs/generate_dvd.% .objs/pixbufs.% \ +.objs/temp_file.% .objs/vob_list.% .objs/videolink.% .objs/warp_pointer.% \ + : CPPFLAGS += $(shell pkg-config --cflags gtkmm-2.4) .objs/browser_widget.% .objs/child_iterator.% .objs/link_iterator.% \ .objs/null_prompt_service.% .objs/style_sheets.% .objs/videolink.% \