X-Git-Url: https://git.cworth.org/git?a=blobdiff_plain;f=Makefile.local;h=f468c646de2028cc47c7bb73ce8f92d49f32cdc3;hb=6475596e655063624dbf54359bd2a45de6a17dd1;hp=8ca513649e7d221d392e2b9d8d4a558cb45b08e6;hpb=5e4afc13a1514f253373e7054ef025baef9b0ed0;p=fips

diff --git a/Makefile.local b/Makefile.local
index 8ca5136..f468c64 100644
--- a/Makefile.local
+++ b/Makefile.local
@@ -1,54 +1,29 @@
 # -*- makefile -*-
 
-# Here's the (hopefully simple) versioning scheme.
-#
-# Releases of fips have a two-digit version (0.1, 0.2, etc.). We
-# increment the second digit for each release and increment the first
-# digit when we reach particularly major milestones of usability.
-#
-# Between releases, (such as when compiling fips from the git
-# repository), we let git append identification of the actual commit.
-PACKAGE=fips
-
-IS_GIT=$(shell if [ -d .git ] ; then echo yes ; else echo no; fi)
-
-ifeq ($(IS_GIT),yes)
-DATE:=$(shell git log --date=short -1 --pretty=format:%cd)
-else
-DATE:=$(shell date +%F)
-endif
+include Makefile.release
 
-VERSION:=$(shell cat ${srcdir}/version)
-ifeq ($(filter release release-message pre-release, $(MAKECMDGOALS)),)
-ifeq ($(IS_GIT),yes)
-VERSION:=$(shell git describe --match '[0-9.]*' 2>/dev/null | sed -e s/_/~/ -e s/-/+/ -e s/-/~/)
-endif
-endif
-
-UPSTREAM_TAG=$(subst ~,_,$(VERSION))
-DEB_TAG=debian/$(UPSTREAM_TAG)-1
+# Smash together user's values with our extra values
+FINAL_FIPS_CFLAGS = -DFIPS_VERSION=$(VERSION) $(CFLAGS) $(FIPS_CFLAGS) $(extra_cflags)
+FINAL_FIPS_LDFLAGS = $(LDFLAGS) $(AS_NEEDED_LDFLAGS) $(FIPS_LDFLAGS)
 
-RELEASE_HOST=cworth.org
-RELEASE_DIR=/home/cworth/public_html/fips/releases
-RELEASE_URL=http://cworth.org/fips/releases
-TAR_FILE=$(PACKAGE)-$(VERSION).tar.gz
-DEB_TAR_FILE=$(PACKAGE)_$(VERSION).orig.tar.gz
-SHA1_FILE=$(TAR_FILE).sha1
-GPG_FILE=$(SHA1_FILE).asc
+FINAL_LIBFIPS_CFLAGS = $(CFLAGS) $(LIBFIPS_CFLAGS) $(extra_cflags)
+FINAL_LIBFIPS_LDFLAGS = $(LDFLAGS) $(LIBFIPS_LDFLAGS) -ldl
 
-# Smash together user's values with our extra values
-FINAL_CFLAGS = -DFIPS_VERSION=$(VERSION) $(CFLAGS) $(WARN_CFLAGS) $(CONFIGURE_CFLAGS) $(extra_cflags)
-FINAL_FIPS_LDFLAGS = $(LDFLAGS) $(AS_NEEDED_LDFLAGS) $(TALLOC_LDFLAGS)
 FINAL_FIPS_LINKER = CC
-ifneq ($(LINKER_RESOLVES_LIBRARY_DEPENDENCIES),1)
-FINAL_FIPS_LDFLAGS += $(CONFIGURE_LDFLAGS)
+
+ALL_TARGETS = fips
+
+ifeq ($(COMPILER_SUPPORTS_32),Yes)
+ALL_TARGETS += libfips-32.so
 endif
-ifeq ($(LIBDIR_IN_LDCONFIG),0)
-FINAL_FIPS_LDFLAGS += $(RPATH_LDFLAGS)
+
+ifeq ($(COMPILER_SUPPORTS_64),Yes)
+ALL_TARGETS += libfips-64.so
 endif
 
 .PHONY: all
