--- rpl/Makefile.am	2012/01/18 10:57:40	1.43
+++ rpl/Makefile.am	2012/05/29 13:34:17	1.49
@@ -4,7 +4,7 @@ SUBDIRS = tools rplsums rpliconv rplawk
 include_HEADERS = rplconfig.h
 
 EXTRA_DIST = LIMITATIONS Licence_CeCILL_V2-fr.txt Licence_CeCILL_V2-en.txt \
-		COPYING.in lapack/COPYING lapack/RELEASE \
+		COPYING.in lapack/COPYING lapack/RELEASE autogen.sh \
 		tests/tests.tar.gz vim/indent/rpl.vim vim/ftplugin/rpl.vim \
 		vim/syntax/rpl.vim examples/obele.rpl examples/appel.tar.gz \
 		examples/external.tar.gz DEBIAN/control.in \
@@ -146,7 +146,7 @@ $(top_builddir)/tools/@FILE@/src/rplfile
 		{ \
 			if (index($$0, "-static") == 0) \
 			{ \
-				printf("%s -static\n", $$0); \
+				printf("%s -static @ABI@\n", $$0); \
 			} \
 			else \
 			{ \
@@ -155,13 +155,20 @@ $(top_builddir)/tools/@FILE@/src/rplfile
 		} \
 		else \
 		{ \
-			print; \
+			if (index($$0, "CFLAGS") == 1) \
+			{ \
+				printf("CFLAGS = -O2 -g @ABI@\n"); \
+			} \
+			else \
+			{ \
+				print; \
+			} \
 		} \
 	}' tools/@FILE@/src/Makefile > $$TMP; \
 	mv -f $$TMP tools/@FILE@/src/Makefile
 	$(MAKE) -C $(top_builddir)/tools/@FILE@ $(AM_MAKEFLAGS)
 	$(CC) -o $(top_builddir)/tools/@FILE@/src/rplfile$(EXEEXT) \
