misc

Signed-off-by: Mattias Andrée <maandree@kth.se>

8 files changed, 135 insertions, 32 deletions

diff --git a/mk/method-dummy=yes.mk b/mk/method-dummy=yes.mk
index 18773cf..3694cb3 100644
--- a/mk/method-dummy=yes.mk
+++ b/mk/method-dummy=yes.mk
@@ -1,3 +1,29 @@
-HDR_METHODS      += gamma-dummy.h
-METHODS_PARAMS   += LIBGAMMA_METHOD_DUMMY dummy 0 ramps16
-CPPFLAGS_METHODS += -DHAVE_LIBGAMMA_METHOD_DUMMY
+HDR_DUMMY      = method-dummy.h
+PARAMS_DUMMY   = LIBGAMMA_METHOD_DUMMY dummy 0 ramps16
+CPPFLAGS_DUMMY = -DHAVE_LIBGAMMA_METHOD_DUMMY
+
+OBJ_DUMMY =\
+	libgamma_dummy_method_capabilities.o\
+	libgamma_dummy_site_initialise.o\
+	libgamma_dummy_site_destroy.o\
+	libgamma_dummy_site_restore.o\
+	libgamma_dummy_partition_initialise.o\
+	libgamma_dummy_partition_destroy.o\
+	libgamma_dummy_partition_restore.o\
+	libgamma_dummy_crtc_initialise.o\
+	libgamma_dummy_crtc_destroy.o\
+	libgamma_dummy_crtc_restore.o\
+	libgamma_dummy_get_crtc_information.o\
+	libgamma_dummy_crtc_get_gamma_ramps8.o\
+	libgamma_dummy_crtc_set_gamma_ramps8.o\
+	libgamma_dummy_crtc_get_gamma_ramps16.o\
+	libgamma_dummy_crtc_set_gamma_ramps16.o\
+	libgamma_dummy_crtc_get_gamma_ramps32.o\
+	libgamma_dummy_crtc_set_gamma_ramps32.o\
+	libgamma_dummy_crtc_get_gamma_ramps64.o\
+	libgamma_dummy_crtc_set_gamma_ramps64.o\
+	libgamma_dummy_crtc_get_gamma_rampsf.o\
+	libgamma_dummy_crtc_set_gamma_rampsf.o\
+	libgamma_dummy_crtc_get_gamma_rampsd.o\
+	libgamma_dummy_crtc_set_gamma_rampsd.o\
+	libgamma_dummy_internal_configurations.o
diff --git a/mk/method-linux-drm=yes.mk b/mk/method-linux-drm=yes.mk
index 8799388..fcb8515 100644
--- a/mk/method-linux-drm=yes.mk
+++ b/mk/method-linux-drm=yes.mk
@@ -1,5 +1,21 @@
-HDR_METHODS      += gamma-linux-drm.h
-METHODS_PARAMS   += LIBGAMMA_METHOD_LINUX_DRM linux_drm 16 ramps16
-CPPFLAGS_METHODS += -DHAVE_LIBGAMMA_METHOD_LINUX_DRM
-CFLAGS_METHODS   += $$(pkg-config --cflags libdrm)
-LDFLAGS_METHODS  += $$(pkg-config --libs libdrm)
+HDR_LINUX_DRM      = method-linux-drm.h
+PARAMS_LINUX_DRM   = LIBGAMMA_METHOD_LINUX_DRM linux_drm 16 ramps16
+CPPFLAGS_LINUX_DRM = -DHAVE_LIBGAMMA_METHOD_LINUX_DRM
+CFLAGS_LINUX_DRM   = $$(pkg-config --cflags libdrm)
+LDFLAGS_LINUX_DRM  = $$(pkg-config --libs libdrm)
+
+OBJ_LINUX_DRM =\
+	libgamma_linux_drm_method_capabilities.o\
+	libgamma_linux_drm_site_initialise.o\
+	libgamma_linux_drm_site_destroy.o\
+	libgamma_linux_drm_site_restore.o\
+	libgamma_linux_drm_partition_initialise.o\
+	libgamma_linux_drm_partition_destroy.o\
+	libgamma_linux_drm_partition_restore.o\
+	libgamma_linux_drm_crtc_initialise.o\
+	libgamma_linux_drm_crtc_destroy.o\
+	libgamma_linux_drm_crtc_restore.o\
+	libgamma_linux_drm_get_crtc_information.o\
+	libgamma_linux_drm_crtc_get_gamma_ramps16.o\
+	libgamma_linux_drm_crtc_set_gamma_ramps16.o\
+	libgamma_linux_drm_internal_release_connectors_and_encoders.o
diff --git a/mk/method-quartz-cg=fake.mk b/mk/method-quartz-cg=fake.mk
index e33253a..496ac8a 100644
--- a/mk/method-quartz-cg=fake.mk
+++ b/mk/method-quartz-cg=fake.mk
@@ -1,3 +1,3 @@
-HDR_METHODS      += gamma-quartz-cg.h
-METHODS_PARAMS   += LIBGAMMA_METHOD_QUARTZ_CORE_GRAPHICS quartz_cg -1 rampsf
-CPPFLAGS_METHODS += -DHAVE_LIBGAMMA_METHOD_QUARTZ_CORE_GRAPHICS -DFAKE_LIBGAMMA_METHOD_QUARTZ_CORE_GRAPHICS
+HDR_QUARTZ_GC      = method-quartz-cg.h
+PARAMS_QUARTZ_GC   = LIBGAMMA_METHOD_QUARTZ_CORE_GRAPHICS quartz_cg -1 rampsf
+CPPFLAGS_QUARTZ_GC = -DHAVE_LIBGAMMA_METHOD_QUARTZ_CORE_GRAPHICS -DFAKE_LIBGAMMA_METHOD_QUARTZ_CORE_GRAPHICS
diff --git a/mk/method-quartz-cg=yes.mk b/mk/method-quartz-cg=yes.mk
index b98d03d..cb079cf 100644
--- a/mk/method-quartz-cg=yes.mk
+++ b/mk/method-quartz-cg=yes.mk
@@ -1,8 +1,23 @@
 F_APPLICATION_SERVICES = /System/Library/Frameworks/ApplicationServices.framework
 I_APPLICATION_SERVICES = $(F_APPLICATION_SERVICES)/Versions/A/Frameworks/CoreGraphics.framework/Versions/A/Headers
 
