aboutsummaryrefslogtreecommitdiff
path: root/libXaw/src/Makefile.am
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2011-03-25 10:41:05 +0000
committermarha <marha@users.sourceforge.net>2011-03-25 10:41:05 +0000
commit272e57235cd60a2e65ac8258d96a02eb3939b687 (patch)
tree789d74bd6ec1cc468f1f81aab97d4e4dfdb2d5c5 /libXaw/src/Makefile.am
parentb39f063f74bf0163eaf34db03134f226d18142ec (diff)
downloadvcxsrv-272e57235cd60a2e65ac8258d96a02eb3939b687.tar.gz
vcxsrv-272e57235cd60a2e65ac8258d96a02eb3939b687.tar.bz2
vcxsrv-272e57235cd60a2e65ac8258d96a02eb3939b687.zip
git update until 25 Mar 2011
xserver fontconfig glproto libXau libXft libXmu libfontenc libxcb mesa mkfontscale pixman randrproto xkeyboard-config xtrans xwininfo updated following packages: xproto-7.0.21 xineramaproto-1.2.1 libXt-1.1.1 libxkbfile-1.0.7 libXpm-3.5.9 libXfont-1.4.3 libXaw-1.0.9 bdftopcf-1.0.3 encodings-1.0.4 fixesproto-5.0 font-adobe-100dpi-1.0.3 font-adobe-75dpi-1.0.3 font-adobe-utopia-100dpi-1.0.4 font-adobe-utopia-75dpi-1.0.4 font-adobe-utopia-type1-1.0.4 font-alias-1.0.3 font-arabic-misc-1.0.3 font-bh-100dpi-1.0.3 font-bh-75dpi-1.0.3 font-bh-lucidatypewriter-100dpi-1.0.3 font-bh-lucidatypewriter-75dpi-1.0.3 font-bh-ttf-1.0.3 font-bh-type1-1.0.3 font-bitstream-100dpi-1.0.3 font-bitstream-75dpi-1.0.3 font-bitstream-speedo-1.0.2 font-bitstream-type1-1.0.3 font-cronyx-cyrillic-1.0.3 font-cursor-misc-1.0.3 font-daewoo-misc-1.0.3 font-dec-misc-1.0.3 font-ibm-type1-1.0.3 font-isas-misc-1.0.3 font-jis-misc-1.0.3 font-micro-misc-1.0.3 font-misc-cyrillic-1.0.3 font-misc-ethiopic-1.0.3 font-misc-meltho-1.0.3 font-misc-misc-1.1.2 font-mutt-misc-1.0.3 font-schumacher-misc-1.1.2 font-screen-cyrillic-1.0.4 font-sony-misc-1.0.3 font-sun-misc-1.0.3 font-util-1.2.0 font-winitzki-cyrillic-1.0.3 font-xfree86-type1-1.0.4
Diffstat (limited to 'libXaw/src/Makefile.am')
-rw-r--r--libXaw/src/Makefile.am24
1 files changed, 23 insertions, 1 deletions
diff --git a/libXaw/src/Makefile.am b/libXaw/src/Makefile.am
index 2aa99800c..3bc4b29b1 100644
--- a/libXaw/src/Makefile.am
+++ b/libXaw/src/Makefile.am
@@ -56,7 +56,9 @@ COMMON_SOURCES = \
XawI18n.h
COMMON_CFLAGS = \
- $(CWARNFLAGS) \
+ $(CWARNFLAGS)
+
+COMMON_CPPFLAGS = \
-I${top_srcdir}/include \
-I${top_srcdir}/include/X11/Xaw \
-DPROJECT_ROOT=\"$(prefix)\"
@@ -65,6 +67,9 @@ if BUILD_XAW6
lib_LTLIBRARIES += libXaw6.la
+libXaw6_la_CPPFLAGS = \
+ $(COMMON_CPPFLAGS)
+
libXaw6_la_CFLAGS = \
$(COMMON_CFLAGS) \
-DOLDXAW \
@@ -85,6 +90,13 @@ else
-rm -f $(DESTDIR)$(libdir)/libXaw.@LIBEXT@.6
(cd $(DESTDIR)$(libdir) && ln -s libXaw6.@LIBEXT@.6 libXaw.@LIBEXT@.6)
endif
+
+uninstall-local::
+if PLATFORM_DARWIN
+ -rm -f $(DESTDIR)$(libdir)/libXaw.6.@LIBEXT@
+else
+ -rm -f $(DESTDIR)$(libdir)/libXaw.@LIBEXT@.6
+endif
endif
endif
@@ -93,6 +105,9 @@ if BUILD_XAW7
lib_LTLIBRARIES += libXaw7.la
+libXaw7_la_CPPFLAGS = \
+ $(COMMON_CPPFLAGS)
+
libXaw7_la_CFLAGS = \
$(COMMON_CFLAGS) \
-DXAW7 \
@@ -114,6 +129,13 @@ else
-rm -f $(DESTDIR)$(libdir)/libXaw.@LIBEXT@.7
(cd $(DESTDIR)$(libdir) && ln -s libXaw7.@LIBEXT@.7 libXaw.@LIBEXT@.7)
endif
+
+uninstall-local::
+if PLATFORM_DARWIN
+ -rm -f $(DESTDIR)$(libdir)/libXaw.7.@LIBEXT@
+else
+ -rm -f $(DESTDIR)$(libdir)/libXaw.@LIBEXT@.7
+endif
endif
endif