[Gtk2hs-commit] gtk2hs/mk common.mk,1.46,1.47

[Duncan C. <dun...@us...>]

Update of /cvsroot/gtk2hs/gtk2hs/mk
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31844/mk

Modified Files:
	common.mk 
Log Message:
Make --disable-gnome and --disable-libglade work again.
Do not #include<gtk/gtkversion.h> in config.h, instead define GTK_CHECK_VERSION
macro directly. Also add hack to stop harmless warnings about clashing symbols.

Use per-library / per-program search paths. Drop use of BUILDSOURCES.


Index: common.mk
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/mk/common.mk,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -d -r1.46 -r1.47
--- common.mk	17 Dec 2004 21:21:45 -0000	1.46
+++ common.mk	20 Dec 2004 03:30:59 -0000	1.47
@@ -5,10 +5,8 @@
 
 EMPTY :=
 SPACE := $(EMPTY) $(EMPTY)
-COMMA := ,
-VPATH = $(subst $(SPACE),:,$(strip \
-	$(if $(subst .,,$(srcdir)),$(addprefix $(srcdir)/,$(SOURCEDIRS)), \
-	$(SOURCEDIRS))))
+
+pkgVPATH = $(subst $(SPACE),:,$($(1)_SOURCESDIRS))
 
 LINK = 	$(strip $(HC) -o $@ $(HCFLAGS) $($(NAME)_HCFLAGS) \
 	$(addprefix -package ,$($(NAME)_PACKAGEDEPS)) \
@@ -17,8 +15,7 @@
 .hs.o: $(CONFIG_H)
 	@echo Building for $(NAME)
 	$(strip $(HC) -c $< -o $@ $(HCFLAGS) $($(NAME)_HCFLAGS) \
-	$(call getVar,$<,HCFLAGS) -i$(VPATH) \
-	$(addprefix -package ,$($(NAME)_PACKAGEDEPS)) \
+	$(call getVar,$<,HCFLAGS) -i$(call pkgVPATH,$(NAME)) \
 	$(addprefix -package-name ,$(notdir $(basename $($(NAME)_PACKAGE)))) \
 	$(addprefix '-#include<,$(addsuffix >', $($(NAME)_HEADER))) \
 	$(AM_CPPFLAGS) $($(NAME)_CPPFLAGS))
@@ -35,15 +32,13 @@
 depend: $($(NAME)_BUILDSOURCES)
 	$(if $(word 2,$($(NAME)_HSFILES)),\
 	$(HC) -M $(addprefix -optdep,-f $(NAME).deps) \
-	$($(NAME)_HCFLAGS) -i$(VPATH) \
+	$($(NAME)_HCFLAGS) -i$(call pkgVPATH,$(NAME)) \
 	$(addprefix -package ,$($(NAME)_PACKAGEDEPS)) \
-	$(addprefix '-\#include<,$(addsuffix >',$(CONFIG_H) \
-	$($(NAME)_HEADER))) \
 	$(AM_CPPFLAGS) $(EXTRA_CPPFLAGS) $(CPPFLAGS) \
 	$($(NAME)_HSFILES))
 
 .chs.dep :
-	$(CHSDEPEND) -i$(VPATH) $<
+	@$(CHSDEPEND) -i$(call pkgVPATH,$(NAME)) $<
 
 .hs.chi :
 	@:
@@ -72,6 +67,7 @@
 	$(strip $(C2HS) $(C2HS_FLAGS)		\
 	+RTS $(HSTOOLFLAGS) $(PROFFLAGS) -RTS		\
 	$(addprefix -C,$($(NAME)_CFLAGS) $($(NAME)_CPPFLAGS))		\
+	--cppopts='-include "$(CONFIG_H)"' \
 	--precomp=$($(NAME)_PRECOMP) $($(NAME)_HEADER))
 
 .chs.pp.chs: $(CONFIG_H)
@@ -102,8 +98,7 @@
 	  $(MAKE) $(AM_MAKEFLAGS) NAME="$(NAME)" $($(NAME)_PRECOMP); fi;)
 	$(strip $(C2HS) $(C2HS_FLAGS) \
 	+RTS $(HSTOOLFLAGS) -RTS \
-	-i$(VPATH) --precomp=$($(NAME)_PRECOMP) -o $@ $<)
-	$(CHSDEPEND) -i$(VPATH) $<
+	-i$(call pkgVPATH,$(NAME)) --precomp=$($(NAME)_PRECOMP) -o $@ $<)
 
 
 # installation of packages