hoc-cvs — CVS commit log messages

[hoc-cvs] hoc/AppKit Makefile.in,1.3,1.4

[Andre P. <at...@us...>]

Update of /cvsroot/hoc/hoc/AppKit
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10883/AppKit

Modified Files:
	Makefile.in 
Log Message:
More build system changes ...

Build system now actually implements the --with-ghc parameter :) -- define
a $GHC variable in config.mk

Added --with-ghc-pkg parameter (if you want to e.g. do
"--with-ghc-pkg=ghc-pkg-6.2.1")

Define $GHC_LIB_PATH in config.mk and use that rather than `ghc --print-libdir`
in all the Makefiles

Lifted DOT and POD2HTML autoconf substitutions to config.mk, rather than being output directly to docs/Makefile



Index: Makefile.in
===================================================================
RCS file: /cvsroot/hoc/hoc/AppKit/Makefile.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- Makefile.in	12 May 2004 11:11:05 -0000	1.3
+++ Makefile.in	14 May 2004 06:05:11 -0000	1.4
@@ -14,7 +14,7 @@
 		ln -sf ../Bindings/ifgen-output/GNUstepGUI.hs .
 	mkdir -p build/objects
 	mkdir -p build/imports
-	ghc --make AppKit.hs	\
+	$(GHC) --make AppKit.hs	\
 		-package-name AppKit	\
 		-odir build/objects \
 		-hidir build/imports	\
@@ -22,14 +22,14 @@
 		-package-conf ../Foundation/Foundation.conf-inplace \
 		-fglasgow-exts
 	test ! -r GNUstepGUI.hs || \
-		ghc --make GNUstepGUI.hs	\
+		$(GHC) --make GNUstepGUI.hs	\
 			-package-name AppKit	\
 			-odir build/objects \
 			-hidir build/imports	\
 			-package-conf ../HOC/HOC-$(PLATFORM).conf-inplace \
 			-package-conf ../Foundation/Foundation.conf-inplace \
 			-fglasgow-exts
-	ghc -c Cocoa.hs \
+	$(GHC) -c Cocoa.hs \
 		-package-name AppKit	\
 		-ibuild/imports	   \
 		-o build/objects/Cocoa.o	\
@@ -55,9 +55,10 @@
 	    Cocoa.hs ghcmake.build-stamp
 
 install: all
-	mkdir -p `ghc --print-libdir`/AppKit
+	mkdir -p $(GHC_LIB_PATH)/AppKit
 	cp -R libHSAppKit.a HSAppKit.o build/imports \
-		`ghc --print-libdir`/AppKit/
-	ranlib `ghc --print-libdir`/AppKit/libHSAppKit.a
+		$(GHC_LIB_PATH)/AppKit/
+	ranlib $(GHC_LIB_PATH)/AppKit/libHSAppKit.a
 	ghc-pkg --update-package	\
 			--input-file=AppKit-$(PLATFORM).conf
+

[hoc-cvs] hoc/docs Makefile.in,1.1,1.2

[Andre P. <at...@us...>]

Update of /cvsroot/hoc/hoc/docs
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10883/docs

Modified Files:
	Makefile.in 
Log Message:
More build system changes ...

Build system now actually implements the --with-ghc parameter :) -- define
a $GHC variable in config.mk

Added --with-ghc-pkg parameter (if you want to e.g. do
"--with-ghc-pkg=ghc-pkg-6.2.1")

Define $GHC_LIB_PATH in config.mk and use that rather than `ghc --print-libdir`
in all the Makefiles

Lifted DOT and POD2HTML autoconf substitutions to config.mk, rather than being output directly to docs/Makefile



Index: Makefile.in
===================================================================
RCS file: /cvsroot/hoc/hoc/docs/Makefile.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- Makefile.in	12 May 2004 05:44:14 -0000	1.1
+++ Makefile.in	14 May 2004 06:05:15 -0000	1.2
@@ -22,10 +22,10 @@
 all: view
 
 %.png: %.dot
-	@DOT@ -Tpng
+	$(DOT) -Tpng
 
 HOC.html: $(SOURCE_PODS) $(SOURCE_PMGS)
-	@POD2HTML@ \
+	$(POD2HTML) \
 	  --index \
 	  --header \
 	  --title="${TITLE}" \

[hoc-cvs] hoc/HOC_cbits Makefile.in,1.1,1.2

[Andre P. <at...@us...>]

Update of /cvsroot/hoc/hoc/HOC_cbits
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10883/HOC_cbits

Modified Files:
	Makefile.in 
Log Message:
More build system changes ...

Build system now actually implements the --with-ghc parameter :) -- define
a $GHC variable in config.mk

Added --with-ghc-pkg parameter (if you want to e.g. do
"--with-ghc-pkg=ghc-pkg-6.2.1")

Define $GHC_LIB_PATH in config.mk and use that rather than `ghc --print-libdir`
in all the Makefiles

Lifted DOT and POD2HTML autoconf substitutions to config.mk, rather than being output directly to docs/Makefile



Index: Makefile.in
===================================================================
RCS file: /cvsroot/hoc/hoc/HOC_cbits/Makefile.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- Makefile.in	12 May 2004 05:44:10 -0000	1.1
+++ Makefile.in	14 May 2004 06:05:14 -0000	1.2
@@ -37,9 +37,9 @@
 	cc -MM $(CFLAGS) $(SRCS) > depend
 		
 install: all