-			$(top_builddir)/tools/@FILE@/src/*.o \
+			@CFLAGS@ $(top_builddir)/tools/@FILE@/src/*.o \
 			$(shell grep '^LIBS =' $(top_builddir)/tools/@FILE@/Makefile | \
 			cut -d= -f2) $(LDFLAGS)
 
@@ -170,18 +177,25 @@ $(top_builddir)/tools/@SQLITE@/.libs/@LI
 
 $(top_builddir)/tools/@OPENSSL@/@LIB_PREFIX@crypto.a \
 		$(top_builddir)/tools/@OPENSSL@/@LIB_PREFIX@ssl.a:
-	if [ @OS@ = "OS2" ]; then \
-		(cd $(top_builddir)/tools/@OPENSSL@ && \
-				sed -e '1,$$s/-m486/-mtune=i586 -DOPENSSL_USE_IPV6=0/g' \
-				OS2-EMX.mak | \
-				sed -e '1,$$s/-DBN_ASM/-UBN_ASM/g' | \
-				sed -e '1,$$s/-DMD5_ASM/-UMD5_ASM/g' | \
-				sed -e '1,$$s/-DSHA1_ASM/-USHA1_ASM/g' | \
-				sed -e '1,$$s/-DOPENSSL_BN_ASM_PART_WORDS/-UOPENSSL_BN_ASM_PART_ASM/g' \
-				> OS2-EMX.mak2; \
-				$(MAKE) -j1 -f OS2-EMX.mak2 $(AM_MAKEFLAGS)); \
-	else \
-		(cd $(top_builddir)/tools/@OPENSSL@ && $(MAKE) -j1 $(AM_MAKEFLAGS)); \
+	if [ ! -f $(top_builddir)/tools/@OPENSSL@/@LIB_PREFIX@crypto.a \
+			-o ! -f $(top_builddir)/tools/@OPENSSL@/@LIB_PREFIX@ssl.a \
+			-o ! -f $(top_builddir)/tools/@OPENSSL@/tests_success ]; then \
+		if [ @OS@ = "OS2" ]; then \
+			(cd $(top_builddir)/tools/@OPENSSL@ && \
+					sed -e '1,$$s/-m486/-mtune=i586 -DOPENSSL_USE_IPV6=0/g' \
+					OS2-EMX.mak | \
+					sed -e '1,$$s/-DBN_ASM/-UBN_ASM/g' | \
+					sed -e '1,$$s/-DMD5_ASM/-UMD5_ASM/g' | \
+					sed -e '1,$$s/-DSHA1_ASM/-USHA1_ASM/g' | \
+					sed -e '1,$$s/-DOPENSSL_BN_ASM_PART_WORDS/-UOPENSSL_BN_ASM_PART_ASM/g' \
+					> OS2-EMX.mak2; \
+					$(MAKE) -j1 -f OS2-EMX.mak2 $(AM_MAKEFLAGS); \
+					touch tests_success); \
+		else \
+			(cd $(top_builddir)/tools/@OPENSSL@ && \
+					$(MAKE) -j1 $(AM_MAKEFLAGS); \
+					touch tests_success); \
+		fi \
 	fi
 
 $(top_builddir)/rplsums/rplmd5sum$(EXEEXT) \
@@ -193,6 +207,12 @@ $(top_builddir)/tools/@GPP@/src/gpp$(EXE
 	$(MAKE) -C $(top_builddir)/tools/@GPP@ $(AM_MAKEFLAGS)
 
 $(top_builddir)/tools/@UNITS@/units$(EXEEXT):
+	if [ $$subdir = @UNITS@ -a @OS@ = OpenBSD ]; then \
+		TMP=tmp.units; \
+		sed -e 's/^DEFS = -DUNITSFILE/DEFS = -Dmalloc=malloc -DUNITSFILE/g' \
+				@UNITS@/Makefile > $$TMP; \
+		mv -f $$TMP @UNITS@/Makefile; \
+	fi; \
 	$(MAKE) -C $(top_builddir)/tools/@UNITS@ $(AM_MAKEFLAGS)
 
 .NOTPARALLEL: $(top_builddir)/tools/@FILE@/src/rplfile$(EXEEXT) \
@@ -248,46 +268,81 @@ all: $(top_builddir)/tools/@NCURSES@/lib
 	$(MAKE) -C $(top_builddir)/rpltags $(AM_MAKEFLAGS)
 	$(MAKE) -C $(top_builddir)/src $(AM_MAKEFLAGS)
 
-debian: install
+debian: all
 	$(MKDIR_P) $(top_builddir)/debian/$(prefix)/bin
-	for i in rpl$(EXEEXT) rplcc rplfile$(EXEEXT) rpllink rpltags$(EXEEXT) \
-			mkrplso rplawk$(EXEEXT) rplconvert$(EXEEXT) rpliconv$(EXEEXT) \
-		 	rplpp$(EXEEXT); \
-	do cp -f $(prefix)/bin/$$i $(top_builddir)/debian/$(prefix)/bin; \
+	for i in $(top_builddir)/src/rpl$(EXEEXT) $(top_builddir)/scripts/rplcc \
+			$(top_builddir)/scripts/rpllink $(top_builddir)/scripts/mkrplso \
+			$(top_builddir)/tools/@FILE@/src/rplfile$(EXEEXT) \
+			$(top_builddir)/rpltags/rpltags$(EXEEXT) \
+			$(top_builddir)/rplawk/rplawk$(EXEEXT) \
+			$(top_builddir)/rpliconv/rpliconv$(EXEEXT); \
+	do cp -f $$i $(top_builddir)/debian/$(prefix)/bin; \
 	done
+	cp $(top_builddir)/tools/@UNITS@/units$(EXEEXT) \
+			$(top_builddir)/debian/$(prefix)/bin/rplconvert$(EXEEXT)
+	cp $(top_builddir)/tools/@GPP@/src/gpp$(EXEEXT) \
+			$(top_builddir)/debian/$(prefix)/bin/rplpp$(EXEEXT)
 	$(MKDIR_P) $(top_builddir)/debian/$(prefix)/include
-	for i in librpl.h rplconfig.h rpl.h rpltypes.h librplprototypes.h \
-			rplexternals.h rpl.inc; \
-	do cp -f $(prefix)/include/$$i $(top_builddir)/debian/$(prefix)/include; \
+	for i in $(srcdir)/src/librpl.h $(top_builddir)/rplconfig.h \
+		$(srcdir)/src/rpl.h $(srcdir)/src/rpltypes.h \
+			$(top_builddir)/src/librplprototypes.h \
+			$(srcdir)/src/rplexternals.h $(top_builddir)/src/rpl.inc; \
+	do cp -f $$i $(top_builddir)/debian/$(prefix)/include; \
 	done
 	$(MKDIR_P) $(top_builddir)/debian/$(prefix)/lib
-	cp -f $(prefix)/lib/librpl.a $(top_builddir)/debian/$(prefix)/lib
+	cp -f $(top_builddir)/src/librpl.a $(top_builddir)/debian/$(prefix)/lib
 	for j in man/man1 man/fr_FR/man1; \
 	do \
 		$(MKDIR_P) $(top_builddir)/debian/$(prefix)/$$j; \
-		for i in gpp.1 mkrplso.1 rpl.1 rplcc.1 rpllink.1 rplpp.1 rpltags.1; \
+		for i in $(top_builddir)/$$j/gpp.1 $(top_builddir)/$$j/mkrplso.1 \
+				$(top_builddir)/$$j/rpl.1 $(top_builddir)/$$j/rplcc.1 \
+				$(top_builddir)/$$j/rpllink.1 $(top_builddir)/$$j/rplpp.1 \
+				$(top_builddir)/$$j/rpltags.1; \
 		do \
-			if [ -f $(prefix)/$$j/$$i ]; then \
-				cp -f $(prefix)/$$j/$$i $(top_builddir)/debian/$(prefix)/$$j; \
+			if [ -f $$i ]; then \
+				cp -f $$i $(top_builddir)/debian/$(prefix)/$$j; \
 			fi; \
 		done; \
 	done
 	$(MKDIR_P) $(top_builddir)/debian/$(prefix)/share
-	for i in rplfiles.mgc rplunits; \
-	do cp -f $(prefix)/share/$$i $(top_builddir)/debian/$(prefix)/share; \
-	done
-	if [ -e $(prefix)/bin/gnuplot$(EXEEXT) ]; then \
-		$(MKDIR_P) $(top_builddir)/debian/$(prefix)/share/gnuplot; \
-		cp -fR $(prefix)/share/gnuplot/* \
-				$(top_builddir)/debian/$(prefix)/share/gnuplot; \
-		$(MKDIR_P) $(top_builddir)/debian/$(prefix)/libexec/gnuplot; \
-		cp -fR $(prefix)/share/gnuplot/* \
-				$(top_builddir)/debian/$(prefix)/libexec/gnuplot; \
-		cp -f $(prefix)/bin/gnuplot$(EXEEXT) \
-				$(top_builddir)/debian/$(prefix)/bin; \
-		cp -f $(prefix)/man/man1/gnuplot.1 \
-				$(top_builddir)/debian/$(prefix)/man/man1; \
-	fi;
+	cp -f $(top_builddir)/tools/@FILE@/magic/magic.mgc \
+			$(top_builddir)/debian/$(prefix)/share
+	cp -f $(srcdir)/tools/@UNITS@/units.dat \
+			$(top_builddir)/debian/$(prefix)/share
+	if [ -e $(top_builddir)/tools/@GNUPLOT@/src/gnuplot$(EXEEXT) ]; then \
+		if [ -e $(prefix)/bin/gnuplot$(EXEEXT) ]; then \
+			mv -f $(prefix)/bin/gnuplot$(EXEEXT) \
+					$(prefix)/bin/gnuplot$(EXEEXT).orig; \
+			mv -f $(prefix)/share/gnuplot $(prefix)/share/gnuplot.orig; \
+			mv -f $(prefix)/libexec/gnuplot $(prefix)/libexec/gnuplot.orig; \
+			(cd $(top_builddir)/tools/@GNUPLOT@ && $(MAKE) install); \
+			cp -f $(prefix)/bin/gnuplot$(EXEEXT) \
+					$(top_builddir)/debian/$(prefix)/bin; \
+			cp -af $(prefix)/share/gnuplot \
+					$(top_builddir)/debian/$(prefix)/share; \
+			$(MKDIR_P) $(top_builddir)/debian/$(prefix)/libexec; \
+			cp -af $(prefix)/libexec/gnuplot \
+					$(top_builddir)/debian/$(prefix)/libexec; \
+			(cd $(top_builddir)/tools/@GNUPLOT@ && $(MAKE) uninstall); \
+			rm -f $(prefix)/bin/gnuplot$(EXEEXT); \
+			rm -rf $(prefix)/share/gnuplot; \
+			rm -rf $(prefix)/libexec/gnuplot; \
+			mv $(prefix)/bin/gnuplot$(EXEEXT).orig \
+					$(prefix)/bin/gnuplot$(EXEEXT); \
+			mv -f $(prefix)/share/gnuplot.orig $(prefix)/share/gnuplot; \
+			mv -f $(prefix)/libexec/gnuplot.orig $(prefix)/libexec/gnuplot; \
+		else \
+			(cd $(top_builddir)/tools/@GNUPLOT@ && $(MAKE) install); \
+			cp -f $(prefix)/bin/gnuplot$(EXEEXT) \
+					$(top_builddir)/debian/$(prefix)/bin; \
+			cp -af $(prefix)/share/gnuplot \
+					$(top_builddir)/debian/$(prefix)/share; \
+			$(MKDIR_P) $(top_builddir)/debian/$(prefix)/libexec; \
+			cp -af $(prefix)/libexec/gnuplot \
+					$(top_builddir)/debian/$(prefix)/libexec; \
+			(cd $(top_builddir)/tools/@GNUPLOT@ && $(MAKE) uninstall); \
+		fi; \
+	fi
 	$(MKDIR_P) $(top_builddir)/debian/DEBIAN
 	cp -f $(top_builddir)/DEBIAN/* $(top_builddir)/debian/DEBIAN
 	(cd  $(top_builddir) && dpkg-deb --build debian debian)