Reorganize source tree to use single autotools instance

[vpp.git] / build-data / platforms.mk

diff --git a/build-data/platforms.mk b/build-data/platforms.mk
index 36cfc87..88dd3ed 100644 (file)
--- a/build-data/platforms.mk
+++ b/build-data/platforms.mk
@@ -28,6 +28,10 @@ install-deb: $(patsubst %,%-find-source,$(ROOT_PACKAGES))
          | sed -e 's:.*:../& /usr/bin:'                                \
            > deb/debian/vpp.install ;                                  \
                                                                        \
+       : core api definitions ;                                        \
+       ./scripts/find-api-core-contents $(INSTALL_PREFIX)$(ARCH)       \
+        deb/debian/vpp.install ;                                       \
+                                                                       \
        : need symbolic links in the lib pkg ;                          \
        find $(INSTALL_PREFIX)$(ARCH)/*/lib* \( -type f -o  -type l \)  \
          -print | egrep -e '*\.so\.*\.*\.*'                            \
@@ -35,6 +39,10 @@ install-deb: $(patsubst %,%-find-source,$(ROOT_PACKAGES))
          | sed -e 's:.*:../& /usr/lib/x86_64-linux-gnu:'               \
            > deb/debian/vpp-lib.install ;                              \
                                                                        \
+       : vnet api definitions ;                                        \
+       ./scripts/find-api-lib-contents $(INSTALL_PREFIX)$(ARCH)        \
+        deb/debian/vpp-lib.install ;                                   \
+                                                                       \
        : dev package ;                                                 \
        ./scripts/find-dev-contents $(INSTALL_PREFIX)$(ARCH)            \
         deb/debian/vpp-dev.install ;                                   \
@@ -43,23 +51,25 @@ install-deb: $(patsubst %,%-find-source,$(ROOT_PACKAGES))
        ./scripts/find-plugins-contents $(INSTALL_PREFIX)$(ARCH)        \
         deb/debian/vpp-plugins.install ;                               \
                                                                        \
+       : python-api package ;                                          \
+       ./scripts/find-python-api-contents $(INSTALL_PREFIX)$(ARCH)     \
+        deb/debian/vpp-python-api.install ;                            \
+                                                                       \
        : dpdk headers ;                                                \
        ./scripts/find-dpdk-contents $(INSTALL_PREFIX)$(ARCH)           \
         deb/debian/vpp-dpdk-dev.install ;                              \
                                                                        \
        : bin package needs startup config ;                            \
-       echo ../../vpp/conf/startup.conf /etc/vpp                       \
+       echo ../../src/vpp/conf/startup.conf /etc/vpp                   \
           >> deb/debian/vpp.install ;                                  \
                                                                        \
        : and sysctl config ;                                           \
-       echo ../../vpp/conf/80-vpp.conf /etc/sysctl.d                   \
+       echo ../../src/vpp/conf/80-vpp.conf /etc/sysctl.d               \
           >> deb/debian/vpp.install ;                                  \
                                                                        \
        : dev package needs a couple of additions ;                     \
-       echo ../build-tool-native/vppapigen/vppapigen /usr/bin          \
+       echo ../build-tool-native/tools/vppapigen /usr/bin              \
           >> deb/debian/vpp-dev.install ;                              \
-       echo ../../vppapigen/pyvppapigen.py /usr/bin                    \
-           >> deb/debian/vpp-dev.install ;                             \
        echo ../../vpp-api/java/jvpp/gen/jvpp_gen.py /usr/bin           \
           >> deb/debian/vpp-dev.install ;                              \
        for i in $$(ls ../vpp-api/java/jvpp/gen/jvppgen/*.py); do       \
@@ -85,7 +95,11 @@ install-rpm: $(patsubst %,%-find-source,$(ROOT_PACKAGES))
              $(ROOT_PACKAGES)) || exit 1;                              \
                                                                        \
        cd rpm ;                                                        \
+       mkdir -p SOURCES ;                                              \
+       if test -f *.tar.gz ; then mv *.tar.gz SOURCES ; fi ;           \
        rpmbuild -bb --define "_topdir $$PWD" --define                  \
-               "_install_dir $(INSTALL_PREFIX)$(ARCH)" vpp.spec ;      \
+               "_install_dir $(INSTALL_PREFIX)$(ARCH)"                 \
+               --define "_mu_build_root_dir $(MU_BUILD_ROOT_DIR)"      \
+               vpp.spec ;                                              \
        mv $$(find RPMS -name \*.rpm -type f) ..