-	mkdir -p `ghc --print-libdir`/HOC
+	mkdir -p $(GHC_LIB_PATH)/HOC
 	cp -R libHOC_cbits.a HOC_cbits.o \
-		`ghc --print-libdir`/HOC/
-	ranlib `ghc --print-libdir`/HOC/libHOC_cbits.a
+		$(GHC_LIB_PATH)/HOC/
+	ranlib $(GHC_LIB_PATH)/HOC/libHOC_cbits.a
 	
 -include depend

[hoc-cvs] hoc/Tools Makefile.in,1.1,1.2

[Andre P. <at...@us...>]

Update of /cvsroot/hoc/hoc/Tools
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10883/Tools

Modified Files:
	Makefile.in 
Log Message:
More build system changes ...

Build system now actually implements the --with-ghc parameter :) -- define
a $GHC variable in config.mk

Added --with-ghc-pkg parameter (if you want to e.g. do
"--with-ghc-pkg=ghc-pkg-6.2.1")

Define $GHC_LIB_PATH in config.mk and use that rather than `ghc --print-libdir`
in all the Makefiles

Lifted DOT and POD2HTML autoconf substitutions to config.mk, rather than being output directly to docs/Makefile



Index: Makefile.in
===================================================================
RCS file: /cvsroot/hoc/hoc/Tools/Makefile.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- Makefile.in	12 May 2004 05:44:13 -0000	1.1
+++ Makefile.in	14 May 2004 06:05:14 -0000	1.2
@@ -4,7 +4,7 @@
 
 hocwrap: *.hs
 	mkdir -p build/hocwrap
-	ghc --make HOCWrap.hs	\
+	$(GHC) --make HOCWrap.hs	\
 		-fglasgow-exts	\
 		-o hocwrap	\
 		-odir build/hocwrap -hidir build/hocwrap	\

[hoc-cvs] hoc/InterfaceGenerator Makefile.in,1.2,1.3

[Andre P. <at...@us...>]

Update of /cvsroot/hoc/hoc/InterfaceGenerator
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10883/InterfaceGenerator

Modified Files:
	Makefile.in 
Log Message:
More build system changes ...

Build system now actually implements the --with-ghc parameter :) -- define
a $GHC variable in config.mk

Added --with-ghc-pkg parameter (if you want to e.g. do
"--with-ghc-pkg=ghc-pkg-6.2.1")

Define $GHC_LIB_PATH in config.mk and use that rather than `ghc --print-libdir`
in all the Makefiles

Lifted DOT and POD2HTML autoconf substitutions to config.mk, rather than being output directly to docs/Makefile



Index: Makefile.in
===================================================================
RCS file: /cvsroot/hoc/hoc/InterfaceGenerator/Makefile.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- Makefile.in	12 May 2004 08:59:38 -0000	1.2
+++ Makefile.in	14 May 2004 06:05:14 -0000	1.3
@@ -4,7 +4,7 @@
 
 ifgen:
 	mkdir -p build
-	ghc --make Main.hs	\
+	$(GHC) --make Main.hs	\
 		-odir build -hidir build \
 		-package-conf ../HOC/HOC-$(PLATFORM).conf-inplace \
 		-o $@

[hoc-cvs] hoc/HOC Makefile.in,1.3,1.4

[Andre P. <at...@us...>]

Update of /cvsroot/hoc/hoc/HOC
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10883/HOC

Modified Files:
	Makefile.in 
Log Message:
More build system changes ...

Build system now actually implements the --with-ghc parameter :) -- define
a $GHC variable in config.mk

Added --with-ghc-pkg parameter (if you want to e.g. do
"--with-ghc-pkg=ghc-pkg-6.2.1")

Define $GHC_LIB_PATH in config.mk and use that rather than `ghc --print-libdir`
in all the Makefiles

Lifted DOT and POD2HTML autoconf substitutions to config.mk, rather than being output directly to docs/Makefile



Index: Makefile.in
===================================================================
RCS file: /cvsroot/hoc/hoc/HOC/Makefile.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- Makefile.in	12 May 2004 11:11:08 -0000	1.3
+++ Makefile.in	14 May 2004 06:05:13 -0000	1.4
@@ -17,7 +17,7 @@
 ghcmake.build-stamp:
 	mkdir -p build/objects
 	mkdir -p build/imports
-	ghc --make HOC.hs	\
+	$(GHC) --make HOC.hs	\
 		-odir build/objects -hidir build/imports	\
 		-fglasgow-exts -package-name HOC \
 		../HOC_cbits/HOC_cbits.o	\
@@ -34,9 +34,9 @@
 	    ghcmake.build-stamp
 
 install: all
-	mkdir -p `ghc --print-libdir`/HOC
+	mkdir -p $(GHC_LIB_PATH)/HOC
 	cp -R libHOC.a HOC.o build/imports \
-		`ghc --print-libdir`/HOC/
-	ranlib `ghc --print-libdir`/HOC/libHOC.a
-	ghc-pkg --update-package	\
+		$(GHC_LIB_PATH)/HOC/
+	ranlib $(GHC_LIB_PATH)/HOC/libHOC.a
+	$(GHC_PKG) --update-package	\
 			--input-file=HOC-$(PLATFORM).conf

[hoc-cvs] hoc/HOC HOC-macos.conf-inplace,1.2,1.3

[Wolfgang T. <wth...@us...>]

Update of /cvsroot/hoc/hoc/HOC
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4665

