projects / sxemacs / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 39b1557)
Overcome differences in order of CFLAGS vs argument list. In the process, make the...
authorNelson Ferreira <nelson.ferreira@ieee.org>
Mon, 2 Jan 2012 04:40:14 +0000 (23:40 -0500)
committerNelson Ferreira <nelson.ferreira@ieee.org>
Mon, 2 Jan 2012 04:40:14 +0000 (23:40 -0500)
used in Mac OS be the one detected, not a difference between compile and runtime.

* m4/sxe-summary.m4 (SXE_SUMMARY): Add output of c_switch_system,
ld_switch_general and ld_libs_system to the summary.

* src/Makefile.am (libsxecore_a_CPPFLAGS): Remove X_CFLAGS since
they are not (and should not be) needed.
* src/Makefile.am (libcruft_a_CPPFLAGS): Ditto.
* src/ui/TTY/Makefile.am (libsxeuiTTY_a_CPPFLAGS): Ditto.

* src/Makefile.am (AM_CPPFLAGS): Use c_switch_general instead of c_switch_system
* src/database/Makefile.am (AM_CPPFLAGS): Ditto.
* src/ent/Makefile.am (AM_CPPFLAGS): Ditto.
* src/events/Makefile.am (AM_CPPFLAGS): Ditto.
* src/media/Makefile.am (AM_CPPFLAGS): Ditto.
* src/media/Makefile.am (libmm_a_CPPFLAGS): Ditto.
* src/mem/Makefile.am (AM_CPPFLAGS): Ditto.
* src/mule/Makefile.am (AM_CPPFLAGS): Ditto.
* src/ui/Gtk/Makefile.am (AM_CPPFLAGS): Ditto.
* src/ui/Gtk/Makefile.am (libsxeuiGtk_a_CPPFLAGS): Ditto.
* src/ui/Makefile.am (AM_CPPFLAGS): Ditto.
* src/ui/Makefile.am (libsxeui_a_CPPFLAGS): Ditto.
* src/ui/TTY/Makefile.am (AM_CPPFLAGS): Ditto.
* src/ui/TTY/Makefile.am (libsxeuiTTY_a_CPPFLAGS): Ditto.
* src/ui/X11/Makefile.am (AM_CPPFLAGS): Ditto.
* src/ui/X11/Makefile.am (libsxeuiX11_a_CPPFLAGS): Ditto.

Signed-off-by: Nelson Ferreira <nelson.ferreira@ieee.org>
13 files changed:
configure.ac patch | blob | history
m4/sxe-summary.m4 patch | blob | history
src/Makefile.am patch | blob | history
src/database/Makefile.am patch | blob | history
src/ent/Makefile.am patch | blob | history
src/events/Makefile.am patch | blob | history
src/media/Makefile.am patch | blob | history
src/mem/Makefile.am patch | blob | history
src/mule/Makefile.am patch | blob | history
src/ui/Gtk/Makefile.am patch | blob | history
src/ui/Makefile.am patch | blob | history
src/ui/TTY/Makefile.am patch | blob | history
src/ui/X11/Makefile.am patch | blob | history

diff --git a/configure.ac b/configure.ac
index d53fdff..8a65ad8 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -3613,7 +3613,7 @@ else
 fi
 
 SXE_UNDUP(CFLAGS, $CFLAGS)
-SXE_UNDUP(c_switch_general, -DHAVE_CONFIG_H $c_switch_site $c_switch_machine $c_switch_system)
+SXE_UNDUP(c_switch_general, -DHAVE_CONFIG_H $c_switch_site $c_switch_machine $c_switch_system $CFLAGS $CPPFLAGS)
 SXE_UNDUP(c_switch_window_system, $c_switch_x_site $c_switch_gtk $X_CFLAGS)
 SXE_UNDUP(c_switch_all, $c_switch_general $c_switch_window_system)
 SXE_UNDUP(ld_switch_general, $ld_switch_site $ld_switch_machine $ld_switch_system $ld_switch_run)
diff --git a/m4/sxe-summary.m4 b/m4/sxe-summary.m4
index 5c25982..cf2ca67 100644 (file)
--- a/m4/sxe-summary.m4
+++ b/m4/sxe-summary.m4
@@ -42,14 +42,17 @@ echo "    - Compiler command:              $CC $CFLAGS"
 echo "    - Global CPPFLAGS:               $CPPFLAGS"
 echo "    - Global LDFLAGS:                $LDFLAGS"
 echo "    - C flags"
