grim/guifications2

Mingw build fixes from Lee Roach
org.guifications.gf2
2007-05-15, Daniel Atallah
458ab09b6018
Parents 0f68a71a854a
Children c274052e808b
Mingw build fixes from Lee Roach
--- a/Makefile.mingw Sun May 13 01:53:07 2007 -0400
+++ b/Makefile.mingw Tue May 15 14:06:27 2007 -0400
@@ -30,17 +30,18 @@
.PHONY: all install installer clean
all:
- cp gf_config.h.mingw gf_config.h
$(MAKE) -C $(GF_SRC) -f Makefile.mingw
$(MAKE) -C $(GF_PO) -f Makefile.mingw
+gf_config.h: gf_config.h.mingw
+ cp gf_config.h.mingw gf_config.h
+
install: all
$(MAKE) -C $(GF_PIXMAPS) -f Makefile.mingw install
$(MAKE) -C $(GF_THEMES) -f Makefile.mingw install
$(MAKE) -C $(GF_SRC) -f Makefile.mingw install
$(MAKE) -C $(GF_PO) -f Makefile.mingw install
-
installer: all
$(MAKENSIS) /DGUIFICATIONS_VERSION="$(GF_VERSION)" /DPIDGIN_VERSION="$(PIDGIN_VERSION)" /DPIDGIN_TREE_TOP="$(PIDGIN_TREE_TOP)" guifications-installer.nsi
--- a/po/Makefile.mingw Sun May 13 01:53:07 2007 -0400
+++ b/po/Makefile.mingw Tue May 15 14:06:27 2007 -0400
@@ -36,7 +36,6 @@
all: $(CATALOGS)
install: all $(PURPLE_INSTALL_PO_DIR)
- mkdir -p $(PURPLE_INSTALL_PO_DIR)
@catalogs='$(CATALOGS)'; \
for cat in $$catalogs; do \
cat=`basename $$cat`; \
@@ -49,3 +48,5 @@
clean:
rm -f *.gmo
+
+include $(PIDGIN_COMMON_TARGETS)
--- a/src/Makefile.mingw Sun May 13 01:53:07 2007 -0400
+++ b/src/Makefile.mingw Tue May 15 14:06:27 2007 -0400
@@ -119,6 +119,11 @@
install: all $(PIDGIN_INSTALL_PLUGINS_DIR)
cp $(GF).dll $(PIDGIN_INSTALL_PLUGINS_DIR)
+$(GF_OBJ): $(GF_TOP)/gf_config.h $(PURPLE_VERSION_H)
+
+$(GF_TOP)/gf_config.h: $(GF_TOP)/gf_config.h.mingw
+ $(MAKE) -C $(GF_TOP) -f Makefile.mingw gf_config.h
+
##
## BUILD DLL
##