[Commits] (markie) Works on OSX, linux

[commits at osafoundation.org]

Commit by: markie
Modified files:
external/openssl/Makefile 1.1 1.2

Log message:
Works on OSX, linux


ViewCVS links:
http://cvs.osafoundation.org/index.cgi/external/openssl/Makefile.diff?r1=text&tr1=1.1&r2=text&tr2=1.2

Index: external/openssl/Makefile
diff -u external/openssl/Makefile:1.1 external/openssl/Makefile:1.2
--- external/openssl/Makefile:1.1	Fri Apr 23 18:36:36 2004
+++ external/openssl/Makefile	Fri May  7 22:34:56 2004
@@ -1,10 +1,28 @@
 
+include ../Makefile.inc
+
 VERSION=0.9.7d
+RELVER=$(VERSION)-1
 OPENSSL=$(BUILD_ROOT)/openssl
 SRC=$(OPENSSL)/openssl-$(VERSION)
 
-include $(BUILD_ROOT)/Makefile.inc
+BUILD=build_$(SNAP)
+
+.PHONY: openssl
 
+ifeq ($(OS),Cygwin)
+
+snap: 
+	cd $(BUILD_ROOT); \
+        tar -cvzf $(SRC)/openssl-$(SNAP)-$(RELVER).zip \
+                  $(SNAP)/$(SITE)/openssl
+
+clean:
+	cd $(SRC); devenv.com build/msw/msw.sln /clean $(Snap)
+	cd $(SRC)/openssl; rm -rf $(SRC)/openssl/$(BUILD)
+
+upload: openssl-$(SNAP)-$(RELVER).zip
+	scp openssl-$(SNAP)-$(RELVER).zip $(UPLOAD)
 
 build:
 	@echo openssl build not yet implemented
@@ -16,5 +34,36 @@
 	@echo openssl clean not yet implemented
 
 
+else
+
+$(SRC)/Makefile:
+	cd $(SRC); \
+	./config --prefix=$(PREFIX) --openssldir=$(PREFIX) $(CONF_OPT)
+# 	cd $(SRC); mkdir -p $(BUILD); cd $(BUILD); \
+# 	../config --prefix=$(PREFIX) $(CONF_OPT) 
+
+openssl:   $(SRC)/Makefile
+	cd $(SRC); \
+        $(MAKE) ; $(MAKE) install 
+
+snap: 
+	cd $(BUILD_ROOT); \
+        tar -cvzf $(SRC)/openssl-$(SNAP)-$(RELVER).tar.gz \
+                  $(SNAP)/$(SITE)/openssl 
+
+apply: $(SRC)/Makefile.ssl patches
+	patch -Nup0 < patches; echo ok
+
 expand: openssl-$(VERSION).tar.gz
 	tar xvzf openssl-$(VERSION).tar.gz
+	rm -f openssl-$(VERSION)/Makefile
+
+clean:
+	cd $(SRC); make clean; rm -f Makefile
+
+upload: openssl-$(SNAP)-$(RELVER).tar.gz
+	scp openssl-$(SNAP)-$(RELVER).tar.gz $(UPLOAD)
+
+endif
+
+build: apply openssl