diff options
| author | Stefan Monnier | 2008-04-18 15:48:06 +0000 |
|---|---|---|
| committer | Stefan Monnier | 2008-04-18 15:48:06 +0000 |
| commit | 73d798d5ae728a2cbc8eacf9cca8ddc618064f69 (patch) | |
| tree | a9940e61b618afd6ef7eb05d594e7c1c3d726b43 /lwlib | |
| parent | 325a68616c6f94ea9102657416c8e3ab40ed884e (diff) | |
| download | emacs-73d798d5ae728a2cbc8eacf9cca8ddc618064f69.tar.gz emacs-73d798d5ae728a2cbc8eacf9cca8ddc618064f69.zip | |
* configure.in: Define USE_LUCID/USE_MOTIF in config.h.
* lwlib/Makefile.in (TOOLKIT_DEFINES): Remove.
* src/Makefile.in (TOOLKIT_DEFINES): Remove.
(LIBW): Use a bit less #if, remove left over OPEN_LOOK stuff.
Diffstat (limited to 'lwlib')
| -rw-r--r-- | lwlib/ChangeLog | 4 | ||||
| -rw-r--r-- | lwlib/Makefile.in | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/lwlib/ChangeLog b/lwlib/ChangeLog index 75e6a4fdaeb..c6df2f5dd0f 100644 --- a/lwlib/ChangeLog +++ b/lwlib/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2008-04-18 Stefan Monnier <monnier@iro.umontreal.ca> | ||
| 2 | |||
| 3 | * Makefile.in (TOOLKIT_DEFINES): Remove. | ||
| 4 | |||
| 1 | 2007-08-29 Károly Lőrentey <lorentey@elte.hu> | 5 | 2007-08-29 Károly Lőrentey <lorentey@elte.hu> |
| 2 | 6 | ||
| 3 | * xlwmenu.c (XlwMenuRealize): Ignore X errors while setting up | 7 | * xlwmenu.c (XlwMenuRealize): Ignore X errors while setting up |
diff --git a/lwlib/Makefile.in b/lwlib/Makefile.in index a53308c6cf4..f0626bb4618 100644 --- a/lwlib/Makefile.in +++ b/lwlib/Makefile.in | |||
| @@ -46,7 +46,7 @@ USE_X_TOOLKIT=@X_TOOLKIT_TYPE@ | |||
| 46 | LUCID_OBJS = lwlib-Xlw.o xlwmenu.o lwlib-Xaw.o | 46 | LUCID_OBJS = lwlib-Xlw.o xlwmenu.o lwlib-Xaw.o |
| 47 | MOTIF_OBJS = lwlib-Xm.o | 47 | MOTIF_OBJS = lwlib-Xm.o |
| 48 | 48 | ||
| 49 | TOOLKIT_DEFINES = -DUSE_$(USE_X_TOOLKIT) | 49 | TOOLKIT_DEFINES = |
| 50 | TOOLKIT_OBJS = $(@X_TOOLKIT_TYPE@_OBJS) | 50 | TOOLKIT_OBJS = $(@X_TOOLKIT_TYPE@_OBJS) |
| 51 | 51 | ||
| 52 | OBJS = lwlib.o $(TOOLKIT_OBJS) lwlib-utils.o | 52 | OBJS = lwlib.o $(TOOLKIT_OBJS) lwlib-utils.o |