untangle build so our make produces the same result as gmake

This commit is contained in:
naddy 2003-11-19 15:10:09 +00:00
parent cef6f6b335
commit f010349d43

View File

@ -0,0 +1,51 @@
$OpenBSD: patch-src_Makefile_in,v 1.1 2003/11/19 15:10:09 naddy Exp $
--- src/Makefile.in.orig 2003-11-19 15:12:49.000000000 +0100
+++ src/Makefile.in 2003-11-19 15:14:07.000000000 +0100
@@ -904,8 +904,6 @@ stamp-oldxmenu: ${OLDXMENU} ../src/$(OLD
../src/$(OLDXMENU): ${OLDXMENU}
#ifdef USE_X_TOOLKIT
-$(OLDXMENU): really-lwlib
-
/* Encode the values of these two macros in Make variables,
so we can use $(...) to substitute their values within "...". */
C_SWITCH_MACHINE_1 = C_SWITCH_MACHINE
@@ -914,7 +912,7 @@ C_SWITCH_SITE_1 = C_SWITCH_SITE
C_SWITCH_X_SITE_1 = C_SWITCH_X_SITE
C_SWITCH_X_MACHINE_1 = C_SWITCH_X_MACHINE
C_SWITCH_X_SYSTEM_1 = C_SWITCH_X_SYSTEM
-really-lwlib:
+$(OLDXMENU):
cd ${lwlibdir}; ${MAKE} ${MFLAGS} LWLIB_OPTIONS \
CC='${CC}' CFLAGS='${CFLAGS}' MAKE='${MAKE}' \
"C_SWITCH_X_SITE=$(C_SWITCH_X_SITE_1)" \
@@ -923,11 +921,7 @@ really-lwlib:
"C_SWITCH_SITE=$(C_SWITCH_SITE_1)" \
"C_SWITCH_MACHINE=$(C_SWITCH_MACHINE_1)" \
"C_SWITCH_SYSTEM=$(C_SWITCH_SYSTEM_1)"
- @true /* make -t should not create really-lwlib. */
-.PHONY: really-lwlib
#else /* not USE_X_TOOLKIT */
-$(OLDXMENU): really-oldXMenu
-
/* Encode the values of these two macros in Make variables,
so we can use $(...) to substitute their values within "...". */
C_SWITCH_MACHINE_1 = C_SWITCH_MACHINE
@@ -936,7 +930,7 @@ C_SWITCH_SITE_1 = C_SWITCH_SITE
C_SWITCH_X_SITE_1 = C_SWITCH_X_SITE
C_SWITCH_X_MACHINE_1 = C_SWITCH_X_MACHINE
C_SWITCH_X_SYSTEM_1 = C_SWITCH_X_SYSTEM
-really-oldXMenu:
+$(OLDXMENU):
cd ${oldXMenudir}; ${MAKE} ${MFLAGS} OLDXMENU_OPTIONS \
CC='${CC}' CFLAGS='${CFLAGS}' MAKE='${MAKE}' \
"C_SWITCH_X_SITE=$(C_SWITCH_X_SITE_1)" \
@@ -945,8 +939,6 @@ really-oldXMenu:
"C_SWITCH_SITE=$(C_SWITCH_SITE_1)" \
"C_SWITCH_MACHINE=$(C_SWITCH_MACHINE_1)" \
"C_SWITCH_SYSTEM=$(C_SWITCH_SYSTEM_1)"
- @true /* make -t should not create really-oldXMenu. */
-.PHONY: really-oldXMenu
#endif /* not USE_X_TOOLKIT */
#else /* not (HAVE_X_WINDOWS && HAVE_X11 && HAVE_MENUS) */