-HDR_METHODS      += gamma-quartz-cg.h
-METHODS_PARAMS   += LIBGAMMA_METHOD_QUARTZ_CORE_GRAPHICS quartz_cg -1 rampsf
-CPPFLAGS_METHODS += -DHAVE_LIBGAMMA_METHOD_QUARTZ_CORE_GRAPHICS
-CFLAGS_METHODS   += -I$(I_APPLICATION_SERVICES) -F$(F_APPLICATION_SERVICES)
-LDFLAGS_METHODS  += -framework ApplicationServices
+HDR_QUARTZ_GC      = method-quartz-cg.h
+PARAMS_QUARTZ_GC   = LIBGAMMA_METHOD_QUARTZ_CORE_GRAPHICS quartz_cg -1 rampsf
+CPPFLAGS_QUARTZ_GC = -DHAVE_LIBGAMMA_METHOD_QUARTZ_CORE_GRAPHICS
+CFLAGS_QUARTZ_GC   = -I$(I_APPLICATION_SERVICES) -F$(F_APPLICATION_SERVICES)
+LDFLAGS_QUARTZ_GC  = -framework ApplicationServices
+
+OBJ_QUARTZ_GC =\
+	libgamma_quartz_cg_method_capabilities.o\
+	libgamma_quartz_cg_site_initialise.o\
+	libgamma_quartz_cg_site_destroy.o\
+	libgamma_quartz_cg_site_restore.o\
+	libgamma_quartz_cg_partition_initialise.o\
+	libgamma_quartz_cg_partition_destroy.o\
+	libgamma_quartz_cg_partition_restore.o\
+	libgamma_quartz_cg_crtc_initialise.o\
+	libgamma_quartz_cg_crtc_destroy.o\
+	libgamma_quartz_cg_crtc_restore.o\
+	libgamma_quartz_cg_get_crtc_information.o\
+	libgamma_quartz_cg_crtc_get_gamma_rampsf.o\
+	libgamma_quartz_cg_crtc_set_gamma_rampsf.o
diff --git a/mk/method-w32-gdi=fake.mk b/mk/method-w32-gdi=fake.mk
index add5f79..fd068a8 100644
--- a/mk/method-w32-gdi=fake.mk
+++ b/mk/method-w32-gdi=fake.mk
@@ -1,3 +1,3 @@
-HDR_METHODS      += gamma-w32-gdi.h
-METHODS_PARAMS   += LIBGAMMA_METHOD_W32_GDI w32_gdi 16 ramps16
-CPPFLAGS_METHODS += -DHAVE_LIBGAMMA_METHOD_W32_GDI -DFAKE_LIBGAMMA_METHOD_W32_GDI
+HDR_W32_GDI      = method-w32-gdi.h
+PARAMS_W32_GDI   = LIBGAMMA_METHOD_W32_GDI w32_gdi 16 ramps16
+CPPFLAGS_W32_GDI = -DHAVE_LIBGAMMA_METHOD_W32_GDI -DFAKE_LIBGAMMA_METHOD_W32_GDI
diff --git a/mk/method-w32-gdi=yes.mk b/mk/method-w32-gdi=yes.mk
index 348b71f..3f62a2d 100644
--- a/mk/method-w32-gdi=yes.mk
+++ b/mk/method-w32-gdi=yes.mk
@@ -1,3 +1,18 @@
-HDR_METHODS      += gamma-w32-gdi.h
-METHODS_PARAMS   += LIBGAMMA_METHOD_W32_GDI w32_gdi 16 ramps16
-CPPFLAGS_METHODS += -DHAVE_LIBGAMMA_METHOD_W32_GDI
+HDR_W32_GDI      = method-w32-gdi.h
+PARAMS_W32_GDI   = LIBGAMMA_METHOD_W32_GDI w32_gdi 16 ramps16
+CPPFLAGS_W32_GDI = -DHAVE_LIBGAMMA_METHOD_W32_GDI
+
+OBJ_W32_GDI =\
+	libgamma_w32_gdi_method_capabilities.o\
+	libgamma_w32_gdi_site_initialise.o\
+	libgamma_w32_gdi_site_destroy.o\
+	libgamma_w32_gdi_site_restore.o\
+	libgamma_w32_gdi_partition_initialise.o\
+	libgamma_w32_gdi_partition_destroy.o\
+	libgamma_w32_gdi_partition_restore.o\
+	libgamma_w32_gdi_crtc_initialise.o\
+	libgamma_w32_gdi_crtc_destroy.o\
+	libgamma_w32_gdi_crtc_restore.o\
+	libgamma_w32_gdi_get_crtc_information.o\
+	libgamma_w32_gdi_crtc_get_gamma_ramps16.o\
+	libgamma_w32_gdi_crtc_set_gamma_ramps16.o
diff --git a/mk/method-x-randr=yes.mk b/mk/method-x-randr=yes.mk
index 91a935b..97add0d 100644
--- a/mk/method-x-randr=yes.mk
+++ b/mk/method-x-randr=yes.mk
@@ -1,5 +1,21 @@
-HDR_METHODS      += gamma-x-randr.h
-METHODS_PARAMS   += LIBGAMMA_METHOD_X_RANDR x_randr 16 ramps16
-CPPFLAGS_METHODS += -DHAVE_LIBGAMMA_METHOD_X_RANDR
-CFLAGS_METHODS   += $$(pkg-config --cflags xcb xcb-randr)
-LDFLAGS_METHODS  += $$(pkg-config --libs xcb xcb-randr)
+HDR_X_RANDR      = method-x-randr.h
+PARAMS_X_RANDR   = LIBGAMMA_METHOD_X_RANDR x_randr 16 ramps16
+CPPFLAGS_X_RANDR = -DHAVE_LIBGAMMA_METHOD_X_RANDR
+CFLAGS_X_RANDR   = $$(pkg-config --cflags xcb xcb-randr)
+LDFLAGS_X_RANDR  = $$(pkg-config --libs xcb xcb-randr)
+
+OBJ_X_RANDR =\
+	libgamma_x_randr_method_capabilities.o\
+	libgamma_x_randr_site_initialise.o\
+	libgamma_x_randr_site_destroy.o\
+	libgamma_x_randr_site_restore.o\
+	libgamma_x_randr_partition_initialise.o\
+	libgamma_x_randr_partition_destroy.o\
+	libgamma_x_randr_partition_restore.o\
+	libgamma_x_randr_crtc_initialise.o\
+	libgamma_x_randr_crtc_destroy.o\
+	libgamma_x_randr_crtc_restore.o\
+	libgamma_x_randr_get_crtc_information.o\
+	libgamma_x_randr_crtc_get_gamma_ramps16.o\
+	libgamma_x_randr_crtc_set_gamma_ramps16.o\
+	libgamma_x_randr_internal_translate_error.o
diff --git a/mk/method-x-vidmode=yes.mk b/mk/method-x-vidmode=yes.mk
index e54d98a..8225a96 100644
--- a/mk/method-x-vidmode=yes.mk
+++ b/mk/method-x-vidmode=yes.mk
@@ -1,5 +1,20 @@
-HDR_METHODS      += gamma-x-vidmode.h
-METHODS_PARAMS   += LIBGAMMA_METHOD_X_VIDMODE x_vidmode 16 ramps16
-CPPFLAGS_METHODS += -DHAVE_LIBGAMMA_METHOD_X_VIDMODE
-CFLAGS_METHODS   += $$(pkg-config --cflags x11 xxf86vm)
-LDFLAGS_METHODS  += $$(pkg-config --libs x11 xxf86vm)
+HDR_X_VIDMODE      = method-x-vidmode.h
+PARAMS_X_VIDMODE   = LIBGAMMA_METHOD_X_VIDMODE x_vidmode 16 ramps16
+CPPFLAGS_X_VIDMODE = -DHAVE_LIBGAMMA_METHOD_X_VIDMODE
+CFLAGS_X_VIDMODE   = $$(pkg-config --cflags x11 xxf86vm)
+LDFLAGS_X_VIDMODE  = $$(pkg-config --libs x11 xxf86vm)
+
+OBJ_X_VIDMODE =\
+	libgamma_x_vidmode_method_capabilities.o\
+	libgamma_x_vidmode_site_initialise.o\
+	libgamma_x_vidmode_site_destroy.o\
+	libgamma_x_vidmode_site_restore.o\
+	libgamma_x_vidmode_partition_initialise.o\
+	libgamma_x_vidmode_partition_destroy.o\
+	libgamma_x_vidmode_partition_restore.o\
+	libgamma_x_vidmode_crtc_initialise.o\
+	libgamma_x_vidmode_crtc_destroy.o\
+	libgamma_x_vidmode_crtc_restore.o\
+	libgamma_x_vidmode_get_crtc_information.o\
+	libgamma_x_vidmode_crtc_get_gamma_ramps16.o\
+	libgamma_x_vidmode_crtc_set_gamma_ramps16.o