+echo "              System:                $c_switch_system"
 echo "              General:               $c_switch_general"
 echo "              Window system:         $c_switch_window_system"
 echo "              All:                   $c_switch_all"
 echo "    - Linker flags"
+echo "              System:                $ld_switch_system"
 echo "              General:               $ld_switch_general"
 echo "              Window system:         $ld_switch_window_system"
 echo "              All:                   $ld_switch_all"
 echo "    - Linked libraries:"
+echo "              System:                $ld_libs_system"
 echo "              General:               $ld_libs_general"
 echo "              Window system:         $ld_libs_window_system"
 echo "              All:                   $ld_libs_all"
diff --git a/src/Makefile.am b/src/Makefile.am
index 6b8791e..cf63347 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -35,7 +35,7 @@ abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
 
 AM_CFLAGS = -Demacs $(OPENSSL_CFLAGS) -DUSE_SXEMACS_CONFIG_H -DXTSTRINGDEFINES
-AM_CPPFLAGS = -I$(srcdir) -I$(builddir) -I$(top_builddir) $(c_switch_system) $(LTDLINCL)
+AM_CPPFLAGS = -I$(srcdir) -I$(builddir) -I$(top_builddir) $(c_switch_general) $(LTDLINCL)
 AM_LDFLAGS = $(OPENSSL_LDFLAGS) $(ENT_LDFLAGS) $(LIBLTDL)
 
 headerdir = $(includedir)/$(instvarsepdir)
@@ -223,7 +223,7 @@ libsxecore_a_sources =                                                      \
        strftime.c symbols.c syntax.c sysdep.c undo.c
 libsxecore_a_SOURCES = $(libsxecore_a_headers) $(libsxecore_a_sources)
 EXTRA_libsxecore_a_SOURCES = dumper.c realpath.c
-libsxecore_a_CPPFLAGS = $(AM_CPPFLAGS) $(X_CFLAGS)
+libsxecore_a_CPPFLAGS = $(AM_CPPFLAGS) 
 libsxecore_a_LIBADD = $(libsxecore_objs)
 libsxecore_a_DEPENDENCIES = $(libsxecore_a_LIBADD)
 all_sources += $(libsxecore_a_sources) $(libsxecore_objs:.o=.c)
@@ -235,7 +235,7 @@ EXTRA_libcruft_a_SOURCES =                                          \
        alloca.c debug.c effi.c emodules-ng.c                           \
        filelock.c getloadavg.c inline.c openssl.c strcat.c tests.c
 libcruft_a_CPPFLAGS =                                                  \
-       $(AM_CPPFLAGS) $(DB_CPPFLAGS) $(FFI_CPPFLAGS) $(X_CFLAGS)
+       $(AM_CPPFLAGS) $(DB_CPPFLAGS) $(FFI_CPPFLAGS) 
 libcruft_a_LIBADD = $(libcruft_objs)
 libcruft_a_DEPENDENCIES = $(libcruft_a_LIBADD)
 all_sources += $(libcruft_a_sources) $(extra_objs:.o=.c)
diff --git a/src/database/Makefile.am b/src/database/Makefile.am
index 099dcc0..a05809a 100644 (file)
--- a/src/database/Makefile.am
+++ b/src/database/Makefile.am
@@ -35,7 +35,7 @@ abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
 
 AM_CFLAGS = -Demacs $(OPENSSL_CFLAGS) -DUSE_SXEMACS_CONFIG_H -DXTSTRINGDEFINES
-AM_CPPFLAGS = -I$(srcdir) -I$(builddir) -I$(top_srcdir)/src -I$(top_builddir)/src -I$(top_builddir) $(c_switch_system) $(LTDLINCL)
+AM_CPPFLAGS = -I$(srcdir) -I$(builddir) -I$(top_srcdir)/src -I$(top_builddir)/src -I$(top_builddir) $(c_switch_general) $(LTDLINCL)
 
 headerdir = $(includedir)/$(instvarsepdir)
 archlibdir = ${libdir}/${instvardir}/${configuration}
diff --git a/src/ent/Makefile.am b/src/ent/Makefile.am
index 32fe471..299b8aa 100644 (file)
--- a/src/ent/Makefile.am
+++ b/src/ent/Makefile.am
@@ -35,7 +35,7 @@ abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
 
 AM_CFLAGS = -Demacs $(OPENSSL_CFLAGS) -DUSE_SXEMACS_CONFIG_H -DXTSTRINGDEFINES
