diff --git a/.github/workflows/ci-build.yml b/.github/workflows/ci-build.yml index aef9afb82..4375c713c 100644 --- a/.github/workflows/ci-build.yml +++ b/.github/workflows/ci-build.yml @@ -25,8 +25,8 @@ jobs: - name: Build run: | - make -j 9 - sudo make install + make deb + sudo dpkg -i ../dj64*.deb - name: Set up test environment run: | diff --git a/Makefile.conf.in b/Makefile.conf.in index 987c4ae55..57771ec09 100644 --- a/Makefile.conf.in +++ b/Makefile.conf.in @@ -5,6 +5,15 @@ datarootdir := @datarootdir@ datadir := @datadir@ includedir := @includedir@ +abs_top_srcdir = @abs_top_srcdir@ +abs_top_builddir = @abs_top_builddir@ +SUBDIR = $(patsubst /%,%,$(subst $(abs_top_builddir)/src,,$(CURDIR))) +srcdir = $(patsubst %/,%,$(abs_top_srcdir)/src/$(SUBDIR)) +vpath %.c $(srcdir) +vpath %.h $(srcdir) +vpath %.S $(srcdir) +vpath %.s $(srcdir) + CC := @CC@ CC_FOR_BUILD := @CC_FOR_BUILD@ CC_IS_CLANG := @CC_IS_CLANG@ diff --git a/configure.ac b/configure.ac index dfbfd964f..3a7c27afb 100644 --- a/configure.ac +++ b/configure.ac @@ -19,6 +19,9 @@ AC_PROG_CPP AC_PROG_INSTALL AX_PROG_CC_FOR_BUILD #AX_PROG_AR +AC_PROG_LN_S +AC_PROG_SED +AC_PROG_GREP AC_CHECK_PROGS([PKG_CONFIG], [pkg-config]) if test -z "$PKG_CONFIG"; then @@ -242,4 +245,23 @@ AC_CHECK_TYPES([__float80]) AC_CHECK_FUNCS([dlmopen]) AC_CHECK_DECLS([RTLD_DEEPBIND],,, [[#include ]]) +if ! test -f Makefile.conf.in; then + AC_MSG_NOTICE([Populating makefiles...]) + wd=`pwd` + abssrcdir=`cd $srcdir && pwd` + if test "${wd#$abssrcdir}" != "$wd" ; then + builddir=".${wd#$abssrcdir}" + else + builddir="$wd" + fi + mkdir -p `(cd $abssrcdir; find src demos -type d -print)` + $LN_S -f $abssrcdir/Makefile.conf.in Makefile.conf.in + for i in `(cd $abssrcdir; find . \( -path './demos/*' -o -path './src/*' \ + -o -path ./makefile \) -a -name 'makefile' -print + )`; do + echo $LN_S -f $abssrcdir/${i#./} $i + $LN_S -f $abssrcdir/${i#./} $i + done +fi + AC_OUTPUT diff --git a/debian/rules b/debian/rules index 98fbd72d9..20b67bff0 100755 --- a/debian/rules +++ b/debian/rules @@ -1,7 +1,7 @@ #!/usr/bin/make -f %: - dh $@ --parallel + dh $@ --parallel --builddirectory=build override_dh_autoreconf: dh_autoreconf ./autogen.sh diff --git a/makefile b/makefile index b700ef4f4..165a46279 100644 --- a/makefile +++ b/makefile @@ -36,11 +36,11 @@ all: Makefile.conf dj64 djdev64 ncurses @echo "Done building. You may need to run \"sudo make install\" now." @echo "You can first run \"sudo make uninstall\" to purge the prev install." -Makefile.conf config.status: Makefile.conf.in configure - ./configure +Makefile.conf config.status: Makefile.conf.in $(abs_top_srcdir)/configure + $(abs_top_srcdir)/configure -configure: configure.ac - autoreconf -v -i -I m4 +$(abs_top_srcdir)/configure: $(abs_top_srcdir)/configure.ac + cd $(@D) && autoreconf -v -i -I m4 subs: $(MAKE) -C src @@ -65,9 +65,9 @@ install_dj64: cp -fP $(DJ64DEVL) $(DESTDIR)$(prefix)/i386-pc-dj64/lib64 $(INSTALL) -m 0644 $(DJ64LIBS) $(DESTDIR)$(prefix)/i386-pc-dj64/lib64 $(INSTALL) -d $(DESTDIR)$(prefix)/i386-pc-dj64/include - cp -r $(TOP)/include $(DESTDIR)$(prefix)/i386-pc-dj64 + cp -r $(abs_top_srcdir)/include $(DESTDIR)$(prefix)/i386-pc-dj64 $(INSTALL) -d $(DESTDIR)$(prefix)/i386-pc-dj64/share - $(INSTALL) -m 0644 dj64.mk $(DESTDIR)$(prefix)/i386-pc-dj64/share + $(INSTALL) -m 0644 $(abs_top_srcdir)/dj64.mk $(DESTDIR)$(prefix)/i386-pc-dj64/share $(INSTALL) -d $(DESTDIR)$(datadir) $(INSTALL) -d $(DESTDIR)$(datadir)/pkgconfig $(INSTALL) -m 0644 dj64.pc $(DESTDIR)$(datadir)/pkgconfig @@ -83,7 +83,7 @@ install_djdev64: $(INSTALL) -m 0644 djdev64.pc $(DESTDIR)$(datadir)/pkgconfig $(INSTALL) -m 0644 djstub64.pc $(DESTDIR)$(datadir)/pkgconfig $(INSTALL) -d $(DESTDIR)$(includedir)/djdev64 - cp -rL $(TOP)/src/djdev64/include/djdev64 $(DESTDIR)$(includedir) + cp -rL $(abs_top_srcdir)/src/djdev64/include/djdev64 $(DESTDIR)$(includedir) $(INSTALL) -d $(DESTDIR)$(libdir) $(INSTALL) -m 0755 $(DJDEV64LIB) $(DESTDIR)$(libdir) cp -fP $(DJDEV64DEVL) $(DESTDIR)$(libdir) @@ -122,10 +122,10 @@ ifeq ($(NCURSES),1) endif deb: - debuild -i -us -uc -b && $(MAKE) clean >/dev/null + debuild -i -us -uc -b rpm: - make clean + $(MAKE) clean rpkg local && $(MAKE) clean >/dev/null demos: @@ -146,7 +146,7 @@ install_demos: $(DJ64DEVL): subs ifeq ($(NCURSES),1) -L_CPPFLAGS = $(shell PKG_CONFIG_PATH=$(ATOP) pkg-config --variable=xcppflags --define-variable=dj64prefix=$(ATOP) dj64) +L_CPPFLAGS = $(shell PKG_CONFIG_PATH=$(ATOP) pkg-config --variable=xcppflags --define-variable=dj64prefix=$(abs_top_srcdir) dj64) L_CFLAGS = $(shell PKG_CONFIG_PATH=$(ATOP) pkg-config --cflags dj64) L_LIBS = $(shell PKG_CONFIG_PATH=$(ATOP) pkg-config --libs-only-L --libs-only-l --define-variable=libdir=$(ATOP)/lib dj64) R_PREFIX = $(shell PKG_CONFIG_PATH=$(ATOP) pkg-config --variable=dj64prefix dj64) @@ -163,7 +163,7 @@ $(NC_BUILD)/Makefile: dj64.pc | $(NC_BUILD) $(DJ64DEVL) CFLAGS="$(CFLAGS) $(L_CFLAGS)" \ LIBS="$(L_LIBS)" \ LDFLAGS="$(L_LDFLAGS)" \ - ../configure --host=$(shell uname -m)-pc-linux-gnu \ + $(abs_top_srcdir)/contrib/ncurses/configure --host=$(shell uname -m)-pc-linux-gnu \ --prefix=$(R_PREFIX) \ --libdir=$(R_LIBDIR) \ --without-manpages \ diff --git a/src/djdev64/makefile b/src/djdev64/makefile index f8ff2a21e..27e857311 100644 --- a/src/djdev64/makefile +++ b/src/djdev64/makefile @@ -2,7 +2,7 @@ TOP = ../.. include $(TOP)/Makefile.conf SOURCES = djdev64.c elf.c djexec.c OBJECTS = $(SOURCES:.c=.o) -CFLAGS += -iquote include -fpic -ggdb3 -Wall -Wmissing-prototypes -Og -MD \ +CFLAGS += -iquote $(srcdir)/include -fpic -ggdb3 -Wall -Wmissing-prototypes -Og -MD \ $(LIBELF_CFLAGS) %.o: %.c diff --git a/src/djdev64/stub/makefile b/src/djdev64/stub/makefile index 83455c74c..5c29a59ac 100644 --- a/src/djdev64/stub/makefile +++ b/src/djdev64/stub/makefile @@ -3,14 +3,14 @@ include $(TOP)/Makefile.conf prefix ?= /usr/local SOURCES = coff.c elf.c util.c stub.c dpmiwrp.c dos.c OBJECTS = $(SOURCES:.c=.o) -CFLAGS += -iquote ../include -fpic -ggdb3 -Wall -Og -MD \ +CFLAGS += -iquote $(srcdir)/../include -fpic -ggdb3 -Wall -Og -MD \ -DCRT0=\"$(prefix)/i386-pc-dj64/lib/crt0.elf\" SYM_VER = 5 %.o: %.c $(CC) $(CFLAGS) -c -o $@ $< -%.version: %.version.in makefile +%.version: $(srcdir)/%.version.in makefile sed \ -e 's!@SYM_VER[@]!$(SYM_VER)!g' \ $< >$@ diff --git a/src/dosemu2/makefile b/src/dosemu2/makefile index 0d8866562..11690caab 100644 --- a/src/dosemu2/makefile +++ b/src/dosemu2/makefile @@ -1,7 +1,8 @@ # Copyright (C) 1994 DJ Delorie, see COPYING.DJ for details TOP = . -include $(TOP)/../makefile.inc +include $(TOP)/../../Makefile.conf +include $(srcdir)/$(TOP)/../makefile.inc all:: $(LIB)/elfload.com diff --git a/src/libc/ansi/assert/makefile b/src/libc/ansi/assert/makefile index c1b2b1c4a..d2cf06e7f 100644 --- a/src/libc/ansi/assert/makefile +++ b/src/libc/ansi/assert/makefile @@ -3,4 +3,5 @@ TOP=../.. SRC += assert.c -include $(TOP)/../makefile.inc +include $(TOP)/../../Makefile.conf +include $(srcdir)/$(TOP)/../makefile.inc diff --git a/src/libc/ansi/ctype/makefile b/src/libc/ansi/ctype/makefile index 0263eb38f..2f85a5237 100644 --- a/src/libc/ansi/ctype/makefile +++ b/src/libc/ansi/ctype/makefile @@ -26,4 +26,5 @@ SRC += iswalnum.c SRC += iswalpha.c SRC += iswdigit.c -include $(TOP)/../makefile.inc +include $(TOP)/../../Makefile.conf +include $(srcdir)/$(TOP)/../makefile.inc diff --git a/src/libc/ansi/errno/makefile b/src/libc/ansi/errno/makefile index 3e1043fba..abf900923 100644 --- a/src/libc/ansi/errno/makefile +++ b/src/libc/ansi/errno/makefile @@ -3,4 +3,5 @@ TOP=../.. SRC += errno.c -include $(TOP)/../makefile.inc +include $(TOP)/../../Makefile.conf +include $(srcdir)/$(TOP)/../makefile.inc diff --git a/src/libc/ansi/locale/makefile b/src/libc/ansi/locale/makefile index 517efc585..1fe171732 100644 --- a/src/libc/ansi/locale/makefile +++ b/src/libc/ansi/locale/makefile @@ -10,4 +10,5 @@ SRC += setlocal.c SRC += wcstombs.c SRC += wctomb.c -include $(TOP)/../makefile.inc +include $(TOP)/../../Makefile.conf +include $(srcdir)/$(TOP)/../makefile.inc diff --git a/src/libc/ansi/math/makefile b/src/libc/ansi/math/makefile index d8b635d32..991f40593 100644 --- a/src/libc/ansi/math/makefile +++ b/src/libc/ansi/math/makefile @@ -7,4 +7,5 @@ SRC += modfl.c SRC += modf.c SRC += huge_val.c -include $(TOP)/../makefile.inc +include $(TOP)/../../Makefile.conf +include $(srcdir)/$(TOP)/../makefile.inc diff --git a/src/libc/ansi/setjmp/makefile b/src/libc/ansi/setjmp/makefile index 2991849d9..c28d3427f 100644 --- a/src/libc/ansi/setjmp/makefile +++ b/src/libc/ansi/setjmp/makefile @@ -4,4 +4,5 @@ TOP=../.. #AS_SRC += longjmp.S #AS_SRC += setjmp.S -include $(TOP)/../makefile.inc +include $(TOP)/../../Makefile.conf +include $(srcdir)/$(TOP)/../makefile.inc diff --git a/src/libc/ansi/stdio/makefile b/src/libc/ansi/stdio/makefile index fe2b92e33..88bf9bdb6 100644 --- a/src/libc/ansi/stdio/makefile +++ b/src/libc/ansi/stdio/makefile @@ -65,4 +65,5 @@ SRC += vsprintf.c SRC += snprintf.c SRC += vsnprntf.c -include $(TOP)/../makefile.inc +include $(TOP)/../../Makefile.conf +include $(srcdir)/$(TOP)/../makefile.inc diff --git a/src/libc/ansi/stdlib/makefile b/src/libc/ansi/stdlib/makefile index 41fc535e5..af45addb2 100644 --- a/src/libc/ansi/stdlib/makefile +++ b/src/libc/ansi/stdlib/makefile @@ -41,4 +41,5 @@ SRC += system.c # here. nmalloc.o: EXTRA_CFLAGS := -fno-builtin-malloc -include $(TOP)/../makefile.inc +include $(TOP)/../../Makefile.conf +include $(srcdir)/$(TOP)/../makefile.inc diff --git a/src/libc/ansi/string/makefile b/src/libc/ansi/string/makefile index 6439401a1..c888f5ac2 100644 --- a/src/libc/ansi/string/makefile +++ b/src/libc/ansi/string/makefile @@ -28,6 +28,7 @@ SRC += syserr1.c SRC += syserr2.c SRC += syserr3.c -include $(TOP)/../makefile.inc +include $(TOP)/../../Makefile.conf +include $(srcdir)/$(TOP)/../makefile.inc strlen.o: EXTRA_CFLAGS += -fno-builtin-strlen diff --git a/src/libc/ansi/time/makefile b/src/libc/ansi/time/makefile index 7ed2f345f..40544df3e 100644 --- a/src/libc/ansi/time/makefile +++ b/src/libc/ansi/time/makefile @@ -6,4 +6,5 @@ SRC += difftime.c SRC += strftime.c SRC += time.c -include $(TOP)/../makefile.inc +include $(TOP)/../../Makefile.conf +include $(srcdir)/$(TOP)/../makefile.inc diff --git a/src/libc/ansif/float/makefile b/src/libc/ansif/float/makefile index 77b361286..a897dcdce 100644 --- a/src/libc/ansif/float/makefile +++ b/src/libc/ansif/float/makefile @@ -11,4 +11,5 @@ SRC += float_le.c SRC += float_lm.c SRC += float_lx.c -include $(TOP)/../makefile.inc +include $(TOP)/../../Makefile.conf +include $(srcdir)/$(TOP)/../makefile.inc diff --git a/src/libc/bios/makefile b/src/libc/bios/makefile index 616c657bb..371eb6266 100644 --- a/src/libc/bios/makefile +++ b/src/libc/bios/makefile @@ -10,4 +10,5 @@ SRC += biosprin.c SRC += biostime.c SRC += b_time.c -include $(TOP)/../makefile.inc +include $(TOP)/../../Makefile.conf +include $(srcdir)/$(TOP)/../makefile.inc diff --git a/src/libc/c99/inttypes/makefile b/src/libc/c99/inttypes/makefile index 61db1d162..9ab1f0181 100644 --- a/src/libc/c99/inttypes/makefile +++ b/src/libc/c99/inttypes/makefile @@ -6,4 +6,5 @@ SRC += imaxdiv.c SRC += strimax.c SRC += strumax.c -include $(TOP)/../makefile.inc +include $(TOP)/../../Makefile.conf +include $(srcdir)/$(TOP)/../makefile.inc diff --git a/src/libc/c99/math/makefile b/src/libc/c99/math/makefile index 5ffe1c6cf..776f1c716 100644 --- a/src/libc/c99/math/makefile +++ b/src/libc/c99/math/makefile @@ -25,4 +25,5 @@ SRC += sgnbitd.c SRC += sgnbitf.c SRC += sgnbitld.c -include $(TOP)/../makefile.inc +include $(TOP)/../../Makefile.conf +include $(srcdir)/$(TOP)/../makefile.inc diff --git a/src/libc/c99/math/rintf.c b/src/libc/c99/math/rintf.c index e67902f56..66c86bc17 100644 --- a/src/libc/c99/math/rintf.c +++ b/src/libc/c99/math/rintf.c @@ -3,10 +3,10 @@ #include #define EPS FLT_EPSILON -static const float toint = 1/EPS; float rintf(float x) { + const float toint = 1/EPS; union {float f; uint32_t i;} u = {x}; int e = u.i>>23 & 0xff; int s = u.i>>31; diff --git a/src/libc/c99/stdlib/makefile b/src/libc/c99/stdlib/makefile index ca34fa12b..cda4da035 100644 --- a/src/libc/c99/stdlib/makefile +++ b/src/libc/c99/stdlib/makefile @@ -5,4 +5,5 @@ TOP=../.. SRC += strtof.c -include $(TOP)/../makefile.inc +include $(TOP)/../../Makefile.conf +include $(srcdir)/$(TOP)/../makefile.inc diff --git a/src/libc/compat/bsd/makefile b/src/libc/compat/bsd/makefile index 8b14e5371..1f97a9207 100644 --- a/src/libc/compat/bsd/makefile +++ b/src/libc/compat/bsd/makefile @@ -7,4 +7,5 @@ SRC += bzero.c SRC += index.c SRC += rindex.c -include $(TOP)/../makefile.inc +include $(TOP)/../../Makefile.conf +include $(srcdir)/$(TOP)/../makefile.inc diff --git a/src/libc/compat/go64/makefile b/src/libc/compat/go64/makefile index bbcc536d1..31bf51c75 100644 --- a/src/libc/compat/go64/makefile +++ b/src/libc/compat/go64/makefile @@ -6,4 +6,5 @@ AS_SRC += pltctrl32.S AS_SRC += upltinit32.S SRC += elfexec.c -include $(TOP)/../makefile.inc +include $(TOP)/../../Makefile.conf +include $(srcdir)/$(TOP)/../makefile.inc diff --git a/src/libc/compat/io/makefile b/src/libc/compat/io/makefile index 7abda8436..95897e478 100644 --- a/src/libc/compat/io/makefile +++ b/src/libc/compat/io/makefile @@ -2,4 +2,5 @@ TOP=../.. SRC += chsize.c -include $(TOP)/../makefile.inc +include $(TOP)/../../Makefile.conf +include $(srcdir)/$(TOP)/../makefile.inc diff --git a/src/libc/compat/ioctl/makefile b/src/libc/compat/ioctl/makefile index eea17ca74..616cb6a67 100644 --- a/src/libc/compat/ioctl/makefile +++ b/src/libc/compat/ioctl/makefile @@ -5,4 +5,5 @@ TOP=../.. SRC += ioctl.c -include $(TOP)/../makefile.inc +include $(TOP)/../../Makefile.conf +include $(srcdir)/$(TOP)/../makefile.inc diff --git a/src/libc/compat/mman/makefile b/src/libc/compat/mman/makefile index cdce48ed4..a98474c46 100644 --- a/src/libc/compat/mman/makefile +++ b/src/libc/compat/mman/makefile @@ -3,4 +3,5 @@ TOP=../.. SRC += mprotect.c -include $(TOP)/../makefile.inc +include $(TOP)/../../Makefile.conf +include $(srcdir)/$(TOP)/../makefile.inc diff --git a/src/libc/compat/mntent/makefile b/src/libc/compat/mntent/makefile index 1f766b8ae..84f39a577 100644 --- a/src/libc/compat/mntent/makefile +++ b/src/libc/compat/mntent/makefile @@ -3,4 +3,5 @@ TOP=../.. SRC += mntent.c -include $(TOP)/../makefile.inc +include $(TOP)/../../Makefile.conf +include $(srcdir)/$(TOP)/../makefile.inc diff --git a/src/libc/compat/search/makefile b/src/libc/compat/search/makefile index b660b6c10..6e944008a 100644 --- a/src/libc/compat/search/makefile +++ b/src/libc/compat/search/makefile @@ -4,4 +4,5 @@ TOP=../.. SRC += insque.c SRC += remque.c -include $(TOP)/../makefile.inc +include $(TOP)/../../Makefile.conf +include $(srcdir)/$(TOP)/../makefile.inc diff --git a/src/libc/compat/signal/makefile b/src/libc/compat/signal/makefile index 7c2da8327..23d9a4f63 100644 --- a/src/libc/compat/signal/makefile +++ b/src/libc/compat/signal/makefile @@ -5,4 +5,5 @@ TOP=../.. SRC += siglist.c SRC += psignal.c -include $(TOP)/../makefile.inc +include $(TOP)/../../Makefile.conf +include $(srcdir)/$(TOP)/../makefile.inc diff --git a/src/libc/compat/stdio/makefile b/src/libc/compat/stdio/makefile index dd522a4fa..e474aae0b 100644 --- a/src/libc/compat/stdio/makefile +++ b/src/libc/compat/stdio/makefile @@ -19,4 +19,5 @@ SRC += vscanf.c #AS_SRC += vfscanf.S SRC += vsscanf.c -include $(TOP)/../makefile.inc +include $(TOP)/../../Makefile.conf +include $(srcdir)/$(TOP)/../makefile.inc diff --git a/src/libc/compat/stdlib/makefile b/src/libc/compat/stdlib/makefile index 8803a2bb8..25d46a59a 100644 --- a/src/libc/compat/stdlib/makefile +++ b/src/libc/compat/stdlib/makefile @@ -26,4 +26,5 @@ SRC += rand48.c SRC += memalign.c SRC += valloc.c -include $(TOP)/../makefile.inc +include $(TOP)/../../Makefile.conf +include $(srcdir)/$(TOP)/../makefile.inc diff --git a/src/libc/compat/string/makefile b/src/libc/compat/string/makefile index 7b10db967..b91470f1b 100644 --- a/src/libc/compat/string/makefile +++ b/src/libc/compat/string/makefile @@ -21,7 +21,8 @@ SRC += strnicmp.c SRC += strsep.c SRC += strupr.c -include $(TOP)/../makefile.inc +include $(TOP)/../../Makefile.conf +include $(srcdir)/$(TOP)/../makefile.inc stpcpy.o: EXTRA_CFLAGS += -fno-builtin-stpcpy stpncpy.o: EXTRA_CFLAGS += -fno-builtin-stpncpy diff --git a/src/libc/compat/sys/resource/makefile b/src/libc/compat/sys/resource/makefile index c2bc6fe97..113f6da3a 100644 --- a/src/libc/compat/sys/resource/makefile +++ b/src/libc/compat/sys/resource/makefile @@ -6,4 +6,5 @@ SRC += resource.c SRC += gtrlimit.c SRC += strlimit.c -include $(TOP)/../makefile.inc +include $(TOP)/../../Makefile.conf +include $(srcdir)/$(TOP)/../makefile.inc diff --git a/src/libc/compat/sys/stat/makefile b/src/libc/compat/sys/stat/makefile index 75a854215..4b2a96d29 100644 --- a/src/libc/compat/sys/stat/makefile +++ b/src/libc/compat/sys/stat/makefile @@ -3,4 +3,5 @@ TOP=../../.. SRC += mknod.c -include $(TOP)/../makefile.inc +include $(TOP)/../../Makefile.conf +include $(srcdir)/$(TOP)/../makefile.inc diff --git a/src/libc/compat/sys/vfs/makefile b/src/libc/compat/sys/vfs/makefile index 0858124da..1539ebf24 100644 --- a/src/libc/compat/sys/vfs/makefile +++ b/src/libc/compat/sys/vfs/makefile @@ -3,4 +3,5 @@ TOP=../../.. SRC += statfs.c -include $(TOP)/../makefile.inc +include $(TOP)/../../Makefile.conf +include $(srcdir)/$(TOP)/../makefile.inc diff --git a/src/libc/compat/termios/makefile b/src/libc/compat/termios/makefile index 126e30b81..999e941d6 100644 --- a/src/libc/compat/termios/makefile +++ b/src/libc/compat/termios/makefile @@ -4,4 +4,5 @@ TOP=../.. SRC += cfmakraw.c SRC += cfstspd.c -include $(TOP)/../makefile.inc +include $(TOP)/../../Makefile.conf +include $(srcdir)/$(TOP)/../makefile.inc diff --git a/src/libc/compat/time/makefile b/src/libc/compat/time/makefile index af6aca1e4..4ad7a7361 100644 --- a/src/libc/compat/time/makefile +++ b/src/libc/compat/time/makefile @@ -6,4 +6,5 @@ SRC += select.c SRC += settimeo.c SRC += utimes.c -include $(TOP)/../makefile.inc +include $(TOP)/../../Makefile.conf +include $(srcdir)/$(TOP)/../makefile.inc diff --git a/src/libc/compat/unistd/makefile b/src/libc/compat/unistd/makefile index f62fdd08d..4d0b7a566 100644 --- a/src/libc/compat/unistd/makefile +++ b/src/libc/compat/unistd/makefile @@ -27,4 +27,5 @@ SRC += usleep.c SRC += vfork.c SRC += xsymlink.c -include $(TOP)/../makefile.inc +include $(TOP)/../../Makefile.conf +include $(srcdir)/$(TOP)/../makefile.inc diff --git a/src/libc/compat/v1/makefile b/src/libc/compat/v1/makefile index bb9237ada..aafe1a745 100644 --- a/src/libc/compat/v1/makefile +++ b/src/libc/compat/v1/makefile @@ -5,4 +5,5 @@ TOP=../.. SRC += fpurge.c SRC += setenv.c -include $(TOP)/../makefile.inc +include $(TOP)/../../Makefile.conf +include $(srcdir)/$(TOP)/../makefile.inc diff --git a/src/libc/crt0/makefile b/src/libc/crt0/makefile index fc9a6a57a..22b36d44e 100644 --- a/src/libc/crt0/makefile +++ b/src/libc/crt0/makefile @@ -17,6 +17,7 @@ SRC += rfinfo.c SRC += dfinfo.c AS_SRC += crt0.S -include $(TOP)/../makefile.inc +include $(TOP)/../../Makefile.conf +include $(srcdir)/$(TOP)/../makefile.inc crt0.o : crt0.S exit16.ah sbrk16.ah diff --git a/src/libc/dj64/makefile b/src/libc/dj64/makefile index b39779e8c..91a3f55cc 100644 --- a/src/libc/dj64/makefile +++ b/src/libc/dj64/makefile @@ -1,9 +1,10 @@ TOP = .. -include $(TOP)/../makefile.inc -CPPFLAGS += -I ../../djdev64/include +include $(TOP)/../../Makefile.conf +include $(srcdir)/$(TOP)/../makefile.inc +CPPFLAGS += -I $(srcdir)/../../djdev64/include -P = parsers +P = $(srcdir)/parsers MP = $(P)/mkproto.sh GA = $(P)/gen_asms.sh OS = $(shell uname -s) @@ -39,13 +40,13 @@ libc_tmp.a : $(TOP)/makefile.rfo thunk_syms.o $(ALL_AS_OBJS) $(CROSS_AR) s $@ asm_incs.h: - $(GA) 0 $(TOP)/../../include >$@ + $(GA) 0 $(srcdir)/$(TOP)/../../include >$@ asm_incsn.h: - $(GA) 1 $(TOP)/../../include >$@ + $(GA) 1 $(srcdir)/$(TOP)/../../include >$@ asym_incs.h: - $(GA) 2 $(TOP)/../../include >$@ + $(GA) 2 $(srcdir)/$(TOP)/../../include >$@ # on Focal we have old make need = 4.3 @@ -55,7 +56,7 @@ else .NOTPARALLEL: thunk_calls.tmp thunk_asms.tmp thunk_incs.h : libc_tmp.a endif - $(MP) $< $(TOP)/../../include thunk_asms.tmp \ + $(MP) $< $(srcdir)/$(TOP)/../../include thunk_asms.tmp \ thunk_calls.tmp thunk_incs.h TGMK = $(shell $(PKG_CONFIG) --silence-errors --variable=makeinc thunk_gen) @@ -73,8 +74,8 @@ thunks_a.o: asm_incs.h plt_asmc.h asym_incs.h thunks_c.o: thunk_incs.h thunk_calls.h thunks_p.o: thunk_incs.h thunk_asms.h -plt.o: plt.S plt.inc plt_defs.inc -uplt.o: uplt.S plt_defs.inc +plt.o: plt.S plt.inc $(srcdir)/plt_defs.inc +uplt.o: uplt.S $(srcdir)/plt_defs.inc ALL_OBJS = $(addprefix ../,$(file < $(TOP)/makefile.rf)) @@ -82,11 +83,11 @@ OS = $(shell uname -s) ifeq ($(OS),Darwin) SHARED_LDFLAGS = $(DJ64_LDFLAGS) -dynamiclib -install_name $(prefix)/i386-pc-dj64/lib64/$(LIBN) -compatibility_version 0.2 -current_version 0.2 else -SHARED_LDFLAGS = $(DJ64_LDFLAGS) -shared -Wl,--version-script,libdj64.version -Wl,--no-undefined -Wl,--as-needed -Wl,-soname=$(LIBN) -Wl,-Bsymbolic +SHARED_LDFLAGS = $(DJ64_LDFLAGS) -shared -Wl,--version-script,$(srcdir)/libdj64.version -Wl,--no-undefined -Wl,--as-needed -Wl,-soname=$(LIBN) -Wl,-Bsymbolic endif $(LIB)/$(LIBN): $(TOP)/makefile.rf $(ALL_OBJS) \ - thunk_calls.h thunk_asms.h $(OBJECTS) libdj64.version + thunk_calls.h thunk_asms.h $(OBJECTS) $(srcdir)/libdj64.version $(CC) $(SHARED_LDFLAGS) -o $@ \ $(ALL_OBJS) $(OBJECTS) @echo "Have `nm -u $@ | grep "U " | wc -l` undefined symbols" @@ -119,4 +120,5 @@ final: $(LIB)/libc_s.a $(LIB)/$(LIBNS) $(LIB)/$(LIBS) $(LIB)/crt0.elf \ clean:: $(RM) rm *.a *.tmp plt.inc asm_*.h thunk_*.h plt_*.h asym_incs.h + $(RM) thunk_syms.s thunk_syms.ss $(RM) $(LIB)/libc_s.a $(LIB)/libdj64.so* $(LIB)/libdj64.*dylib diff --git a/src/libc/dos/compat/makefile b/src/libc/dos/compat/makefile index e160ae5c2..69ce579d4 100644 --- a/src/libc/dos/compat/makefile +++ b/src/libc/dos/compat/makefile @@ -27,4 +27,5 @@ SRC += d_settim.c SRC += d_strerr.c SRC += d_write.c -include $(TOP)/../makefile.inc +include $(TOP)/../../Makefile.conf +include $(srcdir)/$(TOP)/../makefile.inc diff --git a/src/libc/dos/dir/makefile b/src/libc/dos/dir/makefile index 844cfe132..8d65d827f 100644 --- a/src/libc/dos/dir/makefile +++ b/src/libc/dos/dir/makefile @@ -12,4 +12,5 @@ SRC += getdisk.c SRC += setdisk.c SRC += srchpath.c -include $(TOP)/../makefile.inc +include $(TOP)/../../Makefile.conf +include $(srcdir)/$(TOP)/../makefile.inc diff --git a/src/libc/dos/dos/makefile b/src/libc/dos/dos/makefile index 1874b6413..138404489 100644 --- a/src/libc/dos/dos/makefile +++ b/src/libc/dos/dos/makefile @@ -37,4 +37,5 @@ SRC += setftime.c SRC += settime.c SRC += truename.c -include $(TOP)/../makefile.inc +include $(TOP)/../../Makefile.conf +include $(srcdir)/$(TOP)/../makefile.inc diff --git a/src/libc/dos/errno/makefile b/src/libc/dos/errno/makefile index 73af5bae5..fb61ec071 100644 --- a/src/libc/dos/errno/makefile +++ b/src/libc/dos/errno/makefile @@ -5,4 +5,5 @@ TOP=../.. SRC += doserr2e.c SRC += doserrno.c -include $(TOP)/../makefile.inc +include $(TOP)/../../Makefile.conf +include $(srcdir)/$(TOP)/../makefile.inc diff --git a/src/libc/dos/io/makefile b/src/libc/dos/io/makefile index ead8d70a9..7fcf4d510 100644 --- a/src/libc/dos/io/makefile +++ b/src/libc/dos/io/makefile @@ -28,4 +28,5 @@ SRC += unlock.c SRC += unlock64.c SRC += flushdc.c -include $(TOP)/../makefile.inc +include $(TOP)/../../Makefile.conf +include $(srcdir)/$(TOP)/../makefile.inc diff --git a/src/libc/dos/lfn/makefile b/src/libc/dos/lfn/makefile index a57dfa969..e44ccb415 100644 --- a/src/libc/dos/lfn/makefile +++ b/src/libc/dos/lfn/makefile @@ -11,4 +11,5 @@ SRC += lfnftime.c SRC += lfnshort.c SRC += is_dos83.c -include $(TOP)/../makefile.inc +include $(TOP)/../../Makefile.conf +include $(srcdir)/$(TOP)/../makefile.inc diff --git a/src/libc/dos/process/makefile b/src/libc/dos/process/makefile index 8bd6fed9c..355be69ad 100644 --- a/src/libc/dos/process/makefile +++ b/src/libc/dos/process/makefile @@ -12,4 +12,5 @@ SRC += spawnv.c SRC += spawnvp.c SRC += spawnvpe.c -include $(TOP)/../makefile.inc +include $(TOP)/../../Makefile.conf +include $(srcdir)/$(TOP)/../makefile.inc diff --git a/src/libc/dos/sys/timeb/makefile b/src/libc/dos/sys/timeb/makefile index a7d37e285..c606199a8 100644 --- a/src/libc/dos/sys/timeb/makefile +++ b/src/libc/dos/sys/timeb/makefile @@ -3,4 +3,5 @@ TOP=../../.. SRC += ftime.c -include $(TOP)/../makefile.inc +include $(TOP)/../../Makefile.conf +include $(srcdir)/$(TOP)/../makefile.inc diff --git a/src/libc/dpmi/api/makefile b/src/libc/dpmi/api/makefile index 4f6b095ba..8477eb268 100644 --- a/src/libc/dpmi/api/makefile +++ b/src/libc/dpmi/api/makefile @@ -82,4 +82,5 @@ AS_SRC += d0e01.S AS_SRC += dpmi_lar.S AS_SRC += dpmi_lsl.S -include $(TOP)/../makefile.inc +include $(TOP)/../../Makefile.conf +include $(srcdir)/$(TOP)/../makefile.inc diff --git a/src/libc/dpmi/helper/makefile b/src/libc/dpmi/helper/makefile index 2761c67d4..06b744103 100644 --- a/src/libc/dpmi/helper/makefile +++ b/src/libc/dpmi/helper/makefile @@ -4,4 +4,5 @@ TOP=../.. SRC += mapmem.c SRC += setattr.c -include $(TOP)/../makefile.inc +include $(TOP)/../../Makefile.conf +include $(srcdir)/$(TOP)/../makefile.inc diff --git a/src/libc/dxe/makefile b/src/libc/dxe/makefile index e50fd96c8..47e0b7269 100644 --- a/src/libc/dxe/makefile +++ b/src/libc/dxe/makefile @@ -10,4 +10,5 @@ SRC += dlunregs.c SRC += dxe3stat.c SRC += dlopen.c -include $(TOP)/../makefile.inc +include $(TOP)/../../Makefile.conf +include $(srcdir)/$(TOP)/../makefile.inc diff --git a/src/libc/emu387/makefile b/src/libc/emu387/makefile index 63fe6015d..d2206f4d6 100644 --- a/src/libc/emu387/makefile +++ b/src/libc/emu387/makefile @@ -4,4 +4,5 @@ TOP=.. SRC += npxsetup.c AS_SRC += fpu.S -include $(TOP)/../makefile.inc +include $(TOP)/../../Makefile.conf +include $(srcdir)/$(TOP)/../makefile.inc diff --git a/src/libc/fsext/makefile b/src/libc/fsext/makefile index 255bdf96f..f5060dc0c 100644 --- a/src/libc/fsext/makefile +++ b/src/libc/fsext/makefile @@ -8,4 +8,5 @@ SRC += fse_open.c SRC += fsext.c SRC += fse_zero.c -include $(TOP)/../makefile.inc +include $(TOP)/../../Makefile.conf +include $(srcdir)/$(TOP)/../makefile.inc diff --git a/src/libc/go32/makefile b/src/libc/go32/makefile index fae7bced5..f2148a772 100644 --- a/src/libc/go32/makefile +++ b/src/libc/go32/makefile @@ -16,4 +16,5 @@ SRC += gorvec.c SRC += infostrc.c AS_SRC += overflow.S -include $(TOP)/../makefile.inc +include $(TOP)/../../Makefile.conf +include $(srcdir)/$(TOP)/../makefile.inc diff --git a/src/libc/makefile b/src/libc/makefile index d1ac8e0b9..5b9549148 100644 --- a/src/libc/makefile +++ b/src/libc/makefile @@ -8,7 +8,8 @@ TOP=. LIBNAME=c -include $(TOP)/../makefile.lib +include $(TOP)/../../Makefile.conf +include $(srcdir)/$(TOP)/../makefile.lib .PHONY: all info tex texinfo doc libc2.tex diff --git a/src/libc/pc_hw/co80/makefile b/src/libc/pc_hw/co80/makefile index 9f568f1fd..dbace7b9b 100644 --- a/src/libc/pc_hw/co80/makefile +++ b/src/libc/pc_hw/co80/makefile @@ -18,4 +18,5 @@ SRC += scupdate.c SRC += scupdl.c SRC += scvbell.c -include $(TOP)/../makefile.inc +include $(TOP)/../../Makefile.conf +include $(srcdir)/$(TOP)/../makefile.inc diff --git a/src/libc/pc_hw/cpu/makefile b/src/libc/pc_hw/cpu/makefile index 73ad1535a..eb462e86c 100644 --- a/src/libc/pc_hw/cpu/makefile +++ b/src/libc/pc_hw/cpu/makefile @@ -5,4 +5,5 @@ AS_SRC += my_cs.S AS_SRC += my_ds.S AS_SRC += my_ss.S -include $(TOP)/../makefile.inc +include $(TOP)/../../Makefile.conf +include $(srcdir)/$(TOP)/../makefile.inc diff --git a/src/libc/pc_hw/farptr/makefile b/src/libc/pc_hw/farptr/makefile index 075597c8e..15ed1ca8d 100644 --- a/src/libc/pc_hw/farptr/makefile +++ b/src/libc/pc_hw/farptr/makefile @@ -4,4 +4,5 @@ TOP=../.. AS_SRC += farptr.S AS_SRC += farptr_gs.S -include $(TOP)/../makefile.inc +include $(TOP)/../../Makefile.conf +include $(srcdir)/$(TOP)/../makefile.inc diff --git a/src/libc/pc_hw/fpu/makefile b/src/libc/pc_hw/fpu/makefile index 3222c86d9..bfcdae32b 100644 --- a/src/libc/pc_hw/fpu/makefile +++ b/src/libc/pc_hw/fpu/makefile @@ -6,4 +6,5 @@ AS_SRC += cntrl87.S AS_SRC += fpreset.S AS_SRC += stat87.S -include $(TOP)/../makefile.inc +include $(TOP)/../../Makefile.conf +include $(srcdir)/$(TOP)/../makefile.inc diff --git a/src/libc/pc_hw/hwint/makefile b/src/libc/pc_hw/hwint/makefile index b1d6e4525..9840b9a06 100644 --- a/src/libc/pc_hw/hwint/makefile +++ b/src/libc/pc_hw/hwint/makefile @@ -4,4 +4,5 @@ TOP=../.. SRC += disable.c SRC += enable.c -include $(TOP)/../makefile.inc +include $(TOP)/../../Makefile.conf +include $(srcdir)/$(TOP)/../makefile.inc diff --git a/src/libc/pc_hw/io/makefile b/src/libc/pc_hw/io/makefile index dff715dca..26ffecf1a 100644 --- a/src/libc/pc_hw/io/makefile +++ b/src/libc/pc_hw/io/makefile @@ -20,4 +20,5 @@ AS_SRC += outp.S AS_SRC += outpw.S AS_SRC += ow.S -include $(TOP)/../makefile.inc +include $(TOP)/../../Makefile.conf +include $(srcdir)/$(TOP)/../makefile.inc diff --git a/src/libc/pc_hw/kb/makefile b/src/libc/pc_hw/kb/makefile index e597de710..a3920d71b 100644 --- a/src/libc/pc_hw/kb/makefile +++ b/src/libc/pc_hw/kb/makefile @@ -7,4 +7,5 @@ SRC += getxkey.c SRC += getxkstr.c SRC += kbhit.c -include $(TOP)/../makefile.inc +include $(TOP)/../../Makefile.conf +include $(srcdir)/$(TOP)/../makefile.inc diff --git a/src/libc/pc_hw/mem/makefile b/src/libc/pc_hw/mem/makefile index b1d575790..feb240989 100644 --- a/src/libc/pc_hw/mem/makefile +++ b/src/libc/pc_hw/mem/makefile @@ -19,4 +19,5 @@ SRC += dmpw.c #AS_SRC += mdl.S #AS_SRC += mdw.S -include $(TOP)/../makefile.inc +include $(TOP)/../../Makefile.conf +include $(srcdir)/$(TOP)/../makefile.inc diff --git a/src/libc/pc_hw/mono/makefile b/src/libc/pc_hw/mono/makefile index 24750229d..350498cf0 100644 --- a/src/libc/pc_hw/mono/makefile +++ b/src/libc/pc_hw/mono/makefile @@ -3,4 +3,5 @@ TOP=../.. SRC += mono.c -include $(TOP)/../makefile.inc +include $(TOP)/../../Makefile.conf +include $(srcdir)/$(TOP)/../makefile.inc diff --git a/src/libc/pc_hw/nearptr/makefile b/src/libc/pc_hw/nearptr/makefile index 063c95b62..80d649699 100644 --- a/src/libc/pc_hw/nearptr/makefile +++ b/src/libc/pc_hw/nearptr/makefile @@ -3,4 +3,5 @@ TOP=../.. SRC += nearptr.c -include $(TOP)/../makefile.inc +include $(TOP)/../../Makefile.conf +include $(srcdir)/$(TOP)/../makefile.inc diff --git a/src/libc/pc_hw/sound/makefile b/src/libc/pc_hw/sound/makefile index 9e57ae4b1..4df6607cb 100644 --- a/src/libc/pc_hw/sound/makefile +++ b/src/libc/pc_hw/sound/makefile @@ -3,4 +3,5 @@ TOP=../.. SRC += sound.c -include $(TOP)/../makefile.inc +include $(TOP)/../../Makefile.conf +include $(srcdir)/$(TOP)/../makefile.inc diff --git a/src/libc/pc_hw/timer/makefile b/src/libc/pc_hw/timer/makefile index 79049c9af..f416cc97b 100644 --- a/src/libc/pc_hw/timer/makefile +++ b/src/libc/pc_hw/timer/makefile @@ -7,4 +7,5 @@ SRC += clock.c SRC += uclock.c AS_SRC += rdtsc.S -include $(TOP)/../makefile.inc +include $(TOP)/../../Makefile.conf +include $(srcdir)/$(TOP)/../makefile.inc diff --git a/src/libc/posix/dirent/makefile b/src/libc/posix/dirent/makefile index 572a3e4b6..dc598e678 100644 --- a/src/libc/posix/dirent/makefile +++ b/src/libc/posix/dirent/makefile @@ -9,4 +9,5 @@ SRC += rewinddi.c SRC += seekdir.c SRC += telldir.c -include $(TOP)/../makefile.inc +include $(TOP)/../../Makefile.conf +include $(srcdir)/$(TOP)/../makefile.inc diff --git a/src/libc/posix/fcntl/makefile b/src/libc/posix/fcntl/makefile index e8cd0f110..3979cc831 100644 --- a/src/libc/posix/fcntl/makefile +++ b/src/libc/posix/fcntl/makefile @@ -7,4 +7,5 @@ SRC += creat.c SRC += fcntl.c SRC += open.c -include $(TOP)/../makefile.inc +include $(TOP)/../../Makefile.conf +include $(srcdir)/$(TOP)/../makefile.inc diff --git a/src/libc/posix/fnmatch/makefile b/src/libc/posix/fnmatch/makefile index 2a626fa41..f3c72e7a5 100644 --- a/src/libc/posix/fnmatch/makefile +++ b/src/libc/posix/fnmatch/makefile @@ -3,4 +3,5 @@ TOP=../.. SRC += fnmatch.c -include $(TOP)/../makefile.inc +include $(TOP)/../../Makefile.conf +include $(srcdir)/$(TOP)/../makefile.inc diff --git a/src/libc/posix/glob/makefile b/src/libc/posix/glob/makefile index 5b5aff751..2892d1cb8 100644 --- a/src/libc/posix/glob/makefile +++ b/src/libc/posix/glob/makefile @@ -4,4 +4,5 @@ TOP=../.. SRC += glob.c SRC += globfree.c -include $(TOP)/../makefile.inc +include $(TOP)/../../Makefile.conf +include $(srcdir)/$(TOP)/../makefile.inc diff --git a/src/libc/posix/grp/makefile b/src/libc/posix/grp/makefile index b54c61649..282c7df8a 100644 --- a/src/libc/posix/grp/makefile +++ b/src/libc/posix/grp/makefile @@ -4,4 +4,5 @@ TOP=../.. SRC += getgrent.c SRC += getgrgid.c -include $(TOP)/../makefile.inc +include $(TOP)/../../Makefile.conf +include $(srcdir)/$(TOP)/../makefile.inc diff --git a/src/libc/posix/pwd/makefile b/src/libc/posix/pwd/makefile index 332f2f437..3f0e72875 100644 --- a/src/libc/posix/pwd/makefile +++ b/src/libc/posix/pwd/makefile @@ -5,4 +5,5 @@ SRC += getpwnam.c SRC += getpwuid.c SRC += pwent.c -include $(TOP)/../makefile.inc +include $(TOP)/../../Makefile.conf +include $(srcdir)/$(TOP)/../makefile.inc diff --git a/src/libc/posix/regex/makefile b/src/libc/posix/regex/makefile index 8a1bdefa8..6b49986f8 100644 --- a/src/libc/posix/regex/makefile +++ b/src/libc/posix/regex/makefile @@ -11,4 +11,5 @@ SRC += regerror.c SRC += regexec.c SRC += regfree.c -include $(TOP)/../makefile.inc +include $(TOP)/../../Makefile.conf +include $(srcdir)/$(TOP)/../makefile.inc diff --git a/src/libc/posix/search/makefile b/src/libc/posix/search/makefile index 30518893d..402ae92fd 100644 --- a/src/libc/posix/search/makefile +++ b/src/libc/posix/search/makefile @@ -7,4 +7,5 @@ SRC += hcreate.c SRC += lfind.c SRC += tsearch_avl.c -include $(TOP)/../makefile.inc +include $(TOP)/../../Makefile.conf +include $(srcdir)/$(TOP)/../makefile.inc diff --git a/src/libc/posix/setjmp/makefile b/src/libc/posix/setjmp/makefile index 48dc64011..5f5e113c2 100644 --- a/src/libc/posix/setjmp/makefile +++ b/src/libc/posix/setjmp/makefile @@ -4,4 +4,5 @@ TOP=../.. #AS_SRC += siglongj.S #AS_SRC += sigsetjm.S -include $(TOP)/../makefile.inc +include $(TOP)/../../Makefile.conf +include $(srcdir)/$(TOP)/../makefile.inc diff --git a/src/libc/posix/signal/makefile b/src/libc/posix/signal/makefile index a64405b41..f26ba0f98 100644 --- a/src/libc/posix/signal/makefile +++ b/src/libc/posix/signal/makefile @@ -15,4 +15,5 @@ SRC += sigprocm.c SRC += sigpendi.c SRC += sigsuspe.c -include $(TOP)/../makefile.inc +include $(TOP)/../../Makefile.conf +include $(srcdir)/$(TOP)/../makefile.inc diff --git a/src/libc/posix/socket/csock/makefile b/src/libc/posix/socket/csock/makefile index 6c5bb658d..5e528bb3d 100644 --- a/src/libc/posix/socket/csock/makefile +++ b/src/libc/posix/socket/csock/makefile @@ -43,4 +43,5 @@ AS_SRC += s_geterr.S AS_SRC += s_soling.S AS_SRC += vxd.S -include $(TOP)/../makefile.inc +include $(TOP)/../../Makefile.conf +include $(srcdir)/$(TOP)/../makefile.inc diff --git a/src/libc/posix/socket/inet/makefile b/src/libc/posix/socket/inet/makefile index 1e7ce1489..550c69c08 100644 --- a/src/libc/posix/socket/inet/makefile +++ b/src/libc/posix/socket/inet/makefile @@ -39,4 +39,5 @@ SRC += i_pton.c SRC += i_ntop.c SRC += gaddrinf.c -include $(TOP)/../makefile.inc +include $(TOP)/../../Makefile.conf +include $(srcdir)/$(TOP)/../makefile.inc diff --git a/src/libc/posix/socket/makefile b/src/libc/posix/socket/makefile index 5ca6beebe..7f4080f9d 100644 --- a/src/libc/posix/socket/makefile +++ b/src/libc/posix/socket/makefile @@ -32,4 +32,5 @@ SRC += sockmark.c #SRC += uname.c SRC += windows.c -include $(TOP)/../makefile.inc +include $(TOP)/../../Makefile.conf +include $(srcdir)/$(TOP)/../makefile.inc diff --git a/src/libc/posix/socket/posix/makefile b/src/libc/posix/socket/posix/makefile index 709f3aeb0..48f7c1579 100644 --- a/src/libc/posix/socket/posix/makefile +++ b/src/libc/posix/socket/posix/makefile @@ -5,4 +5,5 @@ TOP=../../.. SRC += genvsec.c -include $(TOP)/../makefile.inc +include $(TOP)/../../Makefile.conf +include $(srcdir)/$(TOP)/../makefile.inc diff --git a/src/libc/posix/stdio/makefile b/src/libc/posix/stdio/makefile index d380a7e1d..6e8c098cb 100644 --- a/src/libc/posix/stdio/makefile +++ b/src/libc/posix/stdio/makefile @@ -9,4 +9,5 @@ SRC += fileno.c SRC += popen.c SRC += vdprintf.c -include $(TOP)/../makefile.inc +include $(TOP)/../../Makefile.conf +include $(srcdir)/$(TOP)/../makefile.inc diff --git a/src/libc/posix/stdlib/makefile b/src/libc/posix/stdlib/makefile index f685cb67e..58569ce79 100644 --- a/src/libc/posix/stdlib/makefile +++ b/src/libc/posix/stdlib/makefile @@ -11,4 +11,5 @@ SRC += mkdtemp.c SRC += realpath.c SRC += unsetenv.c -include $(TOP)/../makefile.inc +include $(TOP)/../../Makefile.conf +include $(srcdir)/$(TOP)/../makefile.inc diff --git a/src/libc/posix/string/makefile b/src/libc/posix/string/makefile index 5ed95ef5e..9c9e6def8 100644 --- a/src/libc/posix/string/makefile +++ b/src/libc/posix/string/makefile @@ -7,7 +7,8 @@ SRC += strerr_r.c SRC += strndup.c SRC += strnlen.c -include $(TOP)/../makefile.inc +include $(TOP)/../../Makefile.conf +include $(srcdir)/$(TOP)/../makefile.inc strndup.o: EXTRA_CFLAGS += -fno-builtin-strndup strnlen.o: EXTRA_CFLAGS += -fno-builtin-strnlen diff --git a/src/libc/posix/sys/file/makefile b/src/libc/posix/sys/file/makefile index 9b64849ed..52fe65e2c 100644 --- a/src/libc/posix/sys/file/makefile +++ b/src/libc/posix/sys/file/makefile @@ -3,4 +3,5 @@ TOP=../../.. SRC += flock.c -include $(TOP)/../makefile.inc +include $(TOP)/../../Makefile.conf +include $(srcdir)/$(TOP)/../makefile.inc diff --git a/src/libc/posix/sys/stat/makefile b/src/libc/posix/sys/stat/makefile index be0a16064..8ead2c57b 100644 --- a/src/libc/posix/sys/stat/makefile +++ b/src/libc/posix/sys/stat/makefile @@ -20,4 +20,5 @@ SRC += statbits.c SRC += umask.c SRC += xstat.c -include $(TOP)/../makefile.inc +include $(TOP)/../../Makefile.conf +include $(srcdir)/$(TOP)/../makefile.inc diff --git a/src/libc/posix/sys/statvfs/makefile b/src/libc/posix/sys/statvfs/makefile index 756bec5a1..5e6ace838 100644 --- a/src/libc/posix/sys/statvfs/makefile +++ b/src/libc/posix/sys/statvfs/makefile @@ -5,4 +5,5 @@ TOP=../../.. SRC += fstatvfs.c SRC += statvfs.c -include $(TOP)/../makefile.inc +include $(TOP)/../../Makefile.conf +include $(srcdir)/$(TOP)/../makefile.inc diff --git a/src/libc/posix/sys/times/makefile b/src/libc/posix/sys/times/makefile index b80e08bce..cfe5562db 100644 --- a/src/libc/posix/sys/times/makefile +++ b/src/libc/posix/sys/times/makefile @@ -3,4 +3,5 @@ TOP=../../.. SRC += times.c -include $(TOP)/../makefile.inc +include $(TOP)/../../Makefile.conf +include $(srcdir)/$(TOP)/../makefile.inc diff --git a/src/libc/posix/sys/uio/makefile b/src/libc/posix/sys/uio/makefile index 3fdf42aa0..93edb0aff 100644 --- a/src/libc/posix/sys/uio/makefile +++ b/src/libc/posix/sys/uio/makefile @@ -4,4 +4,5 @@ TOP=../../.. SRC += readv.c SRC += writev.c -include $(TOP)/../makefile.inc +include $(TOP)/../../Makefile.conf +include $(srcdir)/$(TOP)/../makefile.inc diff --git a/src/libc/posix/sys/wait/makefile b/src/libc/posix/sys/wait/makefile index 6340e1c8b..008667c20 100644 --- a/src/libc/posix/sys/wait/makefile +++ b/src/libc/posix/sys/wait/makefile @@ -4,4 +4,5 @@ TOP=../../.. SRC += wait.c SRC += waitpid.c -include $(TOP)/../makefile.inc +include $(TOP)/../../Makefile.conf +include $(srcdir)/$(TOP)/../makefile.inc diff --git a/src/libc/posix/termios/makefile b/src/libc/posix/termios/makefile index c054783cc..8e7c852b8 100644 --- a/src/libc/posix/termios/makefile +++ b/src/libc/posix/termios/makefile @@ -24,4 +24,5 @@ SRC += ttyscrn.c SRC += readhook.c SRC += writhook.c -include $(TOP)/../makefile.inc +include $(TOP)/../../Makefile.conf +include $(srcdir)/$(TOP)/../makefile.inc diff --git a/src/libc/posix/unistd/makefile b/src/libc/posix/unistd/makefile index 0dbce513d..06d9df874 100644 --- a/src/libc/posix/unistd/makefile +++ b/src/libc/posix/unistd/makefile @@ -54,4 +54,5 @@ SRC += ttyname.c AS_SRC += unlink.S SRC += write.c -include $(TOP)/../makefile.inc +include $(TOP)/../../Makefile.conf +include $(srcdir)/$(TOP)/../makefile.inc diff --git a/src/libc/posix/utime/makefile b/src/libc/posix/utime/makefile index 6d2170417..b0c567c26 100644 --- a/src/libc/posix/utime/makefile +++ b/src/libc/posix/utime/makefile @@ -3,4 +3,5 @@ TOP=../.. SRC += utime.c -include $(TOP)/../makefile.inc +include $(TOP)/../../Makefile.conf +include $(srcdir)/$(TOP)/../makefile.inc diff --git a/src/libc/posix/utsname/makefile b/src/libc/posix/utsname/makefile index 4a0230e9b..6cae7df65 100644 --- a/src/libc/posix/utsname/makefile +++ b/src/libc/posix/utsname/makefile @@ -3,4 +3,5 @@ TOP=../.. SRC += uname.c -include $(TOP)/../makefile.inc +include $(TOP)/../../Makefile.conf +include $(srcdir)/$(TOP)/../makefile.inc diff --git a/src/libc/posix/wchar/makefile b/src/libc/posix/wchar/makefile index 69a1a9062..75a1e430f 100644 --- a/src/libc/posix/wchar/makefile +++ b/src/libc/posix/wchar/makefile @@ -14,4 +14,5 @@ SRC += btowc.c SRC += mbsrtowcs.c SRC += internal.c -include $(TOP)/../makefile.inc +include $(TOP)/../../Makefile.conf +include $(srcdir)/$(TOP)/../makefile.inc diff --git a/src/libc/stubs/makefile b/src/libc/stubs/makefile index f05120ef5..ac689bc90 100644 --- a/src/libc/stubs/makefile +++ b/src/libc/stubs/makefile @@ -1,9 +1,10 @@ # Copyright (C) 1998 DJ Delorie, see COPYING.DJ for details # Copyright (C) 1995 DJ Delorie, see COPYING.DJ for details TOP = .. -include $(TOP)/../makefile.inc +include $(TOP)/../../Makefile.conf +include $(srcdir)/$(TOP)/../makefile.inc -STUBH = $(TOP)/../../include/libc/stubs.h +STUBH = $(srcdir)/$(TOP)/../../include/libc/stubs.h all :: makefil2 $(MAKE) -f makefil2 diff --git a/src/makefile.inc b/src/makefile.inc index 4908dbc64..79a48dd2f 100644 --- a/src/makefile.inc +++ b/src/makefile.inc @@ -8,6 +8,8 @@ include $(TOP)/../../Makefile.conf SHELL := bash -o pipefail +vpath %.ah $(srcdir) + # for mkproto.sh export CROSS_LD export UCTAGS @@ -22,10 +24,11 @@ CPPFLAGS += -DDJ64 -D_IN_DJ64 -D__DJGPP__ -nostdinc # Moved setting of $(GCC{L}_OPT) to top of file # XGCC = $(CC) $(DJ64_CFLAGS) -XCPP = $(CPP) -I . -I $(TOP)/../../include $(CPPFLAGS) \ - -imacros $(TOP)/../../config.hh -CROSS_ASCPP = $(CPP) -x assembler-with-cpp $(1) | $(CROSS_AS) $(CROSS_ASFLAGS) - -XASCPP = $(call CROSS_ASCPP, -I $(TOP)/../../include $(1)) +XCPP = $(CPP) -I . -I $(srcdir)/$(TOP)/../../include $(CPPFLAGS) \ + -imacros $(TOP)/../../config.hh -iquote $(srcdir) +CROSS_ASCPP = $(CPP) -x assembler-with-cpp $(1) | \ + $(CROSS_AS) $(CROSS_ASFLAGS) -I $(srcdir) - +XASCPP = $(call CROSS_ASCPP, -I $(srcdir)/$(TOP)/../../include $(1)) # Have to process with intermediate file, because with a single pipe # the partially preprocessed (before cpp hit an error) input is fed diff --git a/src/makefile.lib b/src/makefile.lib index 1c569159a..8edc7461b 100644 --- a/src/makefile.lib +++ b/src/makefile.lib @@ -9,7 +9,7 @@ all :: $(MAKE) -C dj64 final MAKEFILE_LIB = 1 -include $(TOP)/../makefile.inc +include $(srcdir)/$(TOP)/../makefile.inc ifneq ($(wildcard makefile.oi),) include makefile.oi diff --git a/src/mkstubs.c b/src/mkstubs.c index c90eb1047..706b64c66 100644 --- a/src/mkstubs.c +++ b/src/mkstubs.c @@ -62,7 +62,8 @@ main(int argc, char **argv) i++; } - fprintf(mk, "\ninclude $(TOP)/../makefile.inc\n"); + fprintf(mk, "\ninclude $(TOP)/../../Makefile.conf\n"); + fprintf(mk, "\ninclude $(srcdir)/$(TOP)/../makefile.inc\n"); fprintf(oh, "\n"); fclose(mk); fclose(oh);