i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* Removed the GPL_ONLY stuff from ntfs and reiserfs in trunk as well.

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@32883 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Axel Dörfler
2009-09-01 10:16:21 +00:00
parent 7b8b23e9a4
commit 6203096a86
3 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build/jam/HaikuImage
+2 -3
View File
@@ -80,7 +80,7 @@ SYSTEM_DEMOS = BSnow Chart Clock Cortex FontDemo
SYSTEM_LIBS = libalm.so libbe.so libbsd.so libbnetapi.so libdebug.so
libdevice.so libfluidsynth.so libfreetype.so libgame.so libGL.so libgnu.so
libilmimf.so libjpeg.so liblinprog.so liblpsolve55.so libmail.so libmedia.so
libmidi.so libmidi2.so libnetwork.so libpng.so <revisioned>libroot.so
libmidi.so libmidi2.so libnetwork.so libpng.so <revisioned>libroot.so
libscreensaver.so libtextencoding.so libtracker.so libtranslation.so
libz.so
$(HAIKU_SHARED_LIBSTDC++) $(HAIKU_SHARED_LIBSUPC++)
@@ -159,8 +159,7 @@ SYSTEM_ADD_ONS_BUS_MANAGERS = $(ATA_ONLY)ata pci $(X86_ONLY)ps2 $(X86_ONLY)isa
$(IDE_ONLY)ide scsi config_manager agp_gart usb firewire $(X86_ONLY)acpi
;
SYSTEM_ADD_ONS_FILE_SYSTEMS = bfs cdda ext2 fat iso9660 nfs attribute_overlay
write_overlay $(GPL_ONLY)ntfs $(GPL_ONLY)reiserfs ;
#googlefs ;
write_overlay ntfs reiserfs ; #googlefs
# modules
src/add-ons/kernel/file_systems/Jamfile
+2 -3
View File
@@ -7,11 +7,10 @@ SubInclude HAIKU_TOP src add-ons kernel file_systems fat ;
SubInclude HAIKU_TOP src add-ons kernel file_systems googlefs ;
SubInclude HAIKU_TOP src add-ons kernel file_systems iso9660 ;
SubInclude HAIKU_TOP src add-ons kernel file_systems nfs ;
SubInclude HAIKU_TOP src add-ons kernel file_systems ntfs ;
SubInclude HAIKU_TOP src add-ons kernel file_systems ramfs ;
SubInclude HAIKU_TOP src add-ons kernel file_systems reiserfs ;
SubInclude HAIKU_TOP src add-ons kernel file_systems udf ;
SubInclude HAIKU_TOP src add-ons kernel file_systems userlandfs ;
SubIncludeGPL HAIKU_TOP src add-ons kernel file_systems ntfs ;
SubIncludeGPL HAIKU_TOP src add-ons kernel file_systems reiserfs ;
SubInclude HAIKU_TOP src add-ons kernel file_systems layers ;
src/add-ons/kernel/file_systems/ntfs/Jamfile
+1 -1
View File
@@ -23,5 +23,5 @@ SEARCH on [ FGristFiles
kernel_cpp.cpp
] = [ FDirName $(HAIKU_TOP) src system kernel util ] ;
SubIncludeGPL HAIKU_TOP src add-ons kernel file_systems ntfs libntfs ;
SubInclude HAIKU_TOP src add-ons kernel file_systems ntfs libntfs ;