Modified Files:
	HOC-macos.conf-inplace 
Log Message:
Remove old workaround for NCG bug


Index: HOC-macos.conf-inplace
===================================================================
RCS file: /cvsroot/hoc/hoc/HOC/HOC-macos.conf-inplace,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- HOC-macos.conf-inplace	13 May 2004 04:52:59 -0000	1.2
+++ HOC-macos.conf-inplace	13 May 2004 18:04:41 -0000	1.3
@@ -13,7 +13,7 @@
     package_deps = ["base","haskell-src"],
     extra_ghc_opts = [],
     extra_cc_opts = [],
-    extra_ld_opts = ["-Xlinker", "-read_only_relocs", "-Xlinker", "suppress"],
+    extra_ld_opts = [],
     framework_dirs = [],
     extra_frameworks = ["Foundation"]
 }

[hoc-cvs] hoc/HOC_cbits MsgSend.h,NONE,1.1

[Wolfgang T. <wth...@us...>]

Update of /cvsroot/hoc/hoc/HOC_cbits
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7280/HOC_cbits

Added Files:
	MsgSend.h 
Log Message:
Make HOC.MsgSend compile via C to work around a bug in GHC 6.2's NCG for
PowerPC. The NCG doesn't generate the proper dynamic linker stubs for
taking the address of dylib-imported functions. The bug will be fixed in
GHC 6.4, so we will be able to remove the -fvia-C flag again then.

Compiling via C required adding a new .h file with the prototypes for
objc_msgSend and friends; Apple is not helping us here by letting a single
line of Objective-C slip into an otherwise plain C header file.

Also, removed the previous workaround from HOC/HOC-macos.conf.


--- NEW FILE: MsgSend.h ---
#include <objc/objc.h>

#ifndef GNUSTEP
/*
 * <objc/objc-runtime.h> contains a single line that is not pure C
 * code, so we have to duplicate the prototypes here for GHC's benefit.
*/

void objc_msgSend_stret(void * stretAddr, id self, SEL op, ...);
id objc_msgSend(id self, SEL op, ...);
#endif

[hoc-cvs] hoc/HOC HOC-macos.conf,1.2,1.3

[Wolfgang T. <wth...@us...>]

Update of /cvsroot/hoc/hoc/HOC
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7280/HOC

Modified Files:
	HOC-macos.conf 
Log Message:
Make HOC.MsgSend compile via C to work around a bug in GHC 6.2's NCG for
PowerPC. The NCG doesn't generate the proper dynamic linker stubs for
taking the address of dylib-imported functions. The bug will be fixed in
GHC 6.4, so we will be able to remove the -fvia-C flag again then.

Compiling via C required adding a new .h file with the prototypes for
objc_msgSend and friends; Apple is not helping us here by letting a single
line of Objective-C slip into an otherwise plain C header file.

Also, removed the previous workaround from HOC/HOC-macos.conf.


Index: HOC-macos.conf
===================================================================
RCS file: /cvsroot/hoc/hoc/HOC/HOC-macos.conf,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- HOC-macos.conf	13 May 2004 04:52:59 -0000	1.2
+++ HOC-macos.conf	13 May 2004 11:08:33 -0000	1.3
@@ -12,7 +12,7 @@
     package_deps = ["base","haskell-src"],
     extra_ghc_opts = [],
     extra_cc_opts = [],
-    extra_ld_opts = ["-Xlinker", "-read_only_relocs", "-Xlinker", "suppress"],
+    extra_ld_opts = [],
     framework_dirs = [],
     extra_frameworks = ["Foundation"]
 }

[hoc-cvs] hoc/HOC/HOC MsgSend.hs,1.4,1.5

[Wolfgang T. <wth...@us...>]

Update of /cvsroot/hoc/hoc/HOC/HOC
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7280/HOC/HOC

Modified Files:
	MsgSend.hs 
Log Message:
Make HOC.MsgSend compile via C to work around a bug in GHC 6.2's NCG for
PowerPC. The NCG doesn't generate the proper dynamic linker stubs for
taking the address of dylib-imported functions. The bug will be fixed in
GHC 6.4, so we will be able to remove the -fvia-C flag again then.

Compiling via C required adding a new .h file with the prototypes for
objc_msgSend and friends; Apple is not helping us here by letting a single
line of Objective-C slip into an otherwise plain C header file.

Also, removed the previous workaround from HOC/HOC-macos.conf.


