[Pkg-ace-commits] [pkg-ace] r595 - trunk/debian

[tgg at alioth.debian.org]

Author: tgg
Date: 2008-04-20 07:44:31 +0000 (Sun, 20 Apr 2008)
New Revision: 595

Modified:
   trunk/debian/libace-dev.install
   trunk/debian/libtao-dev.install
   trunk/debian/rules
Log:
add missing rules.*.GNU, remove doxygen files


Modified: trunk/debian/libace-dev.install
===================================================================
--- trunk/debian/libace-dev.install	2008-04-19 20:15:17 UTC (rev 594)
+++ trunk/debian/libace-dev.install	2008-04-20 07:44:31 UTC (rev 595)
@@ -3,3 +3,4 @@
 usr/lib/libACE.so
 usr/lib/pkgconfig/ACE.pc
 usr/share/ace/MPC/config
+usr/share/ace/include

Modified: trunk/debian/libtao-dev.install
===================================================================
--- trunk/debian/libtao-dev.install	2008-04-19 20:15:17 UTC (rev 594)
+++ trunk/debian/libtao-dev.install	2008-04-20 07:44:31 UTC (rev 595)
@@ -94,3 +94,4 @@
 usr/include/tao/DiffServPolicy
 usr/lib/libTAO_ZlibCompressor.so
 usr/lib/pkgconfig/TAO_ZlibCompressor.pc
+usr/share/ace/TAO/rules.tao.GNU

Modified: trunk/debian/rules
===================================================================
--- trunk/debian/rules	2008-04-19 20:15:17 UTC (rev 594)
+++ trunk/debian/rules	2008-04-20 07:44:31 UTC (rev 595)
@@ -38,6 +38,13 @@
 	debian/mpc-ace.1
 MAN5 :=
 
+DOXYGEN_FILES_TO_REMOVE := -name '*.tag' -o \
+                           -name '*.md5' -o \
+                           -name '*.dot' -o \
+                           -name '*.idx' -o \
+                           -name '*.map' -o \
+                           -name 'index.hh?'
+
 ifneq (mpc-archive-missing,$(MPC_ARCHIVE))
 export MPC_ROOT := $(shell pwd)/$(MPC_SUBDIR)
 endif
@@ -125,8 +132,8 @@
 
 doxygen-stamp: extract-stamp
 	cd $(ACE_ROOT) && bin/generate_doxygen.pl -is_release
-	find $(ACE_ROOT)/html/ace -name '*.tag' -o -name '*.md5' -o -name '*.dot' -o -name '*.idx' | xargs -r rm -f
-	find $(ACE_ROOT)/html/tao -name '*.tag' -o -name '*.md5' -o -name '*.dot' -o -name '*.idx' | xargs -r rm -f
+	find $(ACE_ROOT)/html/ace $(DOXYGEN_FILES_TO_REMOVE) | xargs -r rm -f
+	find $(ACE_ROOT)/html/tao $(DOXYGEN_FILES_TO_REMOVE) | xargs -r rm -f
 	touch $@
 
 .PHONY: doxygen
@@ -152,7 +159,12 @@
 	dh_installdirs
 
 	$(MAKE) -C objdir install DESTDIR=$(CURDIR)/$(DT)
+	mkdir -p $(DT)/usr/share/ace/include/makeinclude
+	cp -a $(ACE_ROOT)/include $(DT)/usr/share/ace
+	cp objdir/include/makeinclude/platform_macros.GNU $(DT)/usr/share/ace/include/makeinclude
 	$(MAKE) -C objdir/TAO install DESTDIR=$(CURDIR)/$(DT)
+	mkdir -p $(DT)/usr/share/ace/TAO
+	cp $(TAO_ROOT)/rules.tao.GNU $(DT)/usr/share/ace/TAO
 
 #       Rename gperf to gperf-ace
 	mv $(DT)/usr/bin/gperf $(DT)/usr/bin/gperf-ace