-all: fips
+all: $(ALL_TARGETS)
+
 ifeq ($(MAKECMDGOALS),)
 ifeq ($(shell cat .first-build-message 2>/dev/null),)
 	@FIPS_FIRST_BUILD=1 $(MAKE) --no-print-directory all
@@ -64,149 +39,10 @@ ifeq ($(shell cat .first-build-message 2>/dev/null),)
 endif
 endif
 
-$(TAR_FILE):
-	if git tag -v $(VERSION) >/dev/null 2>&1; then \
-           ref=$(VERSION); \
-        else \
-           ref="HEAD" ; \
-	   echo "Warning: No signed tag for $(VERSION)"; \
-	fi ; \
-	git archive --format=tar --prefix=$(PACKAGE)-$(VERSION)/ $$ref > $(TAR_FILE).tmp
-	echo $(VERSION) > version.tmp
-	tar --append -f $(TAR_FILE).tmp --transform s_^_$(PACKAGE)-$(VERSION)/_  --transform 's_.tmp$$__' version.tmp
-	rm version.tmp
-	gzip < $(TAR_FILE).tmp > $(TAR_FILE)
-	@echo "Source is ready for release in $(TAR_FILE)"
-
-$(SHA1_FILE): $(TAR_FILE)
-	sha1sum $^ > $@
-
-$(GPG_FILE): $(SHA1_FILE)
-	@echo "Please enter your GPG password to sign the checksum."
-	gpg --armor --sign $^ 
-
-.PHONY: dist
-dist: $(TAR_FILE)
-
 .PHONY: test
 test:
 	@echo "FIXME: Should consider adding a test suite here."
 
