瀏覽代碼

* remove install units

peter 22 年之前
父節點
當前提交
fe56bb4b4c
共有 2 個文件被更改,包括 3 次插入7 次删除
  1. 2 5
      packages/extra/cdrom/Makefile
  2. 1 2
      packages/extra/cdrom/Makefile.fpc

+ 2 - 5
packages/extra/cdrom/Makefile

@@ -209,13 +209,10 @@ override TARGET_UNITS+=cdrom discid
 ifeq ($(OS_TARGET),linux)
 override TARGET_IMPLICITUNITS+=major lincd
 endif
-override TARGET_EXAMPLES+=showcds getdiscid
-ifeq ($(OS_TARGET),linux)
-override INSTALL_UNITS+=lincd major
-endif
 ifeq ($(OS_TARGET),win32)
-override INSTALL_UNITS+=scsidefs wnaspi32 cdromioctl wincd
+override TARGET_IMPLICITUNITS+=scsidefs wnaspi32 cdromioctl wincd
 endif
+override TARGET_EXAMPLES+=showcds getdiscid
 override INSTALL_FPCPACKAGE=y
 ifdef REQUIRE_UNITSDIR
 override UNITSDIR+=$(REQUIRE_UNITSDIR)

+ 1 - 2
packages/extra/cdrom/Makefile.fpc

@@ -8,13 +8,12 @@ version=1.0.8
 
 [target]
 units=cdrom discid
+implicitunits_win32=scsidefs wnaspi32 cdromioctl wincd
 implicitunits_linux=major lincd
 examples=showcds getdiscid
 
 [install]
 fpcpackage=y
-units_win32=scsidefs wnaspi32 cdromioctl wincd
-units_linux=lincd major
 
 [default]
 fpcdir=../../..