diff options
| author | Alan Coopersmith <Alan.Coopersmith@sun.com> | 2005-05-21 20:47:26 +0000 |
|---|---|---|
| committer | Alan Coopersmith <Alan.Coopersmith@sun.com> | 2005-05-21 20:47:26 +0000 |
| commit | 2e00049e9b02e26f858c3e4510641a735c03b086 (patch) | |
| tree | 34158cbecc6805a46678cdc1f113e5d4272e42d3 | |
| parent | a175c9ea92967441a7ad33d2f6c8bf26cbe954fe (diff) | |
Use $(install_sh_DATA) instead of "install" for better portability. Remove
duplicate installation lines.
Add AM_CFLAGS to pass through XT_CFLAGS & X11_CFLAGS
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | Makefile.am | 8 | ||||
| -rw-r--r-- | src/Makefile.am | 2 |
3 files changed, 12 insertions, 5 deletions
@@ -1,3 +1,10 @@ +2005-05-21 Alan Coopersmith <alan.coopersmith@sun.com> + + * Makefile.am ($(BUILT_FILES)): Use $(install_sh_DATA) instead of + "install" for better portability. Remove duplicate installation lines. + + * src/Makefile.am: Add AM_CFLAGS to pass through XT_CFLAGS & X11_CFLAGS + 2005-05-18 <ssp@aware-of-vacuity.boston.redhat.com> * src/Makefile.am (INCLUDES): Also include include/X11 diff --git a/Makefile.am b/Makefile.am index 9d87739..a18d331 100644 --- a/Makefile.am +++ b/Makefile.am @@ -52,9 +52,7 @@ all-local: $(BUILT_FILES) $(BUILT_FILES): $(top_builddir)/util/makestrs $(STRINGSABIOPTIONS) < $(STRING_LIST) > StringDefs.c - install StringDefs.c $(top_builddir)/src - install $(top_builddir)/StringDefs.h $(top_builddir)/include/X11/ - install $(top_builddir)/Shell.h $(top_builddir)/include/X11/ - install -m644 $(top_builddir)/StringDefs.h $(top_builddir)/include/X11/ - install -m644 $(top_builddir)/Shell.h $(top_builddir)/include/X11/ + $(install_sh_DATA) StringDefs.c $(top_builddir)/src + $(install_sh_DATA) $(top_builddir)/StringDefs.h $(top_builddir)/include/X11/ + $(install_sh_DATA) $(top_builddir)/Shell.h $(top_builddir)/include/X11/ diff --git a/src/Makefile.am b/src/Makefile.am index be007f7..7cd8333 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -3,6 +3,8 @@ lib_LTLIBRARIES = libXt.la BUILT_SOURCES = $(BUILT_FILES) CLEANFILES = $(BUILT_SOURCES) +AM_CFLAGS = $(XT_CFLAGS) $(X11_CFLAGS) + INCLUDES = -I$(top_srcdir)/include/ -I$(top_srcdir)/include/X11 nodist_libXt_la_SOURCES = StringDefs.c |