diff options
| author | wangfei <feix.w.wang@intel.com> | 2013-11-07 05:00:53 -0500 |
|---|---|---|
| committer | Juan Zhao <juan.j.zhao@intel.com> | 2013-12-12 17:19:07 +0800 |
| commit | 4d2bb23c5b3885ed106178427969bf6ab563fd42 (patch) | |
| tree | b01fcd61cbf9ed0853bf422561b5a6c4debd2a80 | |
| parent | 8cc3cab87b14e7916917bc0c19afd302900f516a (diff) | |
| download | x2w-4d2bb23c5b3885ed106178427969bf6ab563fd42.tar.gz x2w-4d2bb23c5b3885ed106178427969bf6ab563fd42.tar.bz2 x2w-4d2bb23c5b3885ed106178427969bf6ab563fd42.zip | |
add install to packaging/x2w.spec and scr/Makefle.am
add the install information of floders:xfixes,xft,xi,xkbfile,xrandr,
xrender,xtst,xv into packaging/x2w.spec and scr/Makefle.am .
| -rw-r--r-- | Makefile.am | 11 | ||||
| -rw-r--r-- | packaging/x2w.spec | 10 | ||||
| -rw-r--r-- | src/Makefile.am | 49 |
3 files changed, 66 insertions, 4 deletions
diff --git a/Makefile.am b/Makefile.am index d109a11..b526d2e 100644 --- a/Makefile.am +++ b/Makefile.am @@ -34,7 +34,16 @@ xau.pc \ libdri2.pc \ xdamage.pc \ xcomposite.pc \ -xext.pc +xext.pc \ +xfixes.pc \ +xft.pc \ +xi.pc \ +xkbfile.pc \ +xrandr.pc \ +xrender.pc \ +xtst.pc \ +xv.pc + EXTRA_DIST = \ diff --git a/packaging/x2w.spec b/packaging/x2w.spec index bc78c07..1a0ee87 100644 --- a/packaging/x2w.spec +++ b/packaging/x2w.spec @@ -113,6 +113,16 @@ ln -sf ./libx2w.so %{buildroot}/%{_libdir}/libXdamage.so ln -sf ./libx2w.so %{buildroot}/%{_libdir}/libXcomposite.so ln -sf ./libx2w.so %{buildroot}/%{_libdir}/libXext.so +#libXfixes +ln -sf ./libx2w.so %{buildroot}/%{_libdir}/libXfixes.so +ln -sf ./libx2w.so %{buildroot}/%{_libdir}/libXft.so +ln -sf ./libx2w.so %{buildroot}/%{_libdir}/libXi.so +ln -sf ./libx2w.so %{buildroot}/%{_libdir}/libxkbfile.so +ln -sf ./libx2w.so %{buildroot}/%{_libdir}/libXrandr.so +ln -sf ./libx2w.so %{buildroot}/%{_libdir}/libXrender.so +ln -sf ./libx2w.so %{buildroot}/%{_libdir}/libXtst.so +ln -sf ./libx2w.so %{buildroot}/%{_libdir}/libXv.so + %post -p /sbin/ldconfig diff --git a/src/Makefile.am b/src/Makefile.am index 6fb28de..08f57f2 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -183,12 +183,55 @@ x2w_general_headers = \ x2w_general.h xi_headers = \ -xi/xi_2w.h +xi/xi_2w.h \ +xi/xinput_2w.h \ +xi/xinput2_2w.h \ +xi/XInput.h \ +xi/XInput2.h + +xfixes_headers = \ +xfixes/xfixes_2w.h \ +xfixes/Xfixes.h + +xft_headers = \ +xft/xft_2w.h \ +xft/Xft.h \ +xft/xftcompat_2w.h \ +xft/XftCompat.h + +xkbfile_headers = \ +xkbfile/XKBbells.h \ +xkbfile/XKBconfig.h \ +xkbfile/XKBfile.h \ +xkbfile/XKBrules.h \ +xkbfile/xkbbells_2w.h \ +xkbfile/xkbconfig_2w.h \ +xkbfile/xkbfile_2w.h \ +xkbfile/xkbrules_2w.h + +xrandr_headers = \ +xrandr/xrandr_2w.h \ +xrandr/Xrandr.h + +xrender_headers = \ +xrender/xrender_2w.h \ +xrender/Xrender.h + +xtst_headers = \ +xtst/record.h \ +xtst/XTest.h \ +xtst/record_2w.h \ +xtst/xtest_2w.h + +xv_headers = \ +xv/xvlib_2w.h \ +xv/Xvlib.h include_HEADERS = \ -$(xlib_headers) $(ecore_x_headers) $(elementary_headers) $(utilx_headers) $(x2w_general_headers) $(xi_headers) \ +$(xlib_headers) $(ecore_x_headers) $(elementary_headers) $(utilx_headers) $(x2w_general_headers) $(xi_headers) \ $(xcb_headers) $(xproto_headers) $(kbproto_headers) $(xau_headers) $(dri2_headers) $(xdamage_headers) \ -$(xcomposite_headers) +$(xcomposite_headers) $(xfixes_headers) $(xft_headers) $(xkbfile_headers) \ + $(xrandr_headers) $(xrender_headers) $(xtst_headers) $(xv_headers) libx2w_la_SOURCES = \ x2w.c |