X-Git-Url: https://git.decadent.org.uk/gitweb/?p=videolink.git;a=blobdiff_plain;f=Makefile;h=bc262931adc265853e58bca4479e30bcaa8ab33d;hp=13830561967fad9ecaf609c77c1457cbe5809835;hb=388aa3e7fbf7d7586c998833ab53712a88c8d46a;hpb=c13714f6498df33e02635421354f5fb88a60eb3d

diff --git a/Makefile b/Makefile
index 1383056..bc26293 100644
--- a/Makefile
+++ b/Makefile
@@ -14,11 +14,11 @@ 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) -lexpat
 
@@ -32,15 +32,17 @@ endif
 
 cxxsources := \
     auto_proc.cpp browser_widget.cpp child_iterator.cpp generate_dvd.cpp   \
-    link_iterator.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
+    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)
+webdvd : $(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 webdvd *~ .\#* *.orig *.rej svn-commit*.tmp
 
 distclean : clean
 	rm -rf .svn
@@ -52,32 +54,48 @@ install :
 
 .PHONY : clean distclean install
 
-browser_widget.% : CPPFLAGS += -DMOZ_LIB_DIR='"$(moz_lib_dir)"'
+.objs/browser_widget.% : CPPFLAGS += -DMOZ_LIB_DIR='"$(moz_lib_dir)"'
 
-webdvd.% \
+.objs/webdvd.% \
     : CPPFLAGS += -DWEBDVD_LIB_DIR='"$(webdvd_lib_dir)"'             \
                   -DMOZ_VERSION_MAJOR=$(moz_version_major)           \
                   -DMOZ_VERSION_MINOR=$(moz_version_minor)           \
                   -DMOZ_VERSION_PATCHLEVEL=$(moz_version_patchlevel)
 
-browser_widget.% generate_dvd.% pixbufs.% temp_file.% vob_list.% webdvd.% \
+.objs/browser_widget.% .objs/generate_dvd.% .objs/pixbufs.% \
+.objs/temp_file.% .objs/vob_list.% .objs/webdvd.%           \
     : CPPFLAGS += $(shell pkg-config --cflags gtkmm-2.0)
 
-browser_widget.% child_iterator.o link_iterator.% style_sheets.% webdvd.% \
-xpcom_support.%                                                           \
+.objs/browser_widget.% .objs/child_iterator.% .objs/link_iterator.% \
+.objs/null_prompt_service.% .objs/style_sheets.% .objs/webdvd.%	    \
+.objs/xpcom_support.%                                               \
     : CPPFLAGS += $(shell pkg-config --cflags mozilla-gtkmozembed)
 
 # These dig a bit deeper into Mozilla
-link_iterator.% style_sheets.% webdvd.%                                    \
+.objs/link_iterator.% .objs/style_sheets.% .objs/webdvd.%                  \
     : 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