From ae727b1735d03e3b33e2d6cae3cfd69e45308829 Mon Sep 17 00:00:00 2001
From: Jan Lindemann <jan@jannet.de>
Date: Fri, 13 Jul 2007 19:32:36 +0000
Subject: [PATCH] dummy.mk, proj.mk.in: Make ytools compile against mingw under
 Linux (cross-tools)

---
 make/dummy.mk   |  3 ++-
 make/proj.mk.in | 20 +++++++++++---------
 2 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/make/dummy.mk b/make/dummy.mk
index 152cae98..2dd12bfa 100644
--- a/make/dummy.mk
+++ b/make/dummy.mk
@@ -3,8 +3,9 @@
 # contact@jannet.de
 # $Id$
 
-ALL =
 include $(MODDIR)/make/defs.mk
+
+all:
 clean:
 	rm -rf *~ .*.swp
 install: # nothing to be done
diff --git a/make/proj.mk.in b/make/proj.mk.in
index 96340563..cc7934a3 100644
--- a/make/proj.mk.in
+++ b/make/proj.mk.in
@@ -51,8 +51,8 @@ endif
 LDFLAGS += -lytools
 
 ifeq ($(TARGET),mingw)
-CFLAGS                += -D_USRDLL -DYTOOLS_EXPORTS
-CPPFLAGS              += -D_USRDLL -DYTOOLS_EXPORTS
+CFLAGS           += -D_USRDLL -DYTOOLS_EXPORTS
+CPPFLAGS         += -D_USRDLL -DYTOOLS_EXPORTS
 endif
 
 ARCH = @ARCH@
@@ -63,12 +63,14 @@ PROJECT_CFLAGS   += -gstabs+
 PROJECT_CPPFLAGS += -gstabs+
 
 ifneq ($(TARGET),mingw)
-ifeq (@ARCH@,x86)
-PROJECT_LDFLAGS  += $(shell export PKG_CONFIG_PATH=/opt/gnome/lib/pkgconfig; pkg-config --libs glib-2.0)
-else
-  ifeq (@ARCH@,x86_64)
-    PROJECT_LDFLAGS  += $(shell export PKG_CONFIG_PATH=/opt/gnome/lib64/pkgconfig; pkg-config --libs glib-2.0)
+  ifeq (@ARCH@,x86)
+  PROJECT_LDFLAGS  += $(shell export PKG_CONFIG_PATH=/opt/gnome/lib/pkgconfig; pkg-config --libs glib-2.0)
+  else
+    ifeq (@ARCH@,x86_64)
+      PROJECT_LDFLAGS  += $(shell export PKG_CONFIG_PATH=/opt/gnome/lib64/pkgconfig; pkg-config --libs glib-2.0)
+    endif
   endif
-endif
-PROJECT_LDFLAGS += -ldl -lpthread
+  PROJECT_LDFLAGS += -ldl -lpthread
+else
+  PROJECT_LDFLAGS += -lglib-2.0
 endif