github/AROS-v0
1
0
Fork 0
mirror of https://github.com/deadw00d/AROS.git synced 2026-03-17 07:41:59 +00:00
Code Issues Releases Wiki Activity

Some more directory cleanup. Moved $(AROS_INCLUDES) and $(AROS_LIB) below

Browse Source 
SYS:Development. The idea is to keep all developer-related files in one
place (in the future also tools and utilities), so it's easy to add/remove
depending if a user wants them.

You'll need to rerun configure, and perhaps also delete all dep files (*.d).


git-svn-id: https://svn.aros.org/svn/aros/trunk/AROS@20920 fb15a70f-31f2-0310-bbcc-cdcc74a49acc
This commit is contained in:
chodorowski
2004-02-16 13:37:41 +00:00
parent 8a36887f0a
commit 20fe4f9add
4 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
config/make.cfg
View File

@ -47,8 +47,9 @@ AROS_IMAGES := $(AROS_SYSTEM)/Images
AROS_TOOLS := $(AROSDIR)/Tools
AROS_TESTS := $(AROSDIR)/Tests
AROS_INCLUDES := $(AROSDIR)/Include
AROS_LIB := $(AROSDIR)/lib
AROS_DEVELOPMENT := $(AROSDIR)/Development
AROS_INCLUDES := $(AROS_DEVELOPMENT)/Include
AROS_LIB := $(AROS_DEVELOPMENT)/Lib
INCDIR := $(AROS_INCLUDES)
CONTRIBDIR := $(AROSDIR)/Extras
@ -96,7 +97,7 @@ GENINCDIR := $(GENDIR)/include
# be expanded until right when it is used. That way modules can change the
# $(OS_INCLUDES) and $(USER_INCLUDES) whenever they like.
INCLUDES = $(USER_INCLUDES) $(OS_INCLUDES)
OS_INCLUDES := -I$(AROSDIR)/Include
OS_INCLUDES := -I$(AROS_INCLUDES)
# Basic make configuration. No need to edit anything else under here.
@ -131,6 +132,6 @@ LDFLAGS = $(TARGET_LDFLAGS) $(USER_LDFLAGS) $(SPECIAL_LDFLAGS)
OBJDIR := $(GENDIR)/$(CURDIR)
BINDIR := $(AROSDIR)
EXEDIR := $(AROSDIR)/C
LIBDIR := $(AROSDIR)/lib
LIBDIR := $(AROS_LIB)
OSGENDIR := $(GENDIR)/rom
KOBJSDIR := $(GENDIR)/kobjs

6
config/specs.in
View File

@ -2,19 +2,19 @@
%(cpp_cpu) %{fPIC:-D__PIC__ -D__pic__} %{fpic:-D__PIC__ -D__pic__} %{posix:-D_POSIX_SOURCE} %{pthread:-D_REENTRANT} %(aros_include)
*aros_include:
-nostdinc %{!nostdinc:-isystem @TOPDIR@/bin/@aros_target_arch@-@aros_target_cpu@@aros_target_suffix@/AROS/Include -isystem @aros_target_cc_includes@}
-nostdinc %{!nostdinc:-isystem @TOPDIR@/bin/@aros_target_arch@-@aros_target_cpu@@aros_target_suffix@/AROS/Development/Include -isystem @aros_target_cc_includes@}
*endfile:
-lautoinit
*link:
-m @aros_object_format@ -L@TOPDIR@/bin/@aros_target_arch@-@aros_target_cpu@@aros_target_suffix@/AROS/lib
-m @aros_object_format@ -L@TOPDIR@/bin/@aros_target_arch@-@aros_target_cpu@@aros_target_suffix@/AROS/Development/Lib
*lib:
-lamiga -larossupport -larosc -lm
*startfile:
%{detach:@TOPDIR@/bin/@aros_target_arch@-@aros_target_cpu@@aros_target_suffix@/AROS/lib/detach.o} @TOPDIR@/bin/@aros_target_arch@-@aros_target_cpu@@aros_target_suffix@/AROS/lib/startup.o %{nix:@TOPDIR@/bin/@aros_target_arch@-@aros_target_cpu@@aros_target_suffix@/AROS/lib/nixmain.o}
%{detach:@TOPDIR@/bin/@aros_target_arch@-@aros_target_cpu@@aros_target_suffix@/AROS/Development/Lib/detach.o} @TOPDIR@/bin/@aros_target_arch@-@aros_target_cpu@@aros_target_suffix@/AROS/Development/Lib/startup.o %{nix:@TOPDIR@/bin/@aros_target_arch@-@aros_target_cpu@@aros_target_suffix@/AROS/Development/Lib/nixmain.o}
*predefines:
-D__ELF__ -D__@gcc_target_cpu@__ -A-system -Asystem(posix) -D__AROS__

2
configure vendored
View File

@ -7240,7 +7240,7 @@ esac
aros_hostcfg_dir="bin/${aros_host_arch}-${aros_host_cpu}/gen/config"
aros_targetcfg_dir="bin/${aros_target_arch}-${aros_target_cpu}${aros_target_suffix}/gen/config"
aros_inc_dir="bin/${aros_target_arch}-${aros_target_cpu}${aros_target_suffix}/AROS/Include/aros"
aros_inc_dir="bin/${aros_target_arch}-${aros_target_cpu}${aros_target_suffix}/AROS/Development/Include/aros"
aros_geninc_dir="bin/${aros_target_arch}-${aros_target_cpu}${aros_target_suffix}/gen/include/aros"
aros_tools_dir="bin/${aros_host_arch}-${aros_host_cpu}/tools"
aros_scripts_dir="bin/${aros_target_arch}-${aros_target_cpu}${aros_target_suffix}/gen/scripts"

2
configure.in
View File

@ -814,7 +814,7 @@ esac
aros_hostcfg_dir="bin/${aros_host_arch}-${aros_host_cpu}/gen/config"
aros_targetcfg_dir="bin/${aros_target_arch}-${aros_target_cpu}${aros_target_suffix}/gen/config"
aros_inc_dir="bin/${aros_target_arch}-${aros_target_cpu}${aros_target_suffix}/AROS/Include/aros"
aros_inc_dir="bin/${aros_target_arch}-${aros_target_cpu}${aros_target_suffix}/AROS/Development/Include/aros"
aros_geninc_dir="bin/${aros_target_arch}-${aros_target_cpu}${aros_target_suffix}/gen/include/aros"
aros_tools_dir="bin/${aros_host_arch}-${aros_host_cpu}/tools"
aros_scripts_dir="bin/${aros_target_arch}-${aros_target_cpu}${aros_target_suffix}/gen/scripts"