-AM_CPPFLAGS = -I$(srcdir) -I$(builddir) -I$(top_srcdir)/src -I$(top_builddir)/src -I$(top_builddir) $(c_switch_system) $(LTDLINCL)
+AM_CPPFLAGS = -I$(srcdir) -I$(builddir) -I$(top_srcdir)/src -I$(top_builddir)/src -I$(top_builddir) $(c_switch_general) $(LTDLINCL)
 
 headerdir = $(includedir)/$(instvarsepdir)
 archlibdir = ${libdir}/${instvardir}/${configuration}
diff --git a/src/events/Makefile.am b/src/events/Makefile.am
index bc58658..e483e37 100644 (file)
--- a/src/events/Makefile.am
+++ b/src/events/Makefile.am
@@ -35,7 +35,7 @@ abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
 
 AM_CFLAGS = -Demacs $(OPENSSL_CFLAGS) -DUSE_SXEMACS_CONFIG_H -DXTSTRINGDEFINES
-AM_CPPFLAGS = -I$(srcdir) -I$(builddir) -I$(top_srcdir)/src -I$(top_builddir)/src -I$(top_builddir) $(c_switch_system) $(LTDLINCL)
+AM_CPPFLAGS = -I$(srcdir) -I$(builddir) -I$(top_srcdir)/src -I$(top_builddir)/src -I$(top_builddir) $(c_switch_general) $(LTDLINCL)
 
 headerdir = $(includedir)/$(instvarsepdir)
 archlibdir = ${libdir}/${instvardir}/${configuration}
diff --git a/src/media/Makefile.am b/src/media/Makefile.am
index 7ecb837..bd2007c 100644 (file)
--- a/src/media/Makefile.am
+++ b/src/media/Makefile.am
@@ -35,7 +35,7 @@ abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
 
 AM_CFLAGS = -Demacs $(OPENSSL_CFLAGS) -DUSE_SXEMACS_CONFIG_H -DXTSTRINGDEFINES
-AM_CPPFLAGS = -I$(srcdir) -I$(builddir) -I$(top_srcdir)/src -I$(top_builddir)/src -I$(top_builddir) $(c_switch_system) $(LTDLINCL)
+AM_CPPFLAGS = -I$(srcdir) -I$(builddir) -I$(top_srcdir)/src -I$(top_builddir)/src -I$(top_builddir) $(c_switch_general) $(LTDLINCL)
 
 headerdir = $(includedir)/$(instvarsepdir)
 archlibdir = ${libdir}/${instvardir}/${configuration}
@@ -62,7 +62,7 @@ EXTRA_libmm_a_SOURCES = \
        sound-jack.c sound-nas.c sound-oss.c sound-pulse.c \
        dgif_lib.c gif_io.c
 libmm_a_CFLAGS = $(AM_CFLAGS) -Wall
-libmm_a_CPPFLAGS = $(AM_CPPFLAGS) $(c_switch_system) $(MM_CPPFLAGS) $(X_CFLAGS) 
+libmm_a_CPPFLAGS = $(AM_CPPFLAGS) $(c_switch_general) $(MM_CPPFLAGS) $(X_CFLAGS) 
 libmm_a_LIBADD = $(libmm_objs)
 libmm_a_DEPENDENCIES = $(libmm_a_LIBADD)
 libmm_a_ldflags = $(MM_LIBS)
diff --git a/src/mem/Makefile.am b/src/mem/Makefile.am
index 38cd9b4..3dd0253 100644 (file)
--- a/src/mem/Makefile.am
+++ b/src/mem/Makefile.am
@@ -35,7 +35,7 @@ abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
 
 AM_CFLAGS = -Demacs $(OPENSSL_CFLAGS) -DUSE_SXEMACS_CONFIG_H -DXTSTRINGDEFINES
-AM_CPPFLAGS = -I$(srcdir) -I$(builddir) -I$(top_srcdir)/src -I$(top_builddir)/src -I$(top_builddir) $(c_switch_system) $(LTDLINCL)
+AM_CPPFLAGS = -I$(srcdir) -I$(builddir) -I$(top_srcdir)/src -I$(top_builddir)/src -I$(top_builddir) $(c_switch_general) $(LTDLINCL)
 
 headerdir = $(includedir)/$(instvarsepdir)
 archlibdir = ${libdir}/${instvardir}/${configuration}
diff --git a/src/mule/Makefile.am b/src/mule/Makefile.am
index ad605df..f5292e8 100644 (file)
--- a/src/mule/Makefile.am
+++ b/src/mule/Makefile.am
@@ -35,7 +35,7 @@ abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
 
 AM_CFLAGS = -Demacs $(OPENSSL_CFLAGS) -DUSE_SXEMACS_CONFIG_H -DXTSTRINGDEFINES
