Build improvements

* autogen.sh: when outside of "proper" git repos
              try to be friendlier by using the
              defaults and suggest the tag command.

* src/Emacs{Frame,Manager,Shell}*, src/External*:
              moved into src/ui/X11 as that is the
              proper place for those files

* src/Makefile.am, src/ui/X11/Makefile.am:
              adjust targets for move of the files

* src/mule/input-method-motif.c: adjust header path
* src/ui/lwlib/lwlib-Xlw.c: ditto

Signed-off-by: Nelson Ferreira <nelson.ferreira@ieee.org>

diff --git a/autogen.sh b/autogen.sh
index 23cc576..3876839 100755 (executable)
--- a/autogen.sh
+++ b/autogen.sh
@@ -26,9 +26,16 @@ emacs_is_beta=t
 if test -n "$GIT" -a -n "$($GIT symbolic-ref HEAD 2>/dev/null)"; then
        TREE_VERSION="$($GIT tag|tail -n1|tr -d v)"
        GIT_VERSION="$($GIT describe)"
-else
+       IN_GIT="1"
+fi
+if test -z "$TREE_VERSION"; then
        TREE_VERSION="22.1.14"
-       GIT_VERSION="no_git_version"
+        if test -n "$IN_GIT"; then
+           echo "If you cloned this branch into your own you should issue: git tag -s v${TREE_VERSION}.<your branch_name>"
+       fi
+fi
+if test -z "$GIT_VERSION"; then
+       GIT_VERSION="${TREE_VERSION}-no_git_version"
 fi
 
 emacs_major_version="$(echo $TREE_VERSION|cut -d. -f1)"

diff --git a/src/Makefile.am b/src/Makefile.am
index 7dc66a0..6b8791e 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -138,8 +138,7 @@ nodumplibs  += $(builddir)/mem/libmemalloc.a
 # because libsxemem already is there
 endif
 if DESCEND_LWLIB
-nodumplibs += libsxeX.a
-noinst_nodumplibs += libsxeX.a
+nodumplibs += $(builddir)/ui/X11/libsxeX.a
 endif
 
 SUBDIRS += $(sxe_subdirs)
@@ -241,33 +240,6 @@ libcruft_a_LIBADD = $(libcruft_objs)
 libcruft_a_DEPENDENCIES = $(libcruft_a_LIBADD)
 all_sources += $(libcruft_a_sources) $(extra_objs:.o=.c)
 
-## just a trick :( we create these libraries to get the object files
-if DESCEND_LWLIB
-noinst_LIBRARIES += libTopLevelEmacsShell.a libTransientEmacsShell.a
-libTopLevelEmacsShell_a_SOURCES = EmacsShell-sub.c
-libTopLevelEmacsShell_a_CFLAGS = -DDEFINE_TOP_LEVEL_EMACS_SHELL
-libTopLevelEmacsShell_a_CPPFLAGS = $(AM_CPPFLAGS) $(X_CFLAGS)
-libTransientEmacsShell_a_SOURCES = EmacsShell-sub.c
-libTransientEmacsShell_a_CFLAGS = -DDEFINE_TRANSIENT_EMACS_SHELL
-libTransientEmacsShell_a_CPPFLAGS = $(AM_CPPFLAGS) $(X_CFLAGS)
-endif
-libsxeX_a_headers = \
-       EmacsFrame.h EmacsFrameP.h EmacsManager.h EmacsManagerP.h          \
-       EmacsShell.h EmacsShellP.h ExternalClient.h ExternalClientP.h      \
-       ExternalShell.h ExternalShellP.h xintrinsic.h xintrinsicp.h
-libsxeX_a_sources = \
-       EmacsFrame.c EmacsShell.c EmacsManager.c
-if WITH_EXTW
-libsxeX_a_sources += ExternalShell.c 
-## extw-Xt-nonshared.c extw-Xlib-nonshared.c where are these????
-endif
-libsxeX_a_SOURCES = $(libsxeX_a_headers) $(libsxeX_a_sources)
-libsxeX_a_LIBADD =                             \
-       $(libTransientEmacsShell_a_OBJECTS)     \
-       $(libTopLevelEmacsShell_a_OBJECTS)
-libsxeX_a_CPPFLAGS = $(AM_CPPFLAGS) $(X_CFLAGS)
-libsxeX_a_DEPENDENCIES = libTopLevelEmacsShell.a libTransientEmacsShell.a
-all_sources += $(libsxeX_a_sources) $(libsxeX_a_LIBADD:.o=.c)
 
 ### custom rules
 SXEMACS = $(bldsrcdir)/sxemacs

