diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2008-10-14 16:23:46 +0200 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2008-10-14 16:23:46 +0200 |
| commit | d940012dc8db9104c929f588f1d28ba18cbbd420 (patch) | |
| tree | 4f76feb89579fdcf905a090ce9f55e16881a1129 /source4 | |
| parent | 42f0172fe2d3010a346e99f4dc16b1396fdd931c (diff) | |
| download | samba-d940012dc8db9104c929f588f1d28ba18cbbd420.tar.gz samba-d940012dc8db9104c929f588f1d28ba18cbbd420.tar.bz2 samba-d940012dc8db9104c929f588f1d28ba18cbbd420.zip | |
Move ndr pkg-config file to top-level.
Diffstat (limited to 'source4')
| -rw-r--r-- | source4/configure.ac | 2 | ||||
| -rw-r--r-- | source4/librpc/config.mk | 2 | ||||
| -rw-r--r-- | source4/librpc/ndr.pc.in | 11 |
3 files changed, 2 insertions, 13 deletions
diff --git a/source4/configure.ac b/source4/configure.ac index 62f9dc43a0..97b1174a0f 100644 --- a/source4/configure.ac +++ b/source4/configure.ac @@ -31,7 +31,7 @@ m4_include(../pidl/config.m4) AC_CONFIG_FILES(lib/registry/registry.pc) AC_CONFIG_FILES(lib/events/events.pc) AC_CONFIG_FILES(librpc/dcerpc.pc) -AC_CONFIG_FILES(librpc/ndr.pc) +AC_CONFIG_FILES(../librpc/ndr.pc) AC_CONFIG_FILES(lib/torture/torture.pc) AC_CONFIG_FILES(auth/gensec/gensec.pc) AC_CONFIG_FILES(param/samba-hostconfig.pc) diff --git a/source4/librpc/config.mk b/source4/librpc/config.mk index 9f1d5df96f..44e05dff35 100644 --- a/source4/librpc/config.mk +++ b/source4/librpc/config.mk @@ -12,7 +12,7 @@ LIBNDR_OBJ_FILES = $(addprefix $(ndrsrcdir)/, ndr_string.o) ../librpc/ndr/ndr_ba $(eval $(call proto_header_template,$(ndrsrcdir)/libndr_proto.h,$(LIBNDR_OBJ_FILES:.o=.c))) -PC_FILES += $(librpcsrcdir)/ndr.pc +PC_FILES += ../librpc/ndr.pc LIBNDR_VERSION = 0.0.1 LIBNDR_SOVERSION = 0 diff --git a/source4/librpc/ndr.pc.in b/source4/librpc/ndr.pc.in deleted file mode 100644 index 2f4d95006f..0000000000 --- a/source4/librpc/ndr.pc.in +++ /dev/null @@ -1,11 +0,0 @@ -prefix=@prefix@ -exec_prefix=@exec_prefix@ -libdir=@libdir@ -includedir=@includedir@ - -Name: ndr -Description: Network Data Representation Core Library -Requires: samba-hostconfig talloc -Version: 0.0.1 -Libs: -L${libdir} -lndr -Cflags: -I${includedir} -DHAVE_IMMEDIATE_STRUCTURES=1 |