-AM_CPPFLAGS = -I$(srcdir) -I$(builddir) -I$(top_srcdir)/src -I$(top_builddir)/src -I$(top_builddir) $(c_switch_system) $(LTDLINCL)
+AM_CPPFLAGS = -I$(srcdir) -I$(builddir) -I$(top_srcdir)/src -I$(top_builddir)/src -I$(top_builddir) $(c_switch_general) $(LTDLINCL)
 
 headerdir = $(includedir)/$(instvarsepdir)
 archlibdir = ${libdir}/${instvardir}/${configuration}
diff --git a/src/ui/Gtk/Makefile.am b/src/ui/Gtk/Makefile.am
index 93fc696..40dfb69 100644 (file)
--- a/src/ui/Gtk/Makefile.am
+++ b/src/ui/Gtk/Makefile.am
@@ -36,7 +36,7 @@ abs_top_srcdir = @abs_top_srcdir@
 sxelibsrcdir = $(abs_top_srcdir)/lib-src
 
 AM_CFLAGS = -Demacs $(OPENSSL_CFLAGS) -DUSE_SXEMACS_CONFIG_H -DXTSTRINGDEFINES
-AM_CPPFLAGS = -I$(srcdir) -I$(builddir) -I$(top_srcdir)/src -I$(top_builddir)/src -I$(top_builddir) $(c_switch_system) $(LTDLINCL)
+AM_CPPFLAGS = -I$(srcdir) -I$(builddir) -I$(top_srcdir)/src -I$(top_builddir)/src -I$(top_builddir) $(c_switch_general) $(LTDLINCL)
 
 headerdir = $(includedir)/$(instvarsepdir)
 archlibdir = ${libdir}/${instvardir}/${configuration}
@@ -59,7 +59,7 @@ libsxeuiGTK_a_sources =                                        \
        menubar-gtk.c scrollbar-gtk.c dialog-gtk.c toolbar-gtk.c \
        gui-gtk.c ui-byhand.c
 libsxeuiGtk_a_SOURCES = $(libsxeuiGtk_a_headers) $(libsxeuiGTK_a_sources)
-libsxeuiGtk_a_CPPFLAGS = $(AM_CPPFLAGS) $(c_switch_system) $(X_CFLAGS)
+libsxeuiGtk_a_CPPFLAGS = $(AM_CPPFLAGS) $(c_switch_general) $(X_CFLAGS)
 libsxeuiGtk_a_LIBADD=$(libsxeuiGtk_objs)
 libsxeuiGtk_a_DEPENDENCIES = $(libsxeuiGtk_a_LIBADD)
 all_sources += $(libsxeuiGtk_objs:.o=.c)
diff --git a/src/ui/Makefile.am b/src/ui/Makefile.am
index 17cbb13..b946f05 100644 (file)
--- a/src/ui/Makefile.am
+++ b/src/ui/Makefile.am
@@ -36,7 +36,7 @@ abs_top_srcdir = @abs_top_srcdir@
 sxelibsrcdir = $(abs_top_srcdir)/lib-src
 
 AM_CFLAGS = -Demacs $(OPENSSL_CFLAGS) -DUSE_SXEMACS_CONFIG_H -DXTSTRINGDEFINES
-AM_CPPFLAGS = -I$(srcdir) -I$(builddir) -I$(top_srcdir)/src -I$(top_builddir)/src -I$(top_builddir) $(c_switch_system) $(LTDLINCL)
+AM_CPPFLAGS = -I$(srcdir) -I$(builddir) -I$(top_srcdir)/src -I$(top_builddir)/src -I$(top_builddir) $(c_switch_general) $(LTDLINCL)
 
 headerdir = $(includedir)/$(instvarsepdir)
 archlibdir = ${libdir}/${instvardir}/${configuration}
@@ -68,7 +68,7 @@ libsxeui_a_sources =                                                  \
        imgproc.c keymap.c insdel.c minibuf.c redisplay.c               \
        redisplay-output.c select.c specifier.c widget.c window.c 
 libsxeui_a_SOURCES = $(libsxeui_a_headers) $(libsxeui_a_sources)
