gnustep/tools-make
0
0
Fork 0
mirror of https://github.com/gnustep/tools-make.git synced 2025-04-23 22:33:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Removed code to move from very very old obsolete directory structure; improved messages when building

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/tools/make/trunk@23435 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Nicola Pero 2006-09-08 18:36:20 +00:00
parent 3e2a966690
commit 7a8fcb39af
4 changed files with 17 additions and 54 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
ChangeLog
View file

@ -1,3 +1,17 @@
2006-09-08 Nicola Pero <nicola.pero@meta-innovation.com>
Removed the code to automatically move from the very very old
obsolete filesystem structure to the new one.
* configure.ac (--disable-move-obsolete): Removed option.
* configure: Regenerated.
* GNUmakefile.in (move_obsolete): Target removed.
(install): Do not depend on @GNUSTEP_MOVE_OBSOLETE@.
* move_obsolete_paths.sh: File removed.
* GNUmakefile.in (install): Depend directly on generated-files so
we don't print the placeholder message used by 'all'.
2006-09-08 Nicola Pero <nicola.pero@meta-innovation.com>
Object files are now all placed into ./obj rather than in separate

8
GNUmakefile.in
View file

@ -114,13 +114,9 @@ else
endif
all: generated-files
$(EC)(echo "Thanks. You can install now.")
$(EC)(echo "Thanks. All is ready to install.")
move_obsolete:
$(EC)(echo "Moving paths from old heirarchy: "; \
$(srcdir)/move_obsolete_paths.sh "$(GNUSTEP_SYSTEM_ROOT)" "$(GNUSTEP_LOCAL_ROOT)" "$(GNUSTEP_USER_ROOT)")
install: all @GNUSTEP_MOVE_OBSOLETE@
install: generated-files
$(EC)(echo "Creating system domain: $(GNUSTEP_SYSTEM_ROOT)"; \
$(srcdir)/create_domain_dir_tree.sh "$(GNUSTEP_SYSTEM_ROOT)"; \
echo "Creating local and network dirs: $(GNUSTEP_LOCAL_ROOT), $(GNUSTEP_NETWORK_ROOT)"; \

29
configure vendored
View file

@ -277,7 +277,7 @@ ac_default_prefix=`if test -d C: ; then
else
echo /usr/GNUstep ;
fi`
ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CPP build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os ac_cv_library_combo cc_cppprecomp cc_bundle CYGWIN RANLIB AR DLLTOOL ac_ct_RANLIB INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA LN_S TAR CHOWN GNUSTEP_CONFIG_FILE GNUSTEP_SYSTEM_ROOT GNUSTEP_LOCAL_ROOT GNUSTEP_NETWORK_ROOT GNUSTEP_USER_CONFIG_FILE GNUSTEP_USER_DIR GNUSTEP_USER_DEFAULTS_DIR GNUSTEP_MAKEFILES HOST_INSTALL GNUSTEP_FLATTENED GNUSTEP_MULTI_PLATFORM BACKEND_BUNDLE objc_threaded ac_cv_objc_threaded USE_OBJC_EXCEPTIONS AUTO_DEPENDENCIES INCLUDES LIB_DIR OBJCFLAGS GNUSTEP_STRIP_MAKEFILES GNUSTEP_MOVE_OBSOLETE GNUSTEP_MAKE_VERSION GNUSTEP_MAKE_MAJOR_VERSION GNUSTEP_MAKE_MINOR_VERSION GNUSTEP_MAKE_SUBMINOR_VERSION clean_target_os clean_target_cpu clean_target_vendor LIBOBJS LTLIBOBJS'
ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CPP build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os ac_cv_library_combo cc_cppprecomp cc_bundle CYGWIN RANLIB AR DLLTOOL ac_ct_RANLIB INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA LN_S TAR CHOWN GNUSTEP_CONFIG_FILE GNUSTEP_SYSTEM_ROOT GNUSTEP_LOCAL_ROOT GNUSTEP_NETWORK_ROOT GNUSTEP_USER_CONFIG_FILE GNUSTEP_USER_DIR GNUSTEP_USER_DEFAULTS_DIR GNUSTEP_MAKEFILES HOST_INSTALL GNUSTEP_FLATTENED GNUSTEP_MULTI_PLATFORM BACKEND_BUNDLE objc_threaded ac_cv_objc_threaded USE_OBJC_EXCEPTIONS AUTO_DEPENDENCIES INCLUDES LIB_DIR OBJCFLAGS GNUSTEP_STRIP_MAKEFILES GNUSTEP_MAKE_VERSION GNUSTEP_MAKE_MAJOR_VERSION GNUSTEP_MAKE_MINOR_VERSION GNUSTEP_MAKE_SUBMINOR_VERSION clean_target_os clean_target_cpu clean_target_vendor LIBOBJS LTLIBOBJS'
ac_subst_files=''
# Initialize some variables set by options.
@ -869,11 +869,6 @@ Optional Features:
gain is quite small, so you probably don't want to strip makefiles.
--disable-move-obsolete
Disable moving obsolete dir structure. This option will be
removed SOON as the dir structure was change more than 2 years ago! :-)
Optional Packages:
--with-PACKAGE[=ARG] use PACKAGE [ARG=yes]
--without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no)
@ -4368,27 +4363,6 @@ echo "${ECHO_T}no" >&6;
fi
#--------------------------------------------------------------------
# Disable updating the obsolete directory structure
#--------------------------------------------------------------------
gs_move_obsolete=yes
# Check whether --enable-move-obsolete or --disable-move-obsolete was given.
if test "${enable_move_obsolete+set}" = set; then
enableval="$enable_move_obsolete"
gs_move_obsolete=$enableval
else
gs_move_obsolete=yes
fi;
if test "$gs_move_obsolete" = "yes"; then
GNUSTEP_MOVE_OBSOLETE=move_obsolete;
else
GNUSTEP_MOVE_OBSOLETE=
{ echo "$as_me:$LINENO: Old GNUstep directories will not be moved" >&5
echo "$as_me: Old GNUstep directories will not be moved" >&6;}
fi
#--------------------------------------------------------------------
# Record the version
#--------------------------------------------------------------------
@ -5137,7 +5111,6 @@ s,@INCLUDES@,$INCLUDES,;t t
s,@LIB_DIR@,$LIB_DIR,;t t
s,@OBJCFLAGS@,$OBJCFLAGS,;t t
s,@GNUSTEP_STRIP_MAKEFILES@,$GNUSTEP_STRIP_MAKEFILES,;t t
s,@GNUSTEP_MOVE_OBSOLETE@,$GNUSTEP_MOVE_OBSOLETE,;t t
s,@GNUSTEP_MAKE_VERSION@,$GNUSTEP_MAKE_VERSION,;t t
s,@GNUSTEP_MAKE_MAJOR_VERSION@,$GNUSTEP_MAKE_MAJOR_VERSION,;t t
s,@GNUSTEP_MAKE_MINOR_VERSION@,$GNUSTEP_MAKE_MINOR_VERSION,;t t

20
configure.ac
View file

@ -936,26 +936,6 @@ else
fi
AC_SUBST(GNUSTEP_STRIP_MAKEFILES)
#--------------------------------------------------------------------
# Disable updating the obsolete directory structure
#--------------------------------------------------------------------
gs_move_obsolete=yes
AC_ARG_ENABLE(move-obsolete,[
--disable-move-obsolete
Disable moving obsolete dir structure. This option will be
removed SOON as the dir structure was change more than 2 years ago! :-)
],
gs_move_obsolete=$enableval,
gs_move_obsolete=yes)
if test "$gs_move_obsolete" = "yes"; then
GNUSTEP_MOVE_OBSOLETE=move_obsolete;
else
GNUSTEP_MOVE_OBSOLETE=
AC_MSG_NOTICE(Old GNUstep directories will not be moved)
fi
AC_SUBST(GNUSTEP_MOVE_OBSOLETE)
#--------------------------------------------------------------------
# Record the version
#--------------------------------------------------------------------