From 54639f8de60d5ea53bf49383294d403f526e25ca Mon Sep 17 00:00:00 2001
From: Ben Hutchings <ben@decadent.org.uk>
Date: Sun, 9 Apr 2006 21:34:09 +0000
Subject: [PATCH] Moved object and dependency files into a temporary
subdirectory.
---
Makefile | 37 +++++++++++++++++++++++++------------
1 file changed, 25 insertions(+), 12 deletions(-)
diff --git a/Makefile b/Makefile
index 036d0f9..8b0d51a 100644
--- a/Makefile
+++ b/Makefile
@@ -37,11 +37,12 @@ cxxsources := \
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
@@ -53,34 +54,46 @@ 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.% null_prompt_service.% \
-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)
-null_prompt_service.% : CPPFLAGS += -I$(moz_include_dir)/uconv
+.objs/null_prompt_service.% : CPPFLAGS += -I$(moz_include_dir)/uconv
-%.d : %.cpp
+.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
--
2.39.5