-libsxeui_a_CPPFLAGS = $(AM_CPPFLAGS) $(c_switch_system) $(X_CFLAGS)
+libsxeui_a_CPPFLAGS = $(AM_CPPFLAGS) $(c_switch_general) $(X_CFLAGS)
 EXTRA_libsxeui_a_SOURCES=scrollbar.c menubar.c dialog.c toolbar.c
 libsxeui_a_LIBADD = $(libsxeui_objs)
 libsxeui_a_DEPENDENCIES = $(libsxeui_objs)
diff --git a/src/ui/TTY/Makefile.am b/src/ui/TTY/Makefile.am
index d1fc800..171dbae 100644 (file)
--- a/src/ui/TTY/Makefile.am
+++ b/src/ui/TTY/Makefile.am
@@ -36,7 +36,7 @@ abs_top_srcdir = @abs_top_srcdir@
 sxelibsrcdir = $(abs_top_srcdir)/lib-src
 
 AM_CFLAGS = -Demacs $(OPENSSL_CFLAGS) -DUSE_SXEMACS_CONFIG_H -DXTSTRINGDEFINES
-AM_CPPFLAGS = -I$(srcdir) -I$(builddir) -I$(top_srcdir)/src -I$(top_builddir)/src -I$(top_builddir) $(c_switch_system) $(LTDLINCL)
+AM_CPPFLAGS = -I$(srcdir) -I$(builddir) -I$(top_srcdir)/src -I$(top_builddir)/src -I$(top_builddir) $(c_switch_general) $(LTDLINCL)
 
 headerdir = $(includedir)/$(instvarsepdir)
 archlibdir = ${libdir}/${instvardir}/${configuration}
@@ -57,7 +57,7 @@ libsxeuiTTY_a_sources =                                               \
 libsxeuiTTY_a_SOURCES = $(libsxeuiTTY_a_headers) $(libsxeuiTTY_a_sources) 
 EXTRA_libsxeuiTTY_a_SOURCES=                     \
        gpmevent.c termcap.c terminfo.c tparam.c
-libsxeuiTTY_a_CPPFLAGS = $(AM_CPPFLAGS) $(c_switch_system) $(X_CFLAGS)
+libsxeuiTTY_a_CPPFLAGS = $(AM_CPPFLAGS) $(c_switch_general)
 libsxeuiTTY_a_LIBADD=$(libsxeuiTTY_objs)
 libsxeuiTTY_a_DEPENDENCIES = $(libsxeuiTTY_a_LIBADD)
 all_sources += $(libsxeuiTTY_a_sources) $(libsxeuiTTY_objs:.o=.c)
diff --git a/src/ui/X11/Makefile.am b/src/ui/X11/Makefile.am
index 1b5e66c..200ba77 100644 (file)
--- a/src/ui/X11/Makefile.am
+++ b/src/ui/X11/Makefile.am
@@ -36,7 +36,7 @@ abs_top_srcdir = @abs_top_srcdir@
 sxelibsrcdir = $(abs_top_srcdir)/lib-src
 
 AM_CFLAGS = -Demacs $(OPENSSL_CFLAGS) -DUSE_SXEMACS_CONFIG_H -DXTSTRINGDEFINES
-AM_CPPFLAGS = -I$(srcdir) -I$(builddir) -I$(top_srcdir)/src -I$(top_builddir)/src -I$(top_builddir) $(c_switch_system) $(LTDLINCL)
+AM_CPPFLAGS = -I$(srcdir) -I$(builddir) -I$(top_srcdir)/src -I$(top_builddir)/src -I$(top_builddir) $(c_switch_general) $(LTDLINCL)
 
 headerdir = $(includedir)/$(instvarsepdir)
 archlibdir = ${libdir}/${instvardir}/${configuration}
@@ -91,7 +91,7 @@ libsxeuiX11_a_sources =  \
        menubar-x.c scrollbar-x.c dialog-x.c toolbar-x.c gui-x.c
 libsxeuiX11_a_SOURCES = $(libsxeuiX11_a_headers) $(libsxeuiX11_a_sources)
 EXTRA_libsxeuiX11_a_SOURCES=xmu.c
-libsxeuiX11_a_CPPFLAGS = $(AM_CPPFLAGS) $(c_switch_system) $(X_CFLAGS)
+libsxeuiX11_a_CPPFLAGS = $(AM_CPPFLAGS) $(c_switch_general) $(X_CFLAGS)
 libsxeuiX11_a_LIBADD = $(libsxeuiX11_objs)
 libsxeuiX11_a_DEPENDENCIES = $(libsxeuiX11_a_LIBADD)
 all_sources += $(libsxeuiX11_a_sources) $(libsxeuiX11_objs:.o=.c)
SXEmacs