New defines for the GUI and backend libraries. Support for abbreviations in debugapp and openapp.

git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/tools/make/trunk@2637 72102866-910b-0410-8b05-ffd578937521

ChangeLog

@@ -1,3 +1,11 @@
+Fri Nov 14 09:53:50 1997  Ovidiu Predescu <ovidiu@net-community.com>
+
+	* brain.make: Added defines for the GUI and backend libraries.
+	* configure.in: Set the executable flag for openapp and debugapp.
+	* openapp.in: Added support for target abbreviations.
+	* debugapp.in: Likewise.
+	* rules.make: Removed the debugging comments.
+
 Fri Nov 14 09:31:47 1997  Scott Christley  <scottc@net-community.com>
 
 	* config.make.in (library_combo): Rename to default_library_combo.

brain.make

@@ -125,9 +125,11 @@ GUI_LIBS =
 ifeq ($(GUI_LIB),gnu)
 GUI_LDFLAGS =
 GUI_LIBS = -lgnustep-gui
+GUI_DEFINE = -DGNU_GUI_LIBRARY=1
 endif
 
 ifeq ($(GUI_LIB),nx)
+GUI_DEFINE = -DNeXT_GUI_LIBRARY=1
   ifneq ($(INTERNAL_app_NAME),)
     # If we're building an application pass the following additional flags to
     # the linker
@@ -146,6 +148,7 @@ BACKEND_LIBS =
 ifeq ($(GUI_BACKEND_LIB),xdps)
 BACKEND_LDFLAGS =
 BACKEND_LIBS = -lgnustep-xdps
+BACKEND_DEFINE = -DXDPS_BACKEND_LIBRARY=1
 endif
 
 ifeq ($(GUI_BACKEND_LIB),w32)

configure

@@ -1844,7 +1844,7 @@ cat >> $CONFIG_STATUS <<EOF
 
 EOF
 cat >> $CONFIG_STATUS <<\EOF
-
+chmod a+x openapp debugapp
 exit 0
 EOF
 chmod +x $CONFIG_STATUS

configure.in

@@ -109,4 +109,5 @@ AC_SUBST(ac_cv_library_combo)
 #--------------------------------------------------------------------
 # Produce the output files
 #--------------------------------------------------------------------
-AC_OUTPUT(config.h config.make openapp debugapp GNUmakefile GNUstep.sh)
+AC_OUTPUT(config.h config.make openapp debugapp GNUmakefile GNUstep.sh,
+chmod a+x openapp debugapp)

debugapp.in

@@ -31,7 +31,7 @@ library_combo=@ac_cv_library_combo@
 
 case $1 in
   --library-combo=*)
-    library_combo=`echo $1 | sed 's/--library-combo=//'`
+    LIBRARY_COMBO=`echo $1 | sed 's/--library-combo=//'`
     if [ -z "$2" ]; then
       echo usage: `basename $0` [--library-combo=...] application [arguments...]
       exit 1
@@ -42,6 +42,14 @@ case $1 in
     app=$1; shift;;
 esac
 
+if [ "$LIBRARY_COMBO" = nx ]; then
+  LIBRARY_COMBO=nx-nx-nx-nil
+elif [ "$LIBRARY_COMBO" = gnu-xdps ]; then
+  LIBRARY_COMBO=gnu-gnu-gnu-xdps
+elif [ "$LIBRARY_COMBO" = fd-xdps ]; then
+  LIBRARY_COMBO=gnu-fd-gnu-xdps
+fi
+
 # Remove leading slashes at the end of the application name
 app=`echo $app | sed 's%/*$%%'`
 
@@ -97,7 +105,7 @@ appname=`echo $app | sed 's/\.[a-z]*$//'`
 . $GNUSTEP_SYSTEM_ROOT/Makefiles/ld_lib_path.sh
 
 
-if [ "$library_combo" = nx-nx-nx-nil -a $GNUSTEP_HOST_OS = nextstep4 ]; then
+if [ "$LIBRARY_COMBO" = nx-nx-nx-nil -a $GNUSTEP_HOST_OS = nextstep4 ]; then
   if [ ! -f $full_appname/$appname ]; then
     echo "$full_appname application does not have a binary for this kind of machine and operating system."
     exit 1
@@ -113,16 +121,16 @@ else
     exit 1
   fi
 
-  if [ ! -d $full_appname/$GNUSTEP_HOST_CPU/$GNUSTEP_HOST_OS/$library_combo ]; then
-    echo "$full_appname application does not have a binary for this combination of libraries: $library_combo."
+  if [ ! -d $full_appname/$GNUSTEP_HOST_CPU/$GNUSTEP_HOST_OS/$LIBRARY_COMBO ]; then
+    echo "$full_appname application does not have a binary for this combination of libraries: $LIBRARY_COMBO."
     exit 1
   fi
 
   # Support for GDBbundle under OPENSTEP
   if [ $GNUSTEP_HOST_OS = nextstep4 ]; then
-    gdb -connect TextEdit $full_appname/$GNUSTEP_HOST_CPU/$GNUSTEP_HOST_OS/$library_combo/$appname
+    gdb -connect TextEdit $full_appname/$GNUSTEP_HOST_CPU/$GNUSTEP_HOST_OS/$LIBRARY_COMBO/$appname
   else
-    gdb $full_appname/$GNUSTEP_HOST_CPU/$GNUSTEP_HOST_OS/$library_combo/$appname
+    gdb $full_appname/$GNUSTEP_HOST_CPU/$GNUSTEP_HOST_OS/$LIBRARY_COMBO/$appname
   fi
 
 fi

openapp.in

@@ -42,6 +42,14 @@ case $1 in
     app=$1; shift;;
 esac
 
+if [ "$LIBRARY_COMBO" = nx ]; then
+  LIBRARY_COMBO=nx-nx-nx-nil
+elif [ "$LIBRARY_COMBO" = gnu-xdps ]; then
+  LIBRARY_COMBO=gnu-gnu-gnu-xdps
+elif [ "$LIBRARY_COMBO" = fd-xdps ]; then
+  LIBRARY_COMBO=gnu-fd-gnu-xdps
+fi
+
 # Remove leading slashes at the end of the application name
 app=`echo $app | sed 's%/*$%%'`
 

rules.make

@@ -42,8 +42,6 @@
 	    OPERATION=$${operation} TARGET=$${target} \
 	    PROCESSED_FIRST_TIME=yes $${target}.build)
 
-#	echo variables: target=$$target operation=$$operation type=$$type;
-
 #
 # Global targets
 #