From 94e6def908580dacb3393a6544ca858de54e75a9 Mon Sep 17 00:00:00 2001 From: Abdalla Al-Dalleh <37416278+AbdallaDalleh@users.noreply.github.com> Date: Mon, 16 Oct 2023 15:12:55 +0300 Subject: [PATCH] Re-ordered includes in the main configure/RELEASE ADGenICam is defined after "-include" directives, this would require modifying configure/RELEASE in case of using a site-specific RELEASE.local. Also, added top-level *.local to .gitignore. --- .gitignore | 1 + configure/RELEASE | 5 ++--- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index dc375f1..5cafee6 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,6 @@ vendor/aravis* configure/*.local +*.local O.*/ bin/ lib/ diff --git a/configure/RELEASE b/configure/RELEASE index 6339853..ba6950b 100644 --- a/configure/RELEASE +++ b/configure/RELEASE @@ -2,9 +2,8 @@ # Run "gnumake clean uninstall install" in the application # top directory each time this file is changed. +ADGENICAM = $(AREA_DETECTOR)/ADGenICam + -include $(TOP)/../configure/RELEASE_LIBS_INCLUDE -include $(TOP)/RELEASE.local -include $(TOP)/configure/RELEASE.local - -ADGENICAM = $(AREA_DETECTOR)/ADGenICam -