diff --git a/src/mule/input-method-motif.c b/src/mule/input-method-motif.c
index 569583e..af1d2b8 100644 (file)
--- a/src/mule/input-method-motif.c
+++ b/src/mule/input-method-motif.c
@@ -28,7 +28,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>. */
 #include "ui/X11/console-x.h"
 #include "ui/device.h"
 #include "ui/frame.h"
-#include "EmacsFrame.h"
+#include "ui/X11/EmacsFrame.h"
 #include <Xm/Xm.h>
 
 #ifndef XIM_MOTIF

diff --git a/src/EmacsFrame.c b/src/ui/X11/EmacsFrame.c
similarity index 100%
rename from src/EmacsFrame.c
rename to src/ui/X11/EmacsFrame.c

diff --git a/src/EmacsFrame.h b/src/ui/X11/EmacsFrame.h
similarity index 100%
rename from src/EmacsFrame.h
rename to src/ui/X11/EmacsFrame.h

diff --git a/src/EmacsFrameP.h b/src/ui/X11/EmacsFrameP.h
similarity index 100%
rename from src/EmacsFrameP.h
rename to src/ui/X11/EmacsFrameP.h

diff --git a/src/EmacsManager.c b/src/ui/X11/EmacsManager.c
similarity index 100%
rename from src/EmacsManager.c
rename to src/ui/X11/EmacsManager.c

diff --git a/src/EmacsManager.h b/src/ui/X11/EmacsManager.h
similarity index 100%
rename from src/EmacsManager.h
rename to src/ui/X11/EmacsManager.h

diff --git a/src/EmacsManagerP.h b/src/ui/X11/EmacsManagerP.h
similarity index 100%
rename from src/EmacsManagerP.h
rename to src/ui/X11/EmacsManagerP.h

diff --git a/src/EmacsShell-sub.c b/src/ui/X11/EmacsShell-sub.c
similarity index 100%
rename from src/EmacsShell-sub.c
rename to src/ui/X11/EmacsShell-sub.c

diff --git a/src/EmacsShell.c b/src/ui/X11/EmacsShell.c
similarity index 100%
rename from src/EmacsShell.c
rename to src/ui/X11/EmacsShell.c

diff --git a/src/EmacsShell.h b/src/ui/X11/EmacsShell.h
similarity index 100%
rename from src/EmacsShell.h
rename to src/ui/X11/EmacsShell.h

diff --git a/src/EmacsShellP.h b/src/ui/X11/EmacsShellP.h
similarity index 100%
rename from src/EmacsShellP.h
rename to src/ui/X11/EmacsShellP.h

diff --git a/src/ExternalClient-Xlib.c b/src/ui/X11/ExternalClient-Xlib.c
similarity index 100%
rename from src/ExternalClient-Xlib.c
rename to src/ui/X11/ExternalClient-Xlib.c

diff --git a/src/ExternalClient.c b/src/ui/X11/ExternalClient.c
similarity index 100%
rename from src/ExternalClient.c
rename to src/ui/X11/ExternalClient.c

diff --git a/src/ExternalClient.h b/src/ui/X11/ExternalClient.h
similarity index 100%
rename from src/ExternalClient.h
rename to src/ui/X11/ExternalClient.h

diff --git a/src/ExternalClientP.h b/src/ui/X11/ExternalClientP.h
similarity index 100%
rename from src/ExternalClientP.h
rename to src/ui/X11/ExternalClientP.h

diff --git a/src/ExternalShell.c b/src/ui/X11/ExternalShell.c
similarity index 100%
rename from src/ExternalShell.c
rename to src/ui/X11/ExternalShell.c