Index: MsgSend.hs
===================================================================
RCS file: /cvsroot/hoc/hoc/HOC/HOC/MsgSend.hs,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- MsgSend.hs	3 Nov 2003 10:26:00 -0000	1.4
+++ MsgSend.hs	13 May 2004 11:08:34 -0000	1.5
@@ -1,4 +1,4 @@
-{-# OPTIONS -cpp #-}
+{-# OPTIONS -cpp -fvia-C #-}
 module HOC.MsgSend(
         sendMessageWithRetval,
         sendMessageWithStructRetval,
@@ -47,9 +47,9 @@
 
 #else
 
-foreign import ccall "objc/objc-runtime.h &objc_msgSend"
+foreign import ccall "MsgSend.h &objc_msgSend"
     objc_msgSendPtr :: FunPtr (Ptr ObjCObject -> SEL -> IO ())
-foreign import ccall "objc/objc-runtime.h &objc_msgSend_stret"
+foreign import ccall "MsgSend.h &objc_msgSend_stret"
     objc_msgSend_stretPtr :: FunPtr (Ptr a -> Ptr ObjCObject -> SEL -> IO ())
 
 sendMessageWithRetval cif args =

[hoc-cvs] hoc/HOC HOC-macos.conf,1.1.1.1,1.2 HOC-macos.conf-inplace,1.1.1.1,1.2

[Andre P. <at...@us...>]

Update of /cvsroot/hoc/hoc/HOC
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4779a

Modified Files:
	HOC-macos.conf HOC-macos.conf-inplace 
Log Message:
"Fixed" (or rather, suppressed) error trying to link in libHOC.a with GHC 6.2.1
(6.2 doesn't need this fix, but 6.2.1 barfs).  No idea what this fix really
does, but the samples still seem to work, so who cares, right? :)  (Search for
"read_only_relocs" in the ld(1) manpage for more details.)



Index: HOC-macos.conf
===================================================================
RCS file: /cvsroot/hoc/hoc/HOC/HOC-macos.conf,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- HOC-macos.conf	27 Oct 2003 16:48:02 -0000	1.1.1.1
+++ HOC-macos.conf	13 May 2004 04:52:59 -0000	1.2
@@ -12,7 +12,7 @@
     package_deps = ["base","haskell-src"],
     extra_ghc_opts = [],
     extra_cc_opts = [],
-    extra_ld_opts = [],
+    extra_ld_opts = ["-Xlinker", "-read_only_relocs", "-Xlinker", "suppress"],
     framework_dirs = [],
     extra_frameworks = ["Foundation"]
 }

Index: HOC-macos.conf-inplace
===================================================================
RCS file: /cvsroot/hoc/hoc/HOC/HOC-macos.conf-inplace,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- HOC-macos.conf-inplace	27 Oct 2003 16:48:02 -0000	1.1.1.1
+++ HOC-macos.conf-inplace	13 May 2004 04:52:59 -0000	1.2
@@ -13,8 +13,8 @@
     package_deps = ["base","haskell-src"],
     extra_ghc_opts = [],
     extra_cc_opts = [],
-    extra_ld_opts = [],
+    extra_ld_opts = ["-Xlinker", "-read_only_relocs", "-Xlinker", "suppress"],
     framework_dirs = [],
     extra_frameworks = ["Foundation"]
 }
-]
\ No newline at end of file
+]

[hoc-cvs] hoc/Foundation Makefile.in,1.2,1.3

[Andre P. <at...@us...>]

Update of /cvsroot/hoc/hoc/Foundation
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31817/Foundation

Modified Files:
	Makefile.in 
Log Message:
Also delete ghcmake.build-stamp on 'make clean'



Index: Makefile.in
===================================================================
RCS file: /cvsroot/hoc/hoc/Foundation/Makefile.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- Makefile.in	12 May 2004 08:59:37 -0000	1.2
+++ Makefile.in	12 May 2004 11:11:06 -0000	1.3
@@ -40,7 +40,8 @@
 	ranlib libHSFoundation.a
 
 clean:
-	rm -rf build libHSFoundation.a HSFoundation.o Foundation.hs Foundation
+	rm -rf build libHSFoundation.a HSFoundation.o Foundation.hs \
+	    Foundation ghcmake.build-stamp
 	
 install: all
 	mkdir -p `ghc --print-libdir`/Foundation

[hoc-cvs] hoc/HOC Makefile.in,1.2,1.3

[Andre P. <at...@us...>]

Update of /cvsroot/hoc/hoc/HOC
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31817/HOC

Modified Files:
	Makefile.in 
Log Message:
Also delete ghcmake.build-stamp on 'make clean'



Index: Makefile.in
===================================================================
RCS file: /cvsroot/hoc/hoc/HOC/Makefile.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- Makefile.in	12 May 2004 08:59:38 -0000	1.2
+++ Makefile.in	12 May 2004 11:11:08 -0000	1.3
@@ -30,7 +30,8 @@
 
 clean:
 	rm -rf libHOC.a HOC.o build \
-	    HOC/NewClass_stub.c HOC/NewClass_stub.h
+	    HOC/NewClass_stub.c HOC/NewClass_stub.h \
+	    ghcmake.build-stamp
 
 install: all
 	mkdir -p `ghc --print-libdir`/HOC

[hoc-cvs] hoc/AppKit Makefile.in,1.2,1.3

[Andre P. <at...@us...>]

Update of /cvsroot/hoc/hoc/AppKit
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31817/AppKit

Modified Files:
	Makefile.in 
Log Message:
Also delete ghcmake.build-stamp on 'make clean'



Index: Makefile.in
===================================================================
RCS file: /cvsroot/hoc/hoc/AppKit/Makefile.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- Makefile.in	12 May 2004 08:59:37 -0000	1.2
+++ Makefile.in	12 May 2004 11:11:05 -0000	1.3
@@ -51,7 +51,8 @@
 	ranlib libHSAppKit.a
 
 clean:
-	rm -rf build libHSAppKit.a HSAppKit.o AppKit.hs AppKit Cocoa.hs
+	rm -rf build libHSAppKit.a HSAppKit.o AppKit.hs AppKit \
+	    Cocoa.hs ghcmake.build-stamp
 
 install: all
 	mkdir -p `ghc --print-libdir`/AppKit

[hoc-cvs] hoc/HOC Makefile.in,1.1,1.2

[Andre P. <at...@us...>]

