Move dali.h is to the correct directory

Change-Id: I6005b286704c121892836d8aa9b861b62929abb6

diff --git a/build/tizen/adaptor/module.list b/build/tizen/adaptor/module.list
index 40c846f..0478c3c 100644 (file)
--- a/build/tizen/adaptor/module.list
+++ b/build/tizen/adaptor/module.list
@@ -1,69 +1,73 @@
 
-# Module: accessibility 
+# Module: accessibility
 adaptor_accessibility_dir = ../../../dali/internal/accessibility
 include ../../../dali/internal/accessibility/file.list
 
-# Module: adaptor 
+# Module: adaptor
 adaptor_adaptor_dir = ../../../dali/internal/adaptor
 include ../../../dali/internal/adaptor/file.list
 
-# Module: clipboard 
+# Module: clipboard
 adaptor_clipboard_dir = ../../../dali/internal/clipboard
 include ../../../dali/internal/clipboard/file.list
 
-# Module: graphics 
+# Module: graphics
 adaptor_graphics_dir = ../../../dali/internal/graphics
 include ../../../dali/internal/graphics/file.list
 
-# Module: haptics 
+# Module: haptics
 adaptor_haptics_dir = ../../../dali/internal/haptics
 include ../../../dali/internal/haptics/file.list
 
-# Module: imaging 
+# Module: imaging
 adaptor_imaging_dir = ../../../dali/internal/imaging
 include ../../../dali/internal/imaging/file.list
 
-# Module: input 
+# Module: input
 adaptor_input_dir = ../../../dali/internal/input
 include ../../../dali/internal/input/file.list
 
-# Module: legacy 
+# Module: legacy
 adaptor_legacy_dir = ../../../dali/internal/legacy
 include ../../../dali/internal/legacy/file.list
 
-# Module: network 
+# Module: network
 adaptor_network_dir = ../../../dali/internal/network
 include ../../../dali/internal/network/file.list
 
-# Module: sensor 
+# Module: sensor
 adaptor_sensor_dir = ../../../dali/internal/sensor
 include ../../../dali/internal/sensor/file.list
 
-# Module: styling 
+# Module: styling
 adaptor_styling_dir = ../../../dali/internal/styling
 include ../../../dali/internal/styling/file.list
 
-# Module: system 
+# Module: system
 adaptor_system_dir = ../../../dali/internal/system
 include ../../../dali/internal/system/file.list
 
-# Module: text 
+# Module: text
 adaptor_text_dir = ../../../dali/internal/text
 include ../../../dali/internal/text/file.list
 
-# Module: video 
+# Module: video
 adaptor_video_dir = ../../../dali/internal/video
 include ../../../dali/internal/video/file.list
 
-# Module: window-system 
+# Module: window-system
 adaptor_window_system_dir = ../../../dali/internal/window-system
 include ../../../dali/internal/window-system/file.list
 
-# Module: public-api 
+# Module: public-api
 adaptor_public_api_dir = ../../../dali/public-api
 include ../../../dali/public-api/file.list
 
-# Module: devel-api 
+# Module: public api: dali header
+adaptor_dali_header_dir = ../../../dali
+include ../../../dali/file.list
+
+# Module: devel-api
 adaptor_devel_api_dir = ../../../dali/devel-api
 include ../../../dali/devel-api/file.list
 
@@ -74,4 +78,3 @@ include ../../../dali/integration-api/file.list
 # Module: thirdparty ( external )
 adaptor_thirdparty_dir = ../../../third-party
 include ../../../third-party/file.list
-

diff --git a/dali/public-api/dali.h b/dali/dali.h
similarity index 96%
rename from dali/public-api/dali.h
rename to dali/dali.h
index c7ba45e..e53d86c 100644 (file)
--- a/dali/public-api/dali.h
+++ b/dali/dali.h
@@ -2,7 +2,7 @@
 #define __DALI_H__
 
 /*
- * Copyright (c) 2015 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2018 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/dali/file.list b/dali/file.list
new file mode 100644 (file)
index 0000000..f7d075b
--- /dev/null
+++ b/dali/file.list
@@ -0,0 +1,2 @@
+adaptor_dali_header_file = \
+  $(adaptor_dali_header_dir)/dali.h

diff --git a/dali/public-api/file.list b/dali/public-api/file.list
index ae75497..2f1471d 100644 (file)
--- a/dali/public-api/file.list
+++ b/dali/public-api/file.list
@@ -31,9 +31,6 @@ public_api_adaptor_framework_header_files = \
   $(adaptor_public_api_dir)/adaptor-framework/widget-application.h \
   $(adaptor_public_api_dir)/adaptor-framework/widget-impl.h
 
-adaptor_dali_header_file = \
-  $(adaptor_public_api_dir)/dali.h
-
 # wearable and watch extra public headers
 adaptor_dali_wearable_header_file = \
   $(adaptor_public_api_dir)/watch/dali-wearable.h