diff options
-rw-r--r-- | TAO/ChangeLog | 16 | ||||
-rw-r--r-- | TAO/tao/ImR_Client.mpc | 4 | ||||
-rw-r--r-- | TAO/tao/ImR_Client/TAO_ImR_Client.pc.in | 11 | ||||
-rw-r--r-- | TAO/tao/Makefile.am | 8 |
4 files changed, 37 insertions, 2 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 1beb87eccc2..add536759f3 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,8 +1,22 @@ +Tue Apr 19 11:10:22 2005 J.T. Conklin <jtc@acorntoolworks.com> + + * tao/Makefile.am: + + Regenerated. + + * tao/ImR_Client.Added: + + Added Pkgconfig_Files definition. + + * tao/ImR_Client/TAO_ImR_Client.pc.in: + + New file, pkg-config *.pc template for TAO_ImR_Client library. + Tue Apr 19 15:17:12 UTC 2005 Justin Michel <michel_j@ociweb.com> * orbsvcs/ImplRepo_Service/ImR_Activator_i.cpp: * orbsvcs/ImplRepo_Service/ImR_Activator_i.h: - + Fix incorrect exception specifications. Tue Apr 19 11:10:12 UTC 2005 Johnny Willemsen <jwillemsen@remedy.nl> diff --git a/TAO/tao/ImR_Client.mpc b/TAO/tao/ImR_Client.mpc index ecd9fd48dbf..b7906ed913d 100644 --- a/TAO/tao/ImR_Client.mpc +++ b/TAO/tao/ImR_Client.mpc @@ -26,4 +26,8 @@ project : taolib, core, portableserver { PIDL_Files { ImR_Client } + + Pkgconfig_Files { + ImR_Client/TAO_ImR_Client.pc.in + } } diff --git a/TAO/tao/ImR_Client/TAO_ImR_Client.pc.in b/TAO/tao/ImR_Client/TAO_ImR_Client.pc.in new file mode 100644 index 00000000000..700ed7136ad --- /dev/null +++ b/TAO/tao/ImR_Client/TAO_ImR_Client.pc.in @@ -0,0 +1,11 @@ +prefix=@prefix@ +exec_prefix=@exec_prefix@ +libdir=@libdir@ +includedir=@includedir@ + +Name: TAO_ImR_Client +Description: TAO Implementation Repository Client Library +Requires: TAO +Version: @VERSION@ +Libs: -L${libdir} -lTAO_ImR_Client +Cflags: -I${includedir} diff --git a/TAO/tao/Makefile.am b/TAO/tao/Makefile.am index c28e70511bd..55d37c69baf 100644 --- a/TAO/tao/Makefile.am +++ b/TAO/tao/Makefile.am @@ -1934,8 +1934,14 @@ nobase_include_HEADERS += \ ImR_Client/ServerObject_i.h \ ImR_Client/imr_client_export.h +pkgconfig_DATA += TAO_ImR_Client.pc + +TAO_ImR_Client.pc: ${top_builddir}/config.status ${srcdir}/ImR_Client/TAO_ImR_Client.pc.in + ${top_builddir}/config.status --file $@:${srcdir}/ImR_Client/TAO_ImR_Client.pc.in + EXTRA_DIST += \ - ImR_Client/TAO_IMR_Client.rc + ImR_Client/TAO_IMR_Client.rc \ + ImR_Client/TAO_ImR_Client.pc.in ## Makefile.RTCORBA.am |