-# We invoke make recursively only to force ordering of our phony
-# targets in the case of parallel invocation of make (-j).
-#
-# We carefully ensure that our VERSION variable is passed down to any
-# sub-ordinate make invocations (which won't otherwise know that they
-# are part of the release and need to take the version from the
-# version file).
-.PHONY: release
-release: verify-source-tree-and-version
-	$(MAKE) VERSION=$(VERSION) verify-newer
-	$(MAKE) VERSION=$(VERSION) clean
-	$(MAKE) VERSION=$(VERSION) test
-	git tag -s -m "$(PACKAGE) $(VERSION) release" $(UPSTREAM_TAG)
-	$(MAKE) VERSION=$(VERSION) $(GPG_FILE)
-	ln -sf $(TAR_FILE) $(DEB_TAR_FILE)
-	pristine-tar commit $(DEB_TAR_FILE) $(UPSTREAM_TAG)
-	git tag -s -m "$(PACKAGE) Debian $(VERSION)-1 upload (same as $(VERSION))" $(DEB_TAG)
-	mkdir -p releases
-	mv $(TAR_FILE) $(SHA1_FILE) $(GPG_FILE) releases
-	$(MAKE) VERSION=$(VERSION) release-message > $(PACKAGE)-$(VERSION).announce
-ifeq ($(REALLY_UPLOAD),yes)
-	git push origin $(VERSION)
-	cd releases && scp $(TAR_FILE) $(SHA1_FILE) $(GPG_FILE) $(RELEASE_HOST):$(RELEASE_DIR)
-	ssh $(RELEASE_HOST) "rm -f $(RELEASE_DIR)/LATEST-$(PACKAGE)-* ; ln -s $(TAR_FILE) $(RELEASE_DIR)/LATEST-$(TAR_FILE)"
-endif
-	@echo "Please send a release announcement using $(PACKAGE)-$(VERSION).announce as a template."
-
-.PHONY: pre-release
-pre-release:
-	$(MAKE) VERSION=$(VERSION) clean
-	$(MAKE) VERSION=$(VERSION) test
-	git tag -s -m "$(PACKAGE) $(VERSION) release" $(UPSTREAM_TAG)
-	git tag -s -m "$(PACKAGE) Debian $(VERSION)-1 upload (same as $(VERSION))" $(DEB_TAG)
-	$(MAKE) VERSION=$(VERSION) $(TAR_FILE)
-	ln -sf $(TAR_FILE) $(DEB_TAR_FILE)
-	pristine-tar commit $(DEB_TAR_FILE) $(UPSTREAM_TAG)
-	mkdir -p releases
-	mv $(TAR_FILE) $(DEB_TAR_FILE) releases
-
-.PHONY: debian-snapshot
-debian-snapshot:
-	make VERSION=$(VERSION) clean
-	TMPFILE=$$(mktemp /tmp/fips.XXXXXX);		\
-	  cp debian/changelog $${TMPFILE};		\
-	  EDITOR=/bin/true dch -b -v $(VERSION)+1	\
-	    -D UNRELEASED 'test build, not for upload';	\
-	  echo '3.0 (native)' > debian/source/format; 	\
-	  debuild -us -uc;				\
-	  mv -f $${TMPFILE} debian/changelog;		\
-	  echo '3.0 (quilt)' > debian/source/format
-
-.PHONY: release-message
-release-message:
-	@echo "To: XXX"
-	@echo "Subject: $(PACKAGE) release $(VERSION) now available"
-	@echo ""
-	@echo "Where to obtain fips $(VERSION)"
-	@echo "==========================="
-	@echo "  $(RELEASE_URL)/$(TAR_FILE)"
-	@echo ""
-	@echo "Which can be verified with:"
-	@echo ""
-	@echo "  $(RELEASE_URL)/$(SHA1_FILE)"
-	@echo -n "  "
-	@cat releases/$(SHA1_FILE)
-	@echo ""
-	@echo "  $(RELEASE_URL)/$(GPG_FILE)"
-	@echo "  (signed by `getent passwd "$$USER" | cut -d: -f 5 | cut -d, -f 1`)"
-	@echo ""
-	@echo "What's new in fips $(VERSION)"
-	@echo "========================="
-	@sed -ne '/^[Ff]ips $(VERSION)/{n;n;b NEWS}; d; :NEWS /^===/q; {p;n;b NEWS}' < NEWS | head -n -2
-	@echo ""
-	@echo "What is fips"
-	@echo "============"
-	@echo "Fips is a program for monitoring performance of OpenGL applications"
-
-# This is a chain of dependencies rather than a simple list simply to
-# avoid the messages getting interleaved in the case of a parallel
-# make invocation.
-.PHONY: verify-source-tree-and-version
-verify-source-tree-and-version: verify-no-dirty-code
-
-.PHONY: verify-no-dirty-code
-verify-no-dirty-code:
-ifeq ($(IS_GIT),yes)
-	@printf "Checking that source tree is clean..."
-ifneq ($(shell git ls-files -m),)
-	@echo "No"
-	@echo "The following files have been modified since the most recent git commit:"
-	@echo ""
-	@git ls-files -m
-	@echo ""
-	@echo "The release will be made from the committed state, but perhaps you meant"
-	@echo "to commit this code first? Please clean this up to make it more clear."
-	@false
-else
-	@echo "Good"
-endif
-endif
-
-.PHONY: verify-newer
-verify-newer:
-	@echo -n "Checking that no $(VERSION) release already exists..."
-	@wget -q -O /dev/null $(RELEASE_URL)/$(TAR_FILE) ; \
-	case $$? in \
-          8) echo "Good." ;; \
-          0) echo "Ouch."; \
-	     echo "Found: $(RELEASE_URL)/$(TAR_FILE)"; \
-	     echo "Refusing to replace an existing release."; \
-	     echo "Don't forget to update \"version\" as described in RELEASING before release." ; \
-	     false ;; \
-	  *) echo "An unexpected error occured"; \
-	     false;; esac
-
 # The user has not set any verbosity, default to quiet mode and inform the
 # user how to enable verbose compiles.
 ifeq ($(V),)
@@ -220,9 +56,17 @@ endif
 # Otherwise, print the full command line.
 quiet ?= $($(shell echo $1 | sed -e s'/ .*//'))
 
+%-32.o: %.c $(global_deps)
+	@mkdir -p .deps/$(@D)
+	$(call quiet,CC $(CFLAGS) -m32) -c $(FINAL_LIBFIPS_CFLAGS) -m32 $< -o $@ -MD -MP -MF .deps/$*.d
+
+%-64.o: %.c $(global_deps)
+	@mkdir -p .deps/$(@D)
+	$(call quiet,CC $(CFLAGS) -m64) -c $(FINAL_LIBFIPS_CFLAGS) -m64 $< -o $@ -MD -MP -MF .deps/$*.d
+
 %.o: %.c $(global_deps)
 	@mkdir -p .deps/$(@D)