diff --git a/src/ExternalShell.h b/src/ui/X11/ExternalShell.h
similarity index 100%
rename from src/ExternalShell.h
rename to src/ui/X11/ExternalShell.h

diff --git a/src/ExternalShellP.h b/src/ui/X11/ExternalShellP.h
similarity index 100%
rename from src/ExternalShellP.h
rename to src/ui/X11/ExternalShellP.h

diff --git a/src/ui/X11/Makefile.am b/src/ui/X11/Makefile.am
index 0d50ebe..1b5e66c 100644 (file)
--- a/src/ui/X11/Makefile.am
+++ b/src/ui/X11/Makefile.am
@@ -49,6 +49,35 @@ all_sources=
 noinst_LIBRARIES=
 header_HEADERS=$(acgen_headers) 
 
+## just a trick :( we create these libraries to get the object files
+if DESCEND_LWLIB
+noinst_LIBRARIES += libTopLevelEmacsShell.a libTransientEmacsShell.a
+libTopLevelEmacsShell_a_SOURCES = EmacsShell-sub.c
+libTopLevelEmacsShell_a_CFLAGS = -DDEFINE_TOP_LEVEL_EMACS_SHELL
+libTopLevelEmacsShell_a_CPPFLAGS = $(AM_CPPFLAGS) $(X_CFLAGS)
+libTransientEmacsShell_a_SOURCES = EmacsShell-sub.c
+libTransientEmacsShell_a_CFLAGS = -DDEFINE_TRANSIENT_EMACS_SHELL
+libTransientEmacsShell_a_CPPFLAGS = $(AM_CPPFLAGS) $(X_CFLAGS)
+endif
+libsxeX_a_headers = \
+       EmacsFrame.h EmacsFrameP.h EmacsManager.h EmacsManagerP.h          \
+       EmacsShell.h EmacsShellP.h ExternalClient.h ExternalClientP.h      \
+       ExternalShell.h ExternalShellP.h xintrinsic.h xintrinsicp.h
+libsxeX_a_sources = \
+       EmacsFrame.c EmacsShell.c EmacsManager.c
+if WITH_EXTW
+libsxeX_a_sources += ExternalShell.c 
+## extw-Xt-nonshared.c extw-Xlib-nonshared.c where are these????
+endif
+libsxeX_a_SOURCES = $(libsxeX_a_headers) $(libsxeX_a_sources)
+libsxeX_a_LIBADD =                             \
+       $(libTransientEmacsShell_a_OBJECTS)     \
+       $(libTopLevelEmacsShell_a_OBJECTS)
+libsxeX_a_CPPFLAGS = $(AM_CPPFLAGS) $(X_CFLAGS)
+libsxeX_a_DEPENDENCIES = libTopLevelEmacsShell.a libTransientEmacsShell.a
+noinst_LIBRARIES += libsxeX.a
+all_sources += $(libsxeX_a_sources) $(libsxeX_a_LIBADD:.o=.c)
+
 libsxeuiX11_a_headers = \
        balloon_help.h                                          \
        console-x.h extw-Xlib.h extw-Xt.h                       \

diff --git a/src/xintrinsic.h b/src/ui/X11/xintrinsic.h
similarity index 100%
rename from src/xintrinsic.h
rename to src/ui/X11/xintrinsic.h

diff --git a/src/xintrinsicp.h b/src/ui/X11/xintrinsicp.h
similarity index 100%
rename from src/xintrinsicp.h
rename to src/ui/X11/xintrinsicp.h

diff --git a/src/ui/lwlib/lwlib-Xlw.c b/src/ui/lwlib/lwlib-Xlw.c
index 82aef57..d4777d6 100644 (file)
--- a/src/ui/lwlib/lwlib-Xlw.c
+++ b/src/ui/lwlib/lwlib-Xlw.c
@@ -29,7 +29,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>. */
 #include <X11/CompositeP.h>
 #include <X11/Shell.h>
 #ifdef HAVE_WIDGETS
-#include "EmacsManager.h"
+#include "ui/X11/EmacsManager.h"
 #endif
 #ifdef LWLIB_MENUBARS_LUCID
 #include "xlwmenu.h"