*** empty log message ***

git-svn-id: http://qeforge.qe-forge.org/svn/q-e/trunk/espresso@778 c92efa57-630b-4861-b058-cf58834340f0

GUI/PWgui/pwgui_vfs/Makefile

@@ -23,10 +23,11 @@ IWIDGETS_LIBDIR = $(prefix)/iwidgets$(IWIDGETS_VERSION)
 LIBITCL_SO = /usr/lib/libitcl$(ITCL_VERSION).so.1
 LIBITK_SO  = /usr/lib/libitk$(ITCL_VERSION).so.1
 
-# if we have some dangling links we should delete them ...
+# if we have some dangling links or some files that are not really
+# needed we should delete them ...
 xdir = pwgui.vfs/lib
 DELETE_LINKS = \
-	$(xdir)/iwidgets$(IWIDGETS_VERSION)/demos/images
+	$(xdir)/iwidgets$(IWIDGETS_VERSION)/demos
 
 SDX    = $(HOME)/local/bin/sdx
 TCLKIT = $(HOME)/local/bin/tclkit

GUI/PWgui/pwgui_vfs/Makefile.darwin

@@ -0,0 +1,63 @@
+# ------------------------------------------------------------------------
+#
+# EDIT to suit your needs ...
+#
+# ------------------------------------------------------------------------
+
+# see the main.tcl.sh script for meaning of ITCL_EXACT
+TK_VERSION = 8.4
+ITCL_EXACT =
+
+ITCL_VERSION     = 3.3
+ITK_VERSION      = 3.3
+IWIDGETS_VERSION = 4.0.2
+
+# define the library-directories to be copied
+prefix=/Library/Tcl
+ITCL_LIBDIR     = 
+ITK_LIBDIR      = $(prefix)/itk$(ITK_VERSION)
+IWIDGETS_LIBDIR = $(prefix)/iwidgets$(IWIDGETS_VERSION)
+
+# define these two vars if libitcl.so and libitk.so needs to be copied
+# separately
+LIBITCL_SO = 
+LIBITK_SO  = 
+
+# if we have some dangling links we should delete them ...
+xdir = pwgui.vfs/lib
+DELETE_LINKS = \
+	$(xdir)/iwidgets$(IWIDGETS_VERSION)/demos
+
+SDX    = $(HOME)/src/Tclkit/sdx
+TCLKIT = $(HOME)/src/Tclkit/tclkit-darwin-ppc
+
+# -Don't-touch-below------------------------------------------------------
+
+LIBDIR=pwgui.vfs/lib
+
+all: tclkit-runtime main.tcl copylib starkit
+
+
+tclkit-runtime:
+	if test -x $(TCLKIT) ; then cp $(TCLKIT) tclkit-runtime ; fi
+
+main.tcl:
+	TK_VERSION=$(TK_VERSION) \
+	ITCL_EXACT=$(ITCL_EXACT) \
+	ITCL_VERSION=$(ITCL_VERSION) $(SHELL) main.tcl.sh
+
+copylib:
+	if test "$(ITCL_LIBDIR)" != "" ; then cp -fr $(ITCL_LIBDIR) $(LIBDIR)/; fi
+	cp -fr $(ITK_LIBDIR) $(LIBDIR)/
+	cp -fr $(IWIDGETS_LIBDIR) $(LIBDIR)/
+	if test "$(LIBITCL_SO)" != "" ; then cp $(LIBITCL_SO) $(LIBDIR)/; fi
+	if test "$(LIBITK_SO)"  != "" ; then cp $(LIBITK_SO)  $(LIBDIR)/; fi
+	-rm -rf $(DELETE_LINKS)
+
+starkit:
+	$(SDX) wrap pwgui -interp $(TCLKIT) -runtime tclkit-runtime
+
+
+
+clean:
+	-rm -rf main.tcl.sh pwgui.vfs/ *~

GUI/PWgui/pwgui_vfs/Makefile.linux

@@ -0,0 +1,64 @@
+# ------------------------------------------------------------------------
+#
+# EDIT to suit your needs ...
+#
+# ------------------------------------------------------------------------
+
+# see the main.tcl.sh script for meaning of ITCL_EXACT
+TK_VERSION = 8.4
+ITCL_EXACT = -exact
+
+ITCL_VERSION     = 3.2
+ITK_VERSION      = 3.2
+IWIDGETS_VERSION = 4.0.1
+
+# define the library-directories to be copied
+prefix=/usr/lib
+ITCL_LIBDIR     = $(prefix)/itcl$(ITCL_VERSION)
+ITK_LIBDIR      = $(prefix)/itk$(ITK_VERSION)
+IWIDGETS_LIBDIR = $(prefix)/iwidgets$(IWIDGETS_VERSION)
+
+# define these two vars if libitcl.so and libitk.so needs to be copied
+# separately
+LIBITCL_SO = /usr/lib/libitcl$(ITCL_VERSION).so.1
+LIBITK_SO  = /usr/lib/libitk$(ITCL_VERSION).so.1
+
+# if we have some dangling links or some files that are not really
+# needed we should delete them ...
+xdir = pwgui.vfs/lib
+DELETE_LINKS = \
+	$(xdir)/iwidgets$(IWIDGETS_VERSION)/demos
+
+SDX    = $(HOME)/local/bin/sdx
+TCLKIT = $(HOME)/local/bin/tclkit
+
+# -Don't-touch-below------------------------------------------------------
+
+LIBDIR=pwgui.vfs/lib
+
+all: tclkit-runtime main.tcl copylib starkit
+
+
+tclkit-runtime:
+	if test -x $(TCLKIT) ; then cp $(TCLKIT) tclkit-runtime ; fi
+
+main.tcl:
+	TK_VERSION=$(TK_VERSION) \
+	ITCL_EXACT=$(ITCL_EXACT) \
+	ITCL_VERSION=$(ITCL_VERSION) $(SHELL) main.tcl.sh
+
+copylib:
+	if test "$(ITCL_LIBDIR)" != "" ; then cp -r $(ITCL_LIBDIR) $(LIBDIR)/; fi
+	cp -r $(ITK_LIBDIR) $(LIBDIR)/
+	cp -r $(IWIDGETS_LIBDIR) $(LIBDIR)/
+	if test "$(LIBITCL_SO)" != "" ; then cp $(LIBITCL_SO) $(LIBDIR)/; fi
+	if test "$(LIBITK_SO)"  != "" ; then cp $(LIBITK_SO)  $(LIBDIR)/; fi
+	-rm -f $(DELETE_LINKS)
+
+starkit:
+	$(SDX) wrap pwgui -interp $(TCLKIT) -runtime tclkit-runtime
+
+
+
+clean:
+	-rm -rf main.tcl.sh pwgui.vfs/ *~

