X-Git-Url: https://git.decadent.org.uk/gitweb/?p=videolink.git;a=blobdiff_plain;f=Makefile;h=671ba39eb54822373cb10e0df8994ce41a1da9f7;hp=989ef7d50271bcb58869ad5a49b2b9b2ba2d34ee;hb=4b8bff9ce93df43b120c5cf4d1476d3a435f99d3;hpb=15072d864fc8f74ffd40a6d966622bcf55d8a44b

diff --git a/Makefile b/Makefile
index 989ef7d..671ba39 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
 prefix := /usr/local
 
-webdvd_lib_dir := $(prefix)/lib/webdvd
+videolink_lib_dir := $(prefix)/lib/videolink
 
 moz_include_dir := \
     $(shell pkg-config --variable=prefix mozilla-gtkmozembed)/include/mozilla
@@ -14,13 +14,13 @@ moz_version_major := $(word 1,$(subst ., ,$(moz_version)))
 moz_version_minor := $(word 2,$(subst ., ,$(moz_version)))
 moz_version_patchlevel := $(word 3,$(subst ., ,$(moz_version)))
 
-CFLAGS := -Wall
+CFLAGS := -ansi -Wall
 CPPFLAGS := -D_REENTRANT
 # Non-virtual destructors are fine in XPCOM interface classes since
 # instances are only ever called by the Release function which is virtual.
-CXXFLAGS := -Wall -Wno-non-virtual-dtor
+CXXFLAGS := -ansi -Wall -Wno-non-virtual-dtor
 LDFLAGS := -lpthread $(shell pkg-config --libs gtkmm-2.0 mozilla-gtkmozembed) \
-           -Wl,-rpath -Wl,$(moz_lib_dir)
+           -Wl,-rpath -Wl,$(moz_lib_dir) -lexpat
 
 ifdef NDEBUG
     CPPFLAGS += -DNDEBUG
@@ -31,53 +31,71 @@ else
 endif
 
 cxxsources := \
-    auto_proc.cpp browserwidget.cpp childiterator.cpp framebuffer.cpp \
-    linkiterator.cpp pixbufs.cpp stylesheets.cpp temp_file.cpp video.cpp \
-    webdvd.cpp xpcom_support.cpp
+    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
 csources := jquant2.c
 
-webdvd : $(cxxsources:.cpp=.o) $(csources:.c=.o)
+videolink : $(cxxsources:%.cpp=.objs/%.o) $(csources:%.c=.objs/%.o)
 	$(CXX) $(LDFLAGS) -o $@ $^
 
 clean :
-	rm -f webdvd *.d *.o *~ .\#* *.orig *.rej svn-commit*.tmp
+	rm -rf .objs
+	rm -f videolink *~ .\#* *.orig *.rej svn-commit*.tmp
 
 distclean : clean
 	rm -rf .svn
 
 install :
-	mkdir -p -m 755 $(prefix)/bin $(prefix)/lib/webdvd
-	install -m 755 -s webdvd $(prefix)/bin
-	install -m 644 webdvd.css $(prefix)/lib/webdvd
+	mkdir -p -m 755 $(prefix)/bin $(videolink_lib_dir)
+	install -m 755 -s videolink $(prefix)/bin
+	install -m 644 videolink.css $(videolink_lib_dir)
 
 .PHONY : clean distclean install
 
-browserwidget.% : CPPFLAGS += -DMOZ_LIB_DIR='"$(moz_lib_dir)"'
+.objs/browser_widget.% : CPPFLAGS += -DMOZ_LIB_DIR='"$(moz_lib_dir)"'
 
-webdvd.% \
-    : CPPFLAGS += -DWEBDVD_LIB_DIR='"$(webdvd_lib_dir)"'             \
+.objs/videolink.% \
+    : CPPFLAGS += -DVIDEOLINK_LIB_DIR='"$(videolink_lib_dir)"'       \
                   -DMOZ_VERSION_MAJOR=$(moz_version_major)           \
                   -DMOZ_VERSION_MINOR=$(moz_version_minor)           \
                   -DMOZ_VERSION_PATCHLEVEL=$(moz_version_patchlevel)
 
-browserwidget.% pixbufs.% temp_file.% webdvd.% \
+.objs/browser_widget.% .objs/generate_dvd.% .objs/pixbufs.% \
+.objs/temp_file.% .objs/vob_list.% .objs/videolink.%        \
     : CPPFLAGS += $(shell pkg-config --cflags gtkmm-2.0)
 
-browserwidget.% childiterator.o linkiterator.% stylesheets.% webdvd.% \
-xpcom_support.%                                                       \
+.objs/browser_widget.% .objs/child_iterator.% .objs/link_iterator.% \
+.objs/null_prompt_service.% .objs/style_sheets.% .objs/videolink.%  \
+.objs/xpcom_support.%                                               \
     : CPPFLAGS += $(shell pkg-config --cflags mozilla-gtkmozembed)
 
 # These dig a bit deeper into Mozilla
-linkiterator.% stylesheets.% webdvd.%                                        \
-    : CPPFLAGS += $(addprefix -I$(moz_include_dir)/,                         \
+.objs/link_iterator.% .objs/style_sheets.% .objs/videolink.%               \
+    : CPPFLAGS += $(addprefix -I$(moz_include_dir)/,                       \
                     content docshell dom gfx layout necko webshell widget)
 
-%.d : %.cpp
+.objs/null_prompt_service.% : CPPFLAGS += -I$(moz_include_dir)/uconv
+
+.objs/%.d : %.cpp .objs/.created
 	$(CXX) $(CXXFLAGS) $(CPPFLAGS) -MM -MF $@ $<
 
-%.d : %.c
+.objs/%.d : %.c .objs/.created
 	$(CC) $(CFLAGS) $(CPPFLAGS) -MM -MF $@ $<
 
+.objs/%.o : %.cpp .objs/.created
+	$(CXX) $(CXXFLAGS) $(CPPFLAGS) -o $@ -c $<
+
+.objs/%.o : %.c .objs/.created
+	$(CC) $(CFLAGS) $(CPPFLAGS) -o $@ -c $<
+
+%/.created :
+	mkdir -p $*
+	touch $@
+
 ifneq ($(MAKECMDGOALS),clean)
-    include $(cxxsources:.cpp=.d) $(csources:.c=.d)
+    include $(cxxsources:%.cpp=.objs/%.d) $(csources:%.c=.objs/%.d)
 endif
+
+.PRECIOUS : %/.created