X-Git-Url: https://git.decadent.org.uk/gitweb/?p=videolink.git;a=blobdiff_plain;f=Makefile;h=48124a2ad0c30bab0c365b52fbc05a1419f0e704;hp=989ef7d50271bcb58869ad5a49b2b9b2ba2d34ee;hb=9befd8a8d798f9ae4e0eaacae9b34f6211556292;hpb=15072d864fc8f74ffd40a6d966622bcf55d8a44b

diff --git a/Makefile b/Makefile
index 989ef7d..48124a2 100644
--- a/Makefile
+++ b/Makefile
@@ -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,9 +31,10 @@ 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 webdvd.cpp x_frame_buffer.cpp     \
+    xml_utils.cpp xpcom_support.cpp
 csources := jquant2.c
 
 webdvd : $(cxxsources:.cpp=.o) $(csources:.c=.o)
@@ -52,7 +53,7 @@ install :
 
 .PHONY : clean distclean install
 
-browserwidget.% : CPPFLAGS += -DMOZ_LIB_DIR='"$(moz_lib_dir)"'
+browser_widget.% : CPPFLAGS += -DMOZ_LIB_DIR='"$(moz_lib_dir)"'
 
 webdvd.% \
     : CPPFLAGS += -DWEBDVD_LIB_DIR='"$(webdvd_lib_dir)"'             \
@@ -60,16 +61,16 @@ webdvd.% \
                   -DMOZ_VERSION_MINOR=$(moz_version_minor)           \
                   -DMOZ_VERSION_PATCHLEVEL=$(moz_version_patchlevel)
 
-browserwidget.% pixbufs.% temp_file.% webdvd.% \
+browser_widget.% generate_dvd.% pixbufs.% temp_file.% vob_list.% webdvd.% \
     : CPPFLAGS += $(shell pkg-config --cflags gtkmm-2.0)
 
-browserwidget.% childiterator.o linkiterator.% stylesheets.% webdvd.% \
-xpcom_support.%                                                       \
+browser_widget.% child_iterator.o link_iterator.% null_prompt_service.% \
+style_sheets.% webdvd.% 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)/,                         \
+link_iterator.% style_sheets.% webdvd.%                                    \
+    : CPPFLAGS += $(addprefix -I$(moz_include_dir)/,                       \
                     content docshell dom gfx layout necko webshell widget)
 
 %.d : %.cpp