GUI/PWgui/pwgui_vfs/Makefile.win32

@@ -0,0 +1,66 @@
+# ------------------------------------------------------------------------
+#
+# EDIT to suit your needs ...
+#
+# ------------------------------------------------------------------------
+
+# see the main.tcl.sh script for meaning of ITCL_EXACT
+TK_VERSION = 8.4
+ITCL_EXACT = -exact
+
+ITCL_VERSION     = 3.2
+ITK_VERSION      = 3.2
+IWIDGETS_VERSION = 4.0.2
+
+# define the library-directories to be copied
+prefix=/cygdrive/c/Tcl/lib
+ITCL_LIBDIR     = $(prefix)/itcl$(ITCL_VERSION)
+ITK_LIBDIR      = $(prefix)/itk$(ITK_VERSION)
+IWIDGETS_LIBDIR = $(prefix)/iwidgets$(IWIDGETS_VERSION)
+
+# define these two vars if libitcl.so and libitk.so needs to be copied
+# separately
+LIBITCL_SO = 
+LIBITK_SO  = 
+
+# if we have some dangling links we should delete them ...
+xdir = pwgui.vfs/lib
+DELETE_LINKS = \
+	$(xdir)/iwidgets$(IWIDGETS_VERSION)/demos/images
+
+TCLKIT   = $(HOME)/local/bin/tclkit.exe
+SDX      = $(HOME)/local/bin/sdx.bat
+SDXKIT   = $(HOME)/local/bin/sdx.kit
+
+# -Don't-touch-below------------------------------------------------------
+
+LIBDIR=pwgui.vfs/lib
+
+all: tclkit-runtime main.tcl copylib starkit
+
+tclkit-runtime:
+	if test -x $(TCLKIT) ; then \
+		cp $(TCLKIT) tclkit-runtime.exe ; \
+		cp $(SDXKIT) . ; \
+	fi
+
+main.tcl:
+	TK_VERSION=$(TK_VERSION) \
+	ITCL_EXACT=$(ITCL_EXACT) \
+	ITCL_VERSION=$(ITCL_VERSION) $(SHELL) main.tcl.sh
+
+copylib:
+	if test "$(ITCL_LIBDIR)" != "" ; then cp -rf $(ITCL_LIBDIR) $(LIBDIR)/; fi
+	cp -rf $(ITK_LIBDIR) $(LIBDIR)/
+	cp -rf $(IWIDGETS_LIBDIR) $(LIBDIR)/
+	if test "$(LIBITCL_SO)" != "" ; then cp $(LIBITCL_SO) $(LIBDIR)/; fi
+	if test "$(LIBITK_SO)"  != "" ; then cp $(LIBITK_SO)  $(LIBDIR)/; fi
+	-rm -rf $(DELETE_LINKS)
+
+starkit:
+	$(SDX) wrap pwgui.exe -interp $(TCLKIT) -runtime tclkit-runtime.exe
+
+
+
+clean:
+	-rm -rf main.tcl.sh pwgui.vfs/ *~ *.exe *.kit *.bat

GUI/PWgui/pwgui_vfs/darwin-ppc.sh

@@ -1,5 +1,6 @@
 #!/bin/sh
 
+ln -sf Makefile.darwin Makefile
 make
 zip      pwgui-darwin-ppc.zip pwgui
 tar zcvf pwgui-darwin-ppc.tgz pwgui

GUI/PWgui/pwgui_vfs/linux-x86.sh

@@ -1,5 +1,6 @@
 #!/bin/sh
 
+ln -sf Makefile.linux Makefile
 make
 zip      pwgui-linux-x86.zip pwgui
 tar zcvf pwgui-linux-x86.tgz pwgui

GUI/PWgui/pwgui_vfs/win32.sh

@@ -1,4 +1,6 @@
 #!/bin/sh
 
+ln -sf Makefile.win32 Makefile
 make
 zip      pwgui-win32.zip pwgui.exe
+tar zcvf pwgui-win32.tgz pwgui.exe