Update of /cvsroot/hoc/hoc/HOC
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5553/HOC

Modified Files:
	Makefile.in 
Log Message:
Better dependency checking in Makefiles: now a "make && make install" doesn't
cause the make install to rebuild a whole bunch of things it doesn't need to



Index: Makefile.in
===================================================================
RCS file: /cvsroot/hoc/hoc/HOC/Makefile.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- Makefile.in	12 May 2004 05:44:10 -0000	1.1
+++ Makefile.in	12 May 2004 08:59:38 -0000	1.2
@@ -2,7 +2,7 @@
 
 all: libHOC.a HOC.o
 
-libHOC.a: ghcmake
+libHOC.a: ghcmake.build-stamp
 	find build/objects/ -name \*.o | xargs $(MAKE_STATIC_LIB) libHOC.a
 
 #libHOC.dylib: ghcmake
@@ -12,7 +12,9 @@
 HOC.o: libHOC.a
 	ld -r -x -o HOC.o $(ALL_LOAD) libHOC.a
 
-ghcmake:
+ghcmake: ghcmake.build-stamp
+
+ghcmake.build-stamp:
 	mkdir -p build/objects
 	mkdir -p build/imports
 	ghc --make HOC.hs	\
@@ -24,7 +26,7 @@
 		$(FOUNDATION_INCLUDES) \
 		$(FOUNDATION_LIBS)      \
                 $(DEFINES)
-		
+	touch $@
 
 clean:
 	rm -rf libHOC.a HOC.o build \

[hoc-cvs] hoc/InterfaceGenerator Makefile.in,1.1,1.2

[Andre P. <at...@us...>]

Update of /cvsroot/hoc/hoc/InterfaceGenerator
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5553/InterfaceGenerator

Modified Files:
	Makefile.in 
Log Message:
Better dependency checking in Makefiles: now a "make && make install" doesn't
cause the make install to rebuild a whole bunch of things it doesn't need to



Index: Makefile.in
===================================================================
RCS file: /cvsroot/hoc/hoc/InterfaceGenerator/Makefile.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- Makefile.in	12 May 2004 05:44:11 -0000	1.1
+++ Makefile.in	12 May 2004 08:59:38 -0000	1.2
@@ -1,11 +1,13 @@
 include ../config.mk
 
-all:
+all: ifgen
+
+ifgen:
 	mkdir -p build
 	ghc --make Main.hs	\
 		-odir build -hidir build \
 		-package-conf ../HOC/HOC-$(PLATFORM).conf-inplace \
-		-o ifgen
+		-o $@
 		
 clean:
 	rm -rf ifgen build

[hoc-cvs] hoc/Foundation Makefile.in,1.1,1.2

[Andre P. <at...@us...>]

Update of /cvsroot/hoc/hoc/Foundation
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5553/Foundation

Modified Files:
	Makefile.in 
Log Message:
Better dependency checking in Makefiles: now a "make && make install" doesn't
cause the make install to rebuild a whole bunch of things it doesn't need to



Index: Makefile.in
===================================================================
RCS file: /cvsroot/hoc/hoc/Foundation/Makefile.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- Makefile.in	12 May 2004 05:44:09 -0000	1.1
+++ Makefile.in	12 May 2004 08:59:37 -0000	1.2
@@ -2,7 +2,9 @@
 
 all: libHSFoundation.a HSFoundation.o
 
-ghcmake:
+ghcmake: ghcmake.build-stamp
+
+ghcmake.build-stamp:
 	ln -sf ../Bindings/ifgen-output/Foundation.hs .
 	ln -sf ../Bindings/ifgen-output/Foundation .
 	test ! -d ../Bindings/ifgen-output/GNUstepBase || \
@@ -24,11 +26,14 @@
 			-hidir build/imports	\
 			-package-conf ../HOC/HOC-$(PLATFORM).conf-inplace \
 			-fglasgow-exts
+	touch $@
 
-HSFoundation.o: ghcmake
+HSFoundation.o: ghcmake.build-stamp
 	find build/objects/ -name \*.o | xargs ld -r -x -o HSFoundation.o
+
 #libHSFoundation.a: ghcmake
 #	find build/objects/ -name \*.o | xargs libtool -static -o libHSFoundation.a	
+
 libHSFoundation.a: HSFoundation.o
 	rm -f libHSFoundation.a
 	ar cq libHSFoundation.a HSFoundation.o
@@ -44,3 +49,4 @@
 	ranlib `ghc --print-libdir`/Foundation/libHSFoundation.a
 	ghc-pkg --update-package	\
 			--input-file=Foundation.conf
+

[hoc-cvs] hoc/Bindings Makefile.in,1.1,1.2

[Andre P. <at...@us...>]

Update of /cvsroot/hoc/hoc/Bindings
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5553/Bindings

Modified Files:
	Makefile.in 
Log Message:
Better dependency checking in Makefiles: now a "make && make install" doesn't
cause the make install to rebuild a whole bunch of things it doesn't need to



Index: Makefile.in
===================================================================
RCS file: /cvsroot/hoc/hoc/Bindings/Makefile.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- Makefile.in	12 May 2004 05:44:09 -0000	1.1
+++ Makefile.in	12 May 2004 08:59:37 -0000	1.2
@@ -1,7 +1,10 @@
-all:
+all: ifgen-output/Foundation.hs
+
+ifgen-output/Foundation.hs:
 	../InterfaceGenerator/ifgen
 
 clean:
-	rm -rf ifgen-output
+	-rm -rf ifgen-output all-selectors.txt
 
 install: all
+

[hoc-cvs] hoc/AppKit Makefile.in,1.1,1.2

[Andre P. <at...@us...>]

Update of /cvsroot/hoc/hoc/AppKit
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5553/AppKit

Modified Files:
	Makefile.in 
Log Message:
Better dependency checking in Makefiles: now a "make && make install" doesn't
cause the make install to rebuild a whole bunch of things it doesn't need to



Index: Makefile.in
===================================================================
RCS file: /cvsroot/hoc/hoc/AppKit/Makefile.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- Makefile.in	12 May 2004 05:44:08 -0000	1.1
+++ Makefile.in	12 May 2004 08:59:37 -0000	1.2
@@ -2,7 +2,9 @@
 
 all: libHSAppKit.a HSAppKit.o
 
-ghcmake:
+ghcmake: ghcmake.build-stamp
+
+ghcmake.build-stamp:
 	ln -sf ../Bindings/ifgen-output/Cocoa.hs .
 	ln -sf ../Bindings/ifgen-output/AppKit.hs .
 	ln -sf ../Bindings/ifgen-output/AppKit .
@@ -35,12 +37,14 @@
 		-package-conf ../HOC/HOC-$(PLATFORM).conf-inplace \
 		-package-conf ../Foundation/Foundation.conf-inplace \
 		-fglasgow-exts
-
+	touch $@
 	
-HSAppKit.o: ghcmake
+HSAppKit.o: ghcmake.build-stamp
 	find build/objects/ -name \*.o | xargs ld -r -x -o HSAppKit.o
+
 #libHSAppKit.a: ghcmake
 #	find build/objects/ -name \*.o | xargs libtool -static -o libHSAppKit.a
+
 libHSAppKit.a: HSAppKit.o
 	rm -f libHSAppKit.a
 	ar cq libHSAppKit.a HSAppKit.o

[hoc-cvs] hoc config-gnustep.mk,1.4,NONE config-macos.mk,1.2,NONE

[Andre P. <at...@us...>]

Update of /cvsroot/hoc/hoc
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5586

Removed Files:
	config-gnustep.mk config-macos.mk 
Log Message:
Removed config-gnustep.mk and config-macos.mk files: they're merged into
configure.ac in the new build system



--- config-gnustep.mk DELETED ---

--- config-macos.mk DELETED ---

[hoc-cvs] hoc/autotools config.guess,NONE,1.1 config.sub,NONE,1.1 install-sh,NONE,1.1

[Andre P. <at...@us...>]

Update of /cvsroot/hoc/hoc/autotools
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5525/autotools

Added Files:
	config.guess config.sub install-sh 
Log Message:
Moved config.guess, config.guess, install.sh to autotols/ directory



--- NEW FILE: install-sh ---
#!/bin/sh
#
# install - install a program, script, or datafile
# This comes from X11R5 (mit/util/scripts/install.sh).
#
# Copyright 1991 by the Massachusetts Institute of Technology
#
# Permission to use, copy, modify, distribute, and sell this software and its
# documentation for any purpose is hereby granted without fee, provided that
# the above copyright notice appear in all copies and that both that
# copyright notice and this permission notice appear in supporting
# documentation, and that the name of M.I.T. not be used in advertising or
# publicity pertaining to distribution of the software without specific,
# written prior permission.  M.I.T. makes no representations about the
# suitability of this software for any purpose.  It is provided "as is"
# without express or implied warranty.
#
# Calling this script install-sh is preferred over install.sh, to prevent
# `make' implicit rules from creating a file called install from it
# when there is no Makefile.
#
# This script is compatible with the BSD install script, but was written
# from scratch.  It can only install one file at a time, a restriction
# shared with many OS's install programs.


# set DOITPROG to echo to test this script

# Don't use :- since 4.3BSD and earlier shells don't like it.
doit="${DOITPROG-}"


# put in absolute paths if you don't have them in your path; or use env. vars.

mvprog="${MVPROG-mv}"
cpprog="${CPPROG-cp}"
chmodprog="${CHMODPROG-chmod}"
chownprog="${CHOWNPROG-chown}"
chgrpprog="${CHGRPPROG-chgrp}"
stripprog="${STRIPPROG-strip}"
rmprog="${RMPROG-rm}"
mkdirprog="${MKDIRPROG-mkdir}"

transformbasename=""
transform_arg=""
instcmd="$mvprog"
chmodcmd="$chmodprog 0755"
chowncmd=""
chgrpcmd=""
stripcmd=""
rmcmd="$rmprog -f"
mvcmd="$mvprog"
src=""
dst=""
dir_arg=""

while [ x"$1" != x ]; do
    case $1 in
	-c) instcmd="$cpprog"
	    shift
	    continue;;

	-d) dir_arg=true
	    shift
	    continue;;

	-m) chmodcmd="$chmodprog $2"
	    shift
	    shift
	    continue;;

	-o) chowncmd="$chownprog $2"
	    shift
	    shift
	    continue;;

	-g) chgrpcmd="$chgrpprog $2"
	    shift
	    shift
	    continue;;

	-s) stripcmd="$stripprog"
	    shift
	    continue;;

	-t=*) transformarg=`echo $1 | sed 's/-t=//'`
	    shift
	    continue;;

	-b=*) transformbasename=`echo $1 | sed 's/-b=//'`
	    shift
	    continue;;

	*)  if [ x"$src" = x ]
	    then
		src=$1
	    else
		# this colon is to work around a 386BSD /bin/sh bug
		:
		dst=$1
	    fi
	    shift
	    continue;;
    esac
