From ad910f4456bcf0ec085375c9ae377ee903615616 Mon Sep 17 00:00:00 2001 From: Ted Mielczarek Date: Tue, 28 Oct 2008 17:42:27 -0400 Subject: [PATCH] move sqlite-version.h rules below rules.mk so 'make -C db/sqlite3/src' does the right thing. rs=sdwilsh --- db/sqlite3/src/Makefile.in | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/db/sqlite3/src/Makefile.in b/db/sqlite3/src/Makefile.in index be609c9e6126..c3fe07211721 100644 --- a/db/sqlite3/src/Makefile.in +++ b/db/sqlite3/src/Makefile.in @@ -51,20 +51,6 @@ FORCE_SHARED_LIB = 1 VISIBILITY_FLAGS = LIB_IS_C_ONLY = 1 -ifeq (,$(filter-out WINNT WINCE,$(OS_ARCH))) -ifndef GNU_CC -DEFFILE = $(win_srcdir)/sqlite.def -RCFILE = sqlite.rc -RESFILE = sqlite.res - -GARBAGE += sqlite-version.h - -sqlite-version.h: sqlite-version.py sqlite3.h - $(PYTHON) $^ > $@ -export:: sqlite-version.h -endif -endif - # FIXME: bug 419893 NO_PROFILE_GUIDED_OPTIMIZE = 1 @@ -111,6 +97,20 @@ endif include $(topsrcdir)/config/rules.mk +ifeq (,$(filter-out WINNT WINCE,$(OS_ARCH))) +ifndef GNU_CC +DEFFILE = $(win_srcdir)/sqlite.def +RCFILE = sqlite.rc +RESFILE = sqlite.res + +GARBAGE += sqlite-version.h + +sqlite-version.h: sqlite-version.py sqlite3.h + $(PYTHON) $^ > $@ +export:: sqlite-version.h +endif +endif + # next line allows use of MOZ_OBJDIR in .mozconfig with older gcc on BeOS, maybe others LOCAL_INCLUDES += -I$(srcdir)