From: Martin Mares <mj@ucw.cz>
Date: Fri, 23 Feb 2024 13:56:39 +0000 (+0100)
Subject: Merge branch 'amiga'
X-Git-Tag: v3.11.0~9
X-Git-Url: http://mj.ucw.cz/gitweb/?a=commitdiff_plain;h=3f13452c5b2388271edf11cfdc5713633b561e69;p=pciutils.git

Merge branch 'amiga'
---

3f13452c5b2388271edf11cfdc5713633b561e69
diff --cc lib/Makefile
index 26ea170,bacdbc5..de976ed
--- a/lib/Makefile
+++ b/lib/Makefile
@@@ -77,18 -75,10 +77,22 @@@ ifdef PCI_HAVE_PM_WIN32_SYSDB
  OBJS += win32-sysdbg
  endif
  
 +ifdef PCI_OS_WINDOWS
 +OBJS += win32-helpers
 +endif
 +
 +ifdef PCI_USE_PHYSMEM
 +ifndef PCI_OS_WINDOWS
 +ifndef PCI_OS_DJGPP
 +OBJS += physmem-posix
 +endif
 +endif
 +endif
 +
+ ifdef PCI_HAVE_PM_AOS_EXPANSION
+ OBJS += aos-expansion
+ endif
+ 
  all: $(PCILIB) $(PCILIBPC)
  
  ifeq ($(SHARED),no)