-	$(call quiet,CC $(CFLAGS)) -c $(FINAL_CFLAGS) $< -o $@ -MD -MP -MF .deps/$*.d
+	$(call quiet,CC $(CFLAGS)) -c $(FINAL_FIPS_CFLAGS) $< -o $@ -MD -MP -MF .deps/$*.d
 
 .PHONY : clean
 clean:
@@ -232,29 +76,66 @@ clean:
 distclean: clean
 	rm -rf $(DISTCLEAN)
 
+# Main program, fips
+
 fips_srcs = \
+	execute.c \
 	fips.c
 
 fips_modules = $(fips_srcs:.c=.o)
 
 fips: $(fips_modules)
-	$(call quiet,$(FINAL_FIPS_LINKER) $(CFLAGS)) $^ $(FINAL_FIPS_LDFLAGS) -o $@
+	$(call quiet,$(FINAL_FIPS_LINKER) $(CFLAGS)) $(FINAL_FIPS_CFLAGS) $^ $(FINAL_FIPS_LDFLAGS) -o $@
+
+# GL-wrapper library, libfips
+LIBRARY_LINK_FLAGS = -shared -Wl,--version-script=libfips.sym
+
+extra_cflags += -I$(srcdir) -fPIC
+
+libfips_srcs = \
+	dlwrap.c \
+	fips-dispatch.c \
+	fips-dispatch-gl.c \
+	glwrap.c \
+	glxwrap.c \
+	metrics.c
+
+ifeq ($(HAVE_EGL),Yes)
+libfips_srcs += eglwrap.c
+endif
+
+libfips.sym: extract-wrapped-symbols $(libfips_srcs)
+	$(call quiet,extract-wrapped-symbols) ./extract-wrapped-symbols $(libfips_srcs) > $@
+
+libfips_32_modules = $(libfips_srcs:.c=-32.o)
+
+libfips_64_modules = $(libfips_srcs:.c=-64.o)
+
+libfips-32.so: $(libfips_32_modules) libfips.sym
+	$(call quiet,$(FINAL_FIPS_LINKER) $(CFLAGS) -m32) -o $@ $(FINAL_LIBFIPS_CFLAGS) -m32 $(libfips_32_modules)  $(LIBRARY_LINK_FLAGS) $(FINAL_LIBFIPS_LDFLAGS)
+
+libfips-64.so: $(libfips_64_modules) libfips.sym
+	$(call quiet,$(FINAL_FIPS_LINKER) $(CFLAGS) -m64) -o $@ $(FINAL_LIBFIPS_CFLAGS) -m64 $(libfips_64_modules) $(LIBRARY_LINK_FLAGS) $(FINAL_LIBFIPS_LDFLAGS)
 
 .PHONY: install
 install: all
-	mkdir -p $(DESTDIR)$(prefix)/bin/
-	install fips $(DESTDIR)$(prefix)/bin/fips
+	mkdir -p $(DESTDIR)$(bindir)
+	install fips $(DESTDIR)$(bindir)/fips
+	mkdir -p $(DESTDIR)$(libdir)/fips
+	install -m0644 libfips-32.so $(DESTDIR)$(libdir)/fips/libfips-32.so
+	install -m0644 libfips-64.so $(DESTDIR)$(libdir)/fips/libfips-64.so
 ifeq ($(MAKECMDGOALS), install)
 	@echo ""
 	@echo "Fips is now installed to $(DESTDIR)$(prefix)"
 	@echo ""
 endif
 
-SRCS  := $(SRCS) $(fips_srcs)
-CLEAN := $(CLEAN) fips $(fips_modules)
+SRCS  := $(SRCS) $(fips_srcs) $(libfips_srcs)
+CLEAN := $(CLEAN) fips $(fips_modules) $(libfips_32_modules) $(libfips_64_modules) libfips.sym
 
 DISTCLEAN := $(DISTCLEAN) .first-build-message Makefile.config
 
 DEPS := $(SRCS:%.c=.deps/%.d)
 DEPS := $(DEPS:%.cc=.deps/%.d)
+
 -include $(DEPS)