From 0eb47e96052a0f24ac72568adc0fa8e138834839 Mon Sep 17 00:00:00 2001
From: Jan Lindemann <jan@jannet.de>
Date: Fri, 17 Aug 2007 10:26:39 +0000
Subject: [PATCH] proj.mk, proj.mk.in: Replace proj.mk.in by proj.mk

---
 make/{proj.mk.in => proj.mk} | 24 +++++-------------------
 1 file changed, 5 insertions(+), 19 deletions(-)
 rename make/{proj.mk.in => proj.mk} (67%)

diff --git a/make/proj.mk.in b/make/proj.mk
similarity index 67%
rename from make/proj.mk.in
rename to make/proj.mk
index 9c6522ca..26340088 100644
--- a/make/proj.mk.in
+++ b/make/proj.mk
@@ -24,9 +24,9 @@ REQUIRED = inst/pre \
 		lib include bin \
 		inst/post
 
-VERSION     = @PACKAGE_VERSION@
-VERSION_STR = \"@PACKAGE_VERSION@\"
-DEVELOPMENT = @IS_DEVELOPMENT_VERSION@
+#VERSION     = @PACKAGE_VERSION@
+#VERSION_STR = \"@PACKAGE_VERSION@\"
+#DEVELOPMENT = @IS_DEVELOPMENT_VERSION@
 
 # rpmdist.mk variables
 MKSPEC_SH        = $(MOD_SCRIPT_DIR)/mkspec_wrapper.sh $(TOPDIR)/make/mkspec.sh
@@ -53,22 +53,8 @@ LDFLAGS += -lytools
 CFLAGS           += -D_USRDLL -DYTOOLS_EXPORTS
 CPPFLAGS         += -D_USRDLL -DYTOOLS_EXPORTS
 
-ARCH = @ARCH@
-
-LD_LIB_PATH=$(TOPDIR)/lib
-
 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)
-    endif
-  endif
-  PROJECT_LDFLAGS += -ldl -lpthread
-else
-  PROJECT_LDFLAGS += -lglib-2.0
-endif
+USE_GLIB          = true
+