done

if [ x"$src" = x ]
then
	echo "install:	no input file specified"
	exit 1
else
	:
fi

if [ x"$dir_arg" != x ]; then
	dst=$src
	src=""
	
	if [ -d $dst ]; then
		instcmd=:
		chmodcmd=""
	else
		instcmd=$mkdirprog
	fi
else

# Waiting for this to be detected by the "$instcmd $src $dsttmp" command
# might cause directories to be created, which would be especially bad 
# if $src (and thus $dsttmp) contains '*'.

	if [ -f "$src" ] || [ -d "$src" ]
	then
		:
	else
		echo "install:  $src does not exist"
		exit 1
	fi
	
	if [ x"$dst" = x ]
	then
		echo "install:	no destination specified"
		exit 1
	else
		:
	fi

# If destination is a directory, append the input filename; if your system
# does not like double slashes in filenames, you may need to add some logic

	if [ -d $dst ]
	then
		dst="$dst"/`basename $src`
	else
		:
	fi
fi

## this sed command emulates the dirname command
dstdir=`echo $dst | sed -e 's,[^/]*$,,;s,/$,,;s,^$,.,'`

# Make sure that the destination directory exists.
#  this part is taken from Noah Friedman's mkinstalldirs script

# Skip lots of stat calls in the usual case.
if [ ! -d "$dstdir" ]; then
defaultIFS='
	'
IFS="${IFS-${defaultIFS}}"

oIFS="${IFS}"
# Some sh's can't handle IFS=/ for some reason.
IFS='%'
set - `echo ${dstdir} | sed -e 's@/@%@g' -e 's@^%@/@'`
IFS="${oIFS}"

pathcomp=''

while [ $# -ne 0 ] ; do
	pathcomp="${pathcomp}${1}"
	shift

	if [ ! -d "${pathcomp}" ] ;
        then
		$mkdirprog "${pathcomp}"
	else
		:
	fi

	pathcomp="${pathcomp}/"
done
fi

if [ x"$dir_arg" != x ]
then
	$doit $instcmd $dst &&

	if [ x"$chowncmd" != x ]; then $doit $chowncmd $dst; else : ; fi &&
	if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dst; else : ; fi &&
	if [ x"$stripcmd" != x ]; then $doit $stripcmd $dst; else : ; fi &&
	if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dst; else : ; fi
else

# If we're going to rename the final executable, determine the name now.

	if [ x"$transformarg" = x ] 
	then
		dstfile=`basename $dst`
	else
		dstfile=`basename $dst $transformbasename | 
			sed $transformarg`$transformbasename
	fi

# don't allow the sed command to completely eliminate the filename

	if [ x"$dstfile" = x ] 
	then
		dstfile=`basename $dst`
	else
		:
	fi

# Make a temp file name in the proper directory.

	dsttmp=$dstdir/#inst.$$#

# Move or copy the file name to the temp name

	$doit $instcmd $src $dsttmp &&

	trap "rm -f ${dsttmp}" 0 &&

# and set any options; do chmod last to preserve setuid bits

# If any of these fail, we abort the whole thing.  If we want to
# ignore errors from any of these, just make sure not to ignore
# errors from the above "$doit $instcmd $src $dsttmp" command.

	if [ x"$chowncmd" != x ]; then $doit $chowncmd $dsttmp; else :;fi &&
	if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dsttmp; else :;fi &&
	if [ x"$stripcmd" != x ]; then $doit $stripcmd $dsttmp; else :;fi &&
	if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dsttmp; else :;fi &&

# Now rename the file to the real destination.

	$doit $rmcmd -f $dstdir/$dstfile &&
	$doit $mvcmd $dsttmp $dstdir/$dstfile 

fi &&


exit 0

--- NEW FILE: config.guess ---
#! /bin/sh
# Attempt to guess a canonical system name.
#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
#   2000, 2001, 2002 Free Software Foundation, Inc.

timestamp='2002-07-23'

# This file is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful, but
# WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
# General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
[...1315 lines suppressed...]
/bin/universe          = `(/bin/universe) 2>/dev/null`
/usr/bin/arch -k       = `(/usr/bin/arch -k) 2>/dev/null`
/bin/arch              = `(/bin/arch) 2>/dev/null`
/usr/bin/oslevel       = `(/usr/bin/oslevel) 2>/dev/null`
/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null`

UNAME_MACHINE = ${UNAME_MACHINE}
UNAME_RELEASE = ${UNAME_RELEASE}
UNAME_SYSTEM  = ${UNAME_SYSTEM}
UNAME_VERSION = ${UNAME_VERSION}
EOF

exit 1

# Local variables:
# eval: (add-hook 'write-file-hooks 'time-stamp)
# time-stamp-start: "timestamp='"
# time-stamp-format: "%:y-%02m-%02d"
# time-stamp-end: "'"
# End:

--- NEW FILE: config.sub ---
#! /bin/sh
# Configuration validation subroutine script.
#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
#   2000, 2001, 2002 Free Software Foundation, Inc.

timestamp='2002-07-03'

# This file is (in principle) common to ALL GNU software.
# The presence of a machine in this file suggests that SOME GNU software
# can handle that machine.  It does not imply ALL GNU software can.
#
# This file is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
[...1421 lines suppressed...]
			-*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
				vendor=atari
				;;
			-vos*)
				vendor=stratus
				;;
		esac
		basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"`
		;;
esac

echo $basic_machine$os
exit 0

# Local variables:
# eval: (add-hook 'write-file-hooks 'time-stamp)
# time-stamp-start: "timestamp='"
# time-stamp-format: "%:y-%02m-%02d"
# time-stamp-end: "'"
# End:

[hoc-cvs] hoc configure.ac,1.2,1.3 config.guess,1.1,NONE config.sub,1.1,NONE install-sh,1.1,NONE

[Andre P. <at...@us...>]

Update of /cvsroot/hoc/hoc
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5525

Modified Files:
	configure.ac 
Removed Files:
	config.guess config.sub install-sh 
Log Message:
Moved config.guess, config.guess, install.sh to autotols/ directory



--- install-sh DELETED ---

Index: configure.ac
===================================================================
RCS file: /cvsroot/hoc/hoc/configure.ac,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- configure.ac	12 May 2004 05:49:06 -0000	1.2
+++ configure.ac	12 May 2004 05:51:13 -0000	1.3
@@ -8,6 +8,7 @@
 
 AC_PREREQ(2.57)
 AC_INIT(HOC, 0.2, oz...@al...)
+AC_CONFIG_AUX_DIR(autotools)
 
 # Check we're in the right directory
 AC_CONFIG_SRCDIR([HOC/HOC/NewClass.hs])

--- config.guess DELETED ---

--- config.sub DELETED ---

[hoc-cvs] hoc/autotools - New directory

[Andre P. <at...@us...>]

Update of /cvsroot/hoc/hoc/autotools
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5433/autotools

Log Message:
Directory /cvsroot/hoc/hoc/autotools added to the repository

[hoc-cvs] hoc configure.ac,1.1,1.2

[Andre P. <at...@us...>]

Update of /cvsroot/hoc/hoc
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5116

Modified Files:
	configure.ac 
Log Message:
Fixed check for ./configure to be run from the correct directory



Index: configure.ac
===================================================================
RCS file: /cvsroot/hoc/hoc/configure.ac,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- configure.ac	12 May 2004 05:44:08 -0000	1.1
+++ configure.ac	12 May 2004 05:49:06 -0000	1.2
@@ -10,7 +10,7 @@
 AC_INIT(HOC, 0.2, oz...@al...)
 
 # Check we're in the right directory
-AC_CONFIG_SRCDIR([HOC/HOC/NewClass_stub.c])
+AC_CONFIG_SRCDIR([HOC/HOC/NewClass.hs])
 
 # Check system we're running on
 AC_CANONICAL_SYSTEM

[hoc-cvs] hoc/HOC Makefile.in,NONE,1.1 HOC.hs,1.5,1.6 Makefile,1.2,NONE

[Andre P. <at...@us...>]

Update of /cvsroot/hoc/hoc/HOC
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4305/HOC

Modified Files:
	HOC.hs 
Added Files:
	Makefile.in 
Removed Files:
	Makefile 
Log Message:
Changed build system to use GNU autoconf (./configure && make && make install)
rather than home-grown build system

Removed import HOC.Marshal from HOC/HOC.hs, since HOC.Marshal requires Foundation.NSString and thus generates a circular dependency

Small documentation updates




--- NEW FILE: Makefile.in ---
include ../config.mk

all: libHOC.a HOC.o

libHOC.a: ghcmake
	find build/objects/ -name \*.o | xargs $(MAKE_STATIC_LIB) libHOC.a

#libHOC.dylib: ghcmake
#	export MACOSX_DEPLOYMENT_TARGET=10.3 && find build/objects/ -name \*.o \#
#       | xargs libtool -dynamic -o libHOC.dylib -undefined dynamic_lookup

HOC.o: libHOC.a
	ld -r -x -o HOC.o $(ALL_LOAD) libHOC.a

ghcmake:
	mkdir -p build/objects
	mkdir -p build/imports
	ghc --make HOC.hs	\
		-odir build/objects -hidir build/imports	\
		-fglasgow-exts -package-name HOC \
		../HOC_cbits/HOC_cbits.o	\
		-I../HOC_cbits	\
		-I../libffi-src/build/include	\
		$(FOUNDATION_INCLUDES) \
		$(FOUNDATION_LIBS)      \
                $(DEFINES)
		

clean:
	rm -rf libHOC.a HOC.o build \
	    HOC/NewClass_stub.c HOC/NewClass_stub.h

install: all
	mkdir -p `ghc --print-libdir`/HOC
	cp -R libHOC.a HOC.o build/imports \
		`ghc --print-libdir`/HOC/
	ranlib `ghc --print-libdir`/HOC/libHOC.a
	ghc-pkg --update-package	\
			--input-file=HOC-$(PLATFORM).conf

Index: HOC.hs
===================================================================
RCS file: /cvsroot/hoc/hoc/HOC/HOC.hs,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- HOC.hs	7 May 2004 09:16:40 -0000	1.5
+++ HOC.hs	12 May 2004 05:44:10 -0000	1.6
@@ -54,6 +54,6 @@
 import HOC.ExportClass
 import HOC.Utilities
 import HOC.NewlyAllocated
-import HOC.Marshal
 
 import Data.Typeable
